unify to_s inspect stuff

test/unit/test_call_site.rb

@@ -5,44 +5,38 @@ class TestCallSite < MiniTest::Test
 
   def test_single_self
     @input = 'self.foo(42)'
-    @output = Ast::CallSiteExpression.new :foo, [Ast::IntegerExpression.new(42)]
+    @output = Ast::CallSiteExpression.new(Ast::FieldExpression.new(Ast::NameExpression.new(:self),:foo), [Ast::IntegerExpression.new(42)] )
     check :call_site
   end
 
   def test_single_name
     @input = 'my_my.foo(42)'
     @parse_output = {:receiver=>{:name=>"my_my"}, :call_site=>{:name=>"foo"}, :argument_list=>[{:argument=>{:integer=>"42"}}]}
-    @output = Ast::CallSiteExpression.new(:foo, [Ast::IntegerExpression.new(42)] ,Ast::NameExpression.new("my_my"))
+    @output = Ast::CallSiteExpression.new(Ast::FieldExpression.new(Ast::NameExpression.new(:my_my),:foo), [Ast::IntegerExpression.new(42)] )
     check :call_site
   end
 
   def test_int_receiver
     @input = '42.put()'
-    @output = Ast::CallSiteExpression.new(:put, [] ,Ast::IntegerExpression.new(42))
+    @output = Ast::CallSiteExpression.new(Ast::FieldExpression.new(Ast::IntegerExpression.new(42),:put), [] )
     check :call_site
   end
 
   def test_string_receiver
     @input = '"hello".puts()'
-    @output = Ast::CallSiteExpression.new(:puts, [] ,Ast::StringExpression.new("hello"))
+    @output = Ast::CallSiteExpression.new(Ast::FieldExpression.new(Ast::StringExpression.new("hello"),:puts), [] )
     check :call_site
   end
 
   def test_call_site_2
     @input = 'self.baz(42, foo)'
-    @output = Ast::CallSiteExpression.new :baz,
-                           [Ast::IntegerExpression.new(42), Ast::NameExpression.new("foo") ] ,
-                           Ast::NameExpression.new(:self)
+    @output = Ast::CallSiteExpression.new(Ast::FieldExpression.new(Ast::NameExpression.new(:self),:baz), [Ast::IntegerExpression.new(42),Ast::NameExpression.new(:foo)] )
     check :call_site
   end
 
   def test_call_site_3
     @input = 'self.baz(42, foo , bar)'
-    @output = Ast::CallSiteExpression.new :baz,
-                           [Ast::IntegerExpression.new(42) ,
-                               Ast::NameExpression.new("foo") ,
-                               Ast::NameExpression.new("bar")] ,
-                           Ast::NameExpression.new(:self)
+    @output = Ast::CallSiteExpression.new(Ast::FieldExpression.new(Ast::NameExpression.new(:self),:baz), [Ast::IntegerExpression.new(42),Ast::NameExpression.new(:foo),Ast::NameExpression.new(:bar)] )
     check :call_site
   end
 

test/unit/test_conditional.rb

@@ -27,18 +27,18 @@ if( 1 )
   int num = 42
 end
 HERE
-    @output = Ast::IfExpression.new(Ast::IntegerExpression.new(1), [Ast::VariableDefinition.new(:int,:num,Ast::IntegerExpression.new(42))],nil )
+    @output = Ast::IfExpression.new(Ast::IntegerExpression.new(1), [Ast::VariableDefinition.new(:int,:num,Ast::IntegerExpression.new(42))],nil)
     check :conditional
   end
 
-  def ttest_conditional_with_calls
+  def test_conditional_with_calls
     @input = <<HERE
 if(var)
-
+  42.add(5)
 end
 HERE
-    @output = Ast::IfExpression.new(Ast::OperatorExpression.new(">", Ast::IntegerExpression.new(3),Ast::NameExpression.new("var")), [Ast::CallSiteExpression.new(:initialize, [Ast::IntegerExpression.new(3)] ,Ast::ModuleName.new("Object"))],[Ast::CallSiteExpression.new(:new, [Ast::IntegerExpression.new(33)] ,Ast::NameExpression.new("var"))] )
-    check
+    @output = Ast::IfExpression.new(Ast::NameExpression.new(:var), [Ast::CallSiteExpression.new(Ast::FieldExpression.new(Ast::IntegerExpression.new(42),:add), [Ast::IntegerExpression.new(5)] )],nil)
+    check :conditional
   end
 
   def ttest_conditional_nil
@@ -67,10 +67,4 @@ HERE
     @root = :conditional
   end
 
-  def pest_reverse_if
-    @input = "3  if(3 == nil)"
-    @parse_output = {:if=>"if", :conditional=>{:l=>{:integer=>"3"}, :o=>"== ", :r=>{:nil=>"nil"}}, :if_true=>{:expressions=>[{:integer=>"3"}], :else=>"else"}, :if_false=>{:expressions=>[{:integer=>"4"}], :end=>"end"}}
-    @output = Ast::IfExpression.new(Ast::OperatorExpression.new("==", Ast::IntegerExpression.new(3),Ast::NilExpression.new()), [Ast::IntegerExpression.new(3)],[Ast::IntegerExpression.new(4)] )
-    @root = :conditional
-  end
 end