Remove trailing-if-expr from the grammar

i2y · May 30, 2016 · fae5b96 · fae5b96
1 parent 509b21f
commit fae5b96
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/examples/etc.mochi b/examples/etc.mochi
@@ -11,7 +11,7 @@ elif False:
 elif False:
     200000
 else:
-    print "False!"
+    print("False!")
 
 if True:
     w = "aiueo"
@@ -87,7 +87,12 @@ else:
 
 print(str(1) + str(2), 10)
 
-tuple(map(-> $1 + 10 if True else $1 + 20, [1, 2, 3]))
+m1 = map([1, 2, 3]) ->
+    if True:
+        $1 + 10
+    else:
+        $1 + 20
+m1 |> tuple |> print
 
 match ["faa", 200]:
     ["aaa", xx]: print(xx + 200)

diff --git a/mochi/parser/parser.py b/mochi/parser/parser.py
@@ -407,7 +407,6 @@ def binding(p):
 @pg.production('expr : fn_expr')
 @pg.production('expr : paren_expr')
 @pg.production('expr : if_expr')
-@pg.production('expr : trailing_if_expr')
 @pg.production('expr : prim_expr')
 @pg.production('expr : uq_expr')
 @pg.production('expr : uqs_expr')
@@ -554,7 +553,7 @@ def elseif_expr_empty(p):
     return None
 
 
-@pg.production('trailing_if_expr : binop_expr IF binop_expr ELSE binop_expr')
+#@pg.production('trailing_if_expr : binop_expr IF binop_expr ELSE binop_expr')
 def trailing_if_expr(p):
     return [Symbol('if'), p[2], p[0], p[4]]