upgrade calls with operator argument and chaining. Almost feels like cheating, too easy

lib/parser/call_site.rb

@@ -4,8 +4,8 @@ module Parser
 
     rule(:argument_list) {
       left_parenthesis >>
-      (  (value_expression.as(:argument) >> space? >>
+      (  ((operator_expression|value_expression).as(:argument) >> space? >>
-          (comma >> space? >> value_expression.as(:argument)).repeat(0)).repeat(0,1)).as(:argument_list) >>
+          (comma >> space? >> (operator_expression|value_expression).as(:argument)).repeat(0)).repeat(0,1)).as(:argument_list) >>
           space? >> right_parenthesis
     }
 

test/parser/test_call_site.rb

@@ -31,4 +31,25 @@ class TestCallSite < MiniTest::Test
     @parser = @parser.call_site
   end
 
+  def test_call_operator
+    @string_input    = 'puts( 3 + 5)'
+    @parse_output = {:call_site=>{:name=>"puts"}, :argument_list=>[{:argument=>{:l=>{:integer=>"3"}, :o=>"+ ", :r=>{:integer=>"5"}}}]}
+    @transform_output = Ast::CallSiteExpression.new(:puts, [Ast::OperatorExpression.new("+", Ast::IntegerExpression.new(3),Ast::IntegerExpression.new(5))] )
+    @parser = @parser.call_site
+  end
+
+  def test_call_two_operators
+    @string_input    = 'puts(3 + 5 , a - 3)'
+    @parse_output = {:call_site=>{:name=>"puts"}, :argument_list=>[{:argument=>{:l=>{:integer=>"3"}, :o=>"+ ", :r=>{:integer=>"5"}}}, {:argument=>{:l=>{:name=>"a"}, :o=>"- ", :r=>{:integer=>"3"}}}]}
+    @transform_output = Ast::CallSiteExpression.new(:puts, [Ast::OperatorExpression.new("+", Ast::IntegerExpression.new(3),Ast::IntegerExpression.new(5)),Ast::OperatorExpression.new("-", Ast::NameExpression.new("a"),Ast::IntegerExpression.new(3))] )
+    @parser = @parser.call_site
+  end
+
+  def test_call_chaining
+    @string_input    = 'puts(putint(3 + 5 ), a - 3)'
+    @parse_output = {:call_site=>{:name=>"puts"}, :argument_list=>[{:argument=>{:call_site=>{:name=>"putint"}, :argument_list=>[{:argument=>{:l=>{:integer=>"3"}, :o=>"+ ", :r=>{:integer=>"5"}}}]}}, {:argument=>{:l=>{:name=>"a"}, :o=>"- ", :r=>{:integer=>"3"}}}]}
+    @transform_output = Ast::CallSiteExpression.new(:puts, [Ast::CallSiteExpression.new(:putint, [Ast::OperatorExpression.new("+", Ast::IntegerExpression.new(3),Ast::IntegerExpression.new(5))] ),Ast::OperatorExpression.new("-", Ast::NameExpression.new("a"),Ast::IntegerExpression.new(3))] )
+    @parser = @parser.call_site
+  end
+
 end