making grammar look more like ruby

test/test_parser.rb

@@ -50,30 +50,58 @@ class ParserTest < MiniTest::Test
     check
   end
 
-  def test_conditional
-    @input = <<HERE
-if (0) {
-  42
-} else {
-  667
-}
+  def test_expression_else
+    @input    = <<HERE
+4
+5
+else
 HERE
-    @expected = {:conditional     => {:integer => '0'},
-                :if_true  => {:block => {:integer => '42'}},
-                :if_false => {:block => {:integer => '667'}}}
-    @parser = @parser.conditional
+    @expected = {:expressions=>[{:integer=>"4"}, {:integer=>"5"}]}
+    
+    @parser = @parser.expressions_else
     check
   end
 
+  def test_expression_end
+    @input    = <<HERE
+5
+name
+call(4,6)
+end
+HERE
+    @expected = {:expressions => [ { :integer => "5" }, 
+                  { :name => "name" }, 
+                  { :function_call => { :name => "call" } , 
+                    :argument_list => [ {:argument => { :integer => "4" } } , 
+                                        {:argument => { :integer => "6" } } ] } ]}
+    @parser = @parser.expressions_end
+    check
+  end
+
+  def test_conditional
+    @input = <<HERE
+if (0) 
+  42
+else
+  667
+end
+HERE
+    @expected = { :conditional => { :integer => "0"}, 
+                  :if_true => {  :expressions => [ { :integer => "42" } ] } , 
+                  :if_false => { :expressions => [ { :integer => "667" } ] } }
+    @parser = @parser.conditional
+    check
+  end
+  
   def test_function_definition
     @input    = <<HERE
-def foo(x) {
+def foo(x) 
   5
-}
+end
 HERE
     @expected = {:function_definition   => {:name => 'foo'},
                 :parmeter_list => {:parmeter => {:name => 'x'}},
-                :block   => {:integer => '5'}}
+                :expressions   => [{:integer => '5'}]}
     @parser = @parser.function_definition
     check
   end