leave assignee as name_expression in assignment, fix tests accordingly

lib/ast/basic_expressions.rb

@@ -29,7 +29,7 @@ module Ast
       variable
     end
     def inspect
-      self.class.name + ".new(" + name + ")"
+      self.class.name + '.new("' + name + '")'
     end
     def attributes
       [:name]

lib/ast/operator_expressions.rb

@@ -31,7 +31,7 @@ module Ast
       @assignee, @assigned = assignee, assigned
     end
     def inspect
-      self.class.name + ".new(" + assignee + ", " + assigned.inspect+ ")"
+      self.class.name + ".new(" + assignee.inspect + ", " + assigned.inspect + ")"
     end
     
     def compile context

lib/parser/transform.rb

@@ -39,7 +39,7 @@ module Parser
           end
     
     rule(:asignee => simple(:left) , :asigned => simple(:right) ) do
-      Ast::AssignmentExpression.new(left.name, right ) 
+      Ast::AssignmentExpression.new(left , right ) 
     end
     #shortcut to get the ast tree for a given string
     # optional second arguement specifies a rule that will be parsed (mainly for testing)     

test/parser/test_basic.rb

@@ -46,7 +46,7 @@ class TestBasic < MiniTest::Test
   def test_assignment
     @string_input    = "a = 5"
     @parse_output = { :asignee => { :name=>"a" } , :asigned => { :integer => "5" } }
-    @transform_output = Ast::AssignmentExpression.new("a", Ast::IntegerExpression.new(5) )
+    @transform_output = Ast::AssignmentExpression.new(Ast::NameExpression.new("a"), Ast::IntegerExpression.new(5))
     @parser = @parser.assignment
   end
 

test/parser/test_conditional.rb

@@ -36,7 +36,9 @@ HERE
     @parse_output = {:while=>"while", :while_cond=>{:integer=>"1"}, :do=>"do", :body=>{:expressions=>[{:asignee=>{:name=>"tmp"}, :asigned=>{:name=>"a"}}, {:asignee=>{:name=>"a"}, :asigned=>{:name=>"b"}}]}}
     @transform_output = Ast::WhileExpression.new(
                   Ast::IntegerExpression.new(1), 
-                  [Ast::AssignmentExpression.new("tmp", Ast::NameExpression.new("a")), Ast::AssignmentExpression.new("a", Ast::NameExpression.new("b"))] )
+                  [Ast::AssignmentExpression.new(Ast::NameExpression.new("tmp"), 
+                    Ast::NameExpression.new("a")),
+                     Ast::AssignmentExpression.new(Ast::NameExpression.new("a"), Ast::NameExpression.new("b"))] )
     @parser = @parser.while
   end
 end

test/parser/test_function_definition.rb

@@ -29,8 +29,8 @@ HERE
                   :parmeter_list => [{ :parmeter => { :name => "x" } }], 
                   :expressions => [ { :asignee => { :name => "abba" }, :asigned => { :integer => "5" } } ]
                 }
-    @transform_output = Ast::FunctionExpression.new( "foo", [Ast::NameExpression.new("x")],
+    @transform_output = Ast::FunctionExpression.new(:foo, [Ast::NameExpression.new("x")] , 
-                           [Ast::AssignmentExpression.new( "abba", Ast::IntegerExpression.new(5) ) ])
+        [Ast::AssignmentExpression.new(Ast::NameExpression.new("abba"), Ast::IntegerExpression.new(5))] )
     @parser = @parser.function_definition
   end
 

test/parser/test_root.rb

@@ -16,10 +16,9 @@ HERE
           {:function_definition=> {  :name=>"foo"}, :parmeter_list => [ {:parmeter=>{:name=>"x"}} ] , 
                       :expressions=>[{:asignee=>{:name=>"a"}, :asigned=>{:integer=>"5"} } ] } , 
           {:function_call => { :name => "foo" }, :argument_list => [ { :argument => { :integer => "3" } } ] }]
-    @transform_output = [ Ast::FunctionExpression.new("foo"    , 
+    @transform_output = [Ast::FunctionExpression.new(:foo, [Ast::NameExpression.new("x")] , 
-                                [Ast::NameExpression.new("x")] , 
+    [Ast::AssignmentExpression.new(Ast::NameExpression.new("a"), Ast::IntegerExpression.new(5))] ), 
-                                [Ast::AssignmentExpression.new( "a", Ast::IntegerExpression.new(5)) ] ) ,
+    Ast::FuncallExpression.new("foo", [Ast::IntegerExpression.new(3)] )]
-                          Ast::FuncallExpression.new( "foo", [ Ast::IntegerExpression.new(3) ] ) ]
 
   end