fix array in if_false

lib/parser/transform.rb

@@ -40,7 +40,7 @@ module Parser
     rule(:if => simple(:if), :conditional     => simple(:conditional),
          :if_true  => {:expressions => sequence(:if_true) , :else => simple(:else) },
          :if_false => {:expressions => sequence(:if_false) , :end => simple(:e) }) do
-           s(:if , s(:condition, conditional), s(:if_true, *if_true), s(:if_false , if_false))
+           s(:if , s(:condition, conditional), s(:if_true, *if_true), s(:if_false , *if_false))
     end
 
     rule(:if => simple(:if), :conditional     => simple(:conditional),

test/cases/class_def/class_if.tst

@@ -9,20 +9,21 @@ class Ifi
 end
 -- -- --
 s(:expressions,
-  s(:class,  :Ifi, 
+  s(:class, :Ifi,
-    s(:derives,  nil), 
+    s(:derives, nil),
-    s(:function,  :int, 
+    s(:function, :int,
-      s(:name,  :ofthen), 
+      s(:name, :ofthen),
       s(:parameters,
-        s(:field,  :int,  :n)), 
+        s(:field, :int, :n)),
       s(:expressions,
         s(:if,
           s(:condition,
-            s(:int,  0)), 
+            s(:int, 0)),
           s(:if_true,
             s(:assign,
-              s(:name,  :isit), 
+              s(:name, :isit),
-              s(:int,  42))), 
+              s(:int, 42))),
-          s(:if_false,  [s(:assign, 
+          s(:if_false,
-  s(:name,  :maybenot), 
+            s(:assign,
-  s(:int,  667))]))))))
+              s(:name, :maybenot),
+              s(:int, 667))))))))

test/cases/conditional/if_else.tst

@@ -7,7 +7,8 @@ end
 s(:expressions,
   s(:if,
     s(:condition,
-      s(:int,  0)), 
+      s(:int, 0)),
     s(:if_true,
-      s(:int,  42)), 
+      s(:int, 42)),
-    s(:if_false,  [s(:int,  667)])))
+    s(:if_false,
+      s(:int, 667))))

test/cases/conditional/if_else_expressions.tst

@@ -17,9 +17,9 @@ s(:expressions,
           s(:int,  3)),
         s(:receiver,
           s(:module,  "Object")))),
-    s(:if_false,  [s(:call, 
+    s(:if_false,   s(:call,
   s(:name,  :new),
   s(:arguments,
     s(:int,  33)),
   s(:receiver,
-    s(:name,  :var)))])))
+    s(:name,  :var))))))

test/cases/function_definition/function_if.tst

@@ -7,18 +7,19 @@ ref ofthen(int n)
 end
 -- -- --
 s(:expressions,
-  s(:function,  :ref, 
+  s(:function, :ref,
-    s(:name,  :ofthen), 
+    s(:name, :ofthen),
     s(:parameters,
-      s(:field,  :int,  :n)), 
+      s(:field, :int, :n)),
     s(:expressions,
       s(:if,
         s(:condition,
-          s(:int,  0)), 
+          s(:int, 0)),
         s(:if_true,
           s(:assign,
-            s(:name,  :isit), 
+            s(:name, :isit),
-            s(:int,  42))), 
+            s(:int, 42))),
-        s(:if_false,  [s(:assign, 
+        s(:if_false,
-  s(:name,  :maybenot), 
+          s(:assign,
-  s(:int,  667))])))))
+            s(:name, :maybenot),
+            s(:int, 667)))))))

test/cases/function_definition/function_return_if.tst

@@ -7,18 +7,19 @@ int retvar(int n)
 end
 -- -- --
 s(:expressions,
-  s(:function,  :int, 
+  s(:function, :int,
-    s(:name,  :retvar), 
+    s(:name, :retvar),
     s(:parameters,
-      s(:field,  :int,  :n)), 
+      s(:field, :int, :n)),
     s(:expressions,
       s(:if,
         s(:condition,
-          s(:operator,  ">", 
+          s(:operator, ">",
-            s(:name,  :n), 
+            s(:name, :n),
-            s(:int,  5))), 
+            s(:int, 5))),
         s(:if_true,
           s(:return,
-            s(:int,  10))), 
+            s(:int, 10))),
-        s(:if_false,  [s(:return, 
+        s(:if_false,
-  s(:int,  20))])))))
+          s(:return,
+            s(:int, 20)))))))

test/cases/module_def/module_if.tst

@@ -9,19 +9,20 @@ module Foo
 end
 -- -- --
 s(:expressions,
-  s(:module,  :Foo, 
+  s(:module, :Foo,
-    s(:function,  :ref, 
+    s(:function, :ref,
-      s(:name,  :ofthen), 
+      s(:name, :ofthen),
       s(:parameters,
-        s(:field,  :int,  :n)), 
+        s(:field, :int, :n)),
       s(:expressions,
         s(:if,
           s(:condition,
-            s(:int,  0)), 
+            s(:int, 0)),
           s(:if_true,
             s(:assign,
-              s(:name,  :isit), 
+              s(:name, :isit),
-              s(:int,  42))), 
+              s(:int, 42))),
-          s(:if_false,  [s(:assign, 
+          s(:if_false,
-  s(:name,  :maybenot), 
+            s(:assign,
-  s(:int,  667))]))))))
+              s(:name, :maybenot),
+              s(:int, 667))))))))