expanded many rule names, added some tests to find the bugs introduced

test/test_nodes.rb

@@ -43,7 +43,7 @@ def foo(x) {
 HERE
     @parser = @parser.function_definition
     tree = parse(input)
-    assert_kind_of Vm::IntegerExpression ,  tree
+    assert_kind_of Vm::FunctionExpression ,  tree
   end
 end
 

test/test_parser.rb

@@ -25,6 +25,13 @@ class ParserTest < MiniTest::Test
     check
   end
 
+  def test_one_argument
+    @input    = '(42)'
+    @expected = {:argument_list => {:argument => {:integer => '42'}} }
+    @parser = @parser.argument_list
+    check
+  end
+
   def test_argument_list
     @input    = '(42, foo)'
     @expected = {:argument_list => [{:argument => {:integer => '42'}},
@@ -51,10 +58,10 @@ if (0) {
   667
 }
 HERE
-    @expected = {:cond     => {:integer => '0'},
+    @expected = {:conditional     => {:integer => '0'},
                 :if_true  => {:block => {:integer => '42'}},
                 :if_false => {:block => {:integer => '667'}}}
-    @parser = @parser.cond
+    @parser = @parser.conditional
     check
   end
 
@@ -65,7 +72,7 @@ def foo(x) {
 }
 HERE
     @expected = {:function_definition   => {:name => 'foo'},
-                :params => {:param => {:name => 'x'}},
+                :parmeter_list => {:parmeter => {:name => 'x'}},
                 :block   => {:integer => '5'}}
     @parser = @parser.function_definition
     check

test/test_transform.rb

@@ -35,7 +35,7 @@ class TransformTest <  MiniTest::Test
 
   def test_single_argument
     @input = {:function_call => {:name => 'foo'},
-             :argument_list    => [{:argument => {:integer => '42'}}]}
+             :argument_list    => {:argument => {:integer => '42'} } }
     @expected = Vm::FuncallExpression.new 'foo', [Vm::IntegerExpression.new(42)]
 
     check_equals
@@ -52,7 +52,7 @@ class TransformTest <  MiniTest::Test
   end
 
   def test_conditional
-    @input = {:cond     => {:integer => '0'},
+    @input = {:conditional     => {:integer => '0'},
              :if_true  => {:block => {:integer => '42'}},
              :if_false => {:block => {:integer => '667'}}}
     @expected = Vm::ConditionalExpression.new \
@@ -62,20 +62,20 @@ class TransformTest <  MiniTest::Test
     check_equals
   end
 
-  def test_param
-    @input = {:param => { :name => "foo"}} 
+  def test_parmeter
+    @input = {:parmeter => { :name => "foo"}} 
     @expected = Vm::NameExpression.new('foo')
     check_equals
   end
-  def test_params
-    @input = {:params => [{:param => { :name => "foo"}}]}
+  def test_parmeter_list
+    @input = {:parmeter_list => [{:parmeter => { :name => "foo"}}]}
     @expected = [Vm::NameExpression.new('foo')]
     check_equals
   end
   
   def test_function_definition
     @input = {:function_definition => { :name => "foo"}, 
-      :params => [{ :param => { :name => "x" }}] , 
+      :parmeter_list => { :parmeter => { :name => "x" }} , 
       :block => { :integer => "5" }}
     @expected = Vm::FunctionExpression.new('foo', [Vm::NameExpression.new('x')], Vm::IntegerExpression.new(5))
     check_equals