fix call site and now seperated assignment (was bunged as operator)

lib/parser/call_site.rb

@@ -2,9 +2,12 @@ module Parser
   module CallSite
     include Parslet
 
-    rule(:field_access) { name.as(:receiver) >> str(".") >> name.as(:field) }
+    rule(:r_value) { operator_value | call_site | field_access | basic_type }
 
-    rule(:r_value) { call_site | field_access | basic_type }
+    rule(:assign) { str('=') >> space?}
+    rule(:assignment){ (field_access|name).as(:l_value) >> assign.as(:assign) >> r_value.as(:r_value) }
+
+    rule(:field_def) { type >> name >> (assign >> r_value.as(:value) ).maybe}
 
     rule(:argument_list) {
       left_parenthesis >>

test/cases/assignment/assignment_instance.tst

@@ -1,6 +1,9 @@
-a = 5
+self.a = 5
 -- -- --
-s(:expressions, 
+s(:assignment,
-  s(:assign, 
+  s(:field_access,
-    s(:name,  :a), 
+    s(:receiver,
-    s(:int,  5)))
+      s(:name, :self)),
+    s(:field,
+      s(:name, :a))),
+  s(:int, 5))

test/cases/assignment/name.tst

@@ -0,0 +1,5 @@
+name = 10
+-- -- --
+s(:assignment,
+  s(:name, :name),
+  s(:int, 10))

test/cases/call_site/call_puts_two.tst

@@ -1,8 +1,7 @@
 puts(3  , a )
 -- -- --
-s(:expressions, 
+s(:call,
-  s(:call, 
+  s(:name, :puts),
-    s(:name,  :puts), 
+  s(:arguments,
-    s(:arguments, 
+    s(:int, 3),
-      s(:int,  3), 
+    s(:name, :a)))
-      s(:name,  :a))))

test/cases/call_site/call_site_multi.tst

@@ -1,8 +1,7 @@
 baz(42, foo)
 -- -- --
-s(:expressions, 
+s(:call,
-  s(:call, 
+  s(:name, :baz),
-    s(:name,  :baz), 
+  s(:arguments,
-    s(:arguments, 
+    s(:int, 42),
-      s(:int,  42), 
+    s(:name, :foo)))
-      s(:name,  :foo))))

test/cases/call_site/call_site_string.tst

@@ -1,7 +1,6 @@
 puts( "hello")
 -- -- --
-s(:expressions, 
+s(:call,
-  s(:call, 
+  s(:name, :puts),
-    s(:name,  :puts), 
+  s(:arguments,
-    s(:arguments, 
+    s(:string, "hello")))
-      s(:string,  "hello"))))

test/cases/call_site/int_receiver.tst

@@ -1,8 +1,7 @@
 42.put()
 -- -- --
-s(:expressions, 
+s(:call,
-  s(:call, 
+  s(:name, :put),
-    s(:name,  :put), 
+  s(:arguments),
-    s(:arguments), 
+  s(:receiver,
-    s(:receiver, 
+    s(:int, 42)))
-      s(:int,  42))))

test/cases/call_site/puts_call.tst

@@ -1,7 +1,6 @@
 puts( 5)
 -- -- --
-s(:expressions, 
+s(:call,
-  s(:call, 
+  s(:name, :puts),
-    s(:name,  :puts), 
+  s(:arguments,
-    s(:arguments, 
+    s(:int, 5)))
-      s(:int,  5))))

test/cases/call_site/single_argument.tst

@@ -1,7 +1,6 @@
 foo(42)
 -- -- --
-s(:expressions, 
+s(:call,
-  s(:call, 
+  s(:name, :foo),
-    s(:name,  :foo), 
+  s(:arguments,
-    s(:arguments, 
+    s(:int, 42)))
-      s(:int,  42))))

test/cases/call_site/single_class.tst

@@ -1,9 +1,8 @@
 Object.foo(42)
 -- -- --
-s(:expressions, 
+s(:call,
-  s(:call, 
+  s(:name, :foo),
-    s(:name,  :foo), 
+  s(:arguments,
-    s(:arguments, 
+    s(:int, 42)),
-      s(:int,  42)), 
+  s(:receiver,
-    s(:receiver, 
+    s(:class_name, :Object)))
-      s(:module,  "Object"))))

test/cases/call_site/single_name.tst

@@ -1,9 +1,8 @@
 my_my.foo(42)
 -- -- --
-s(:expressions, 
+s(:call,
-  s(:call, 
+  s(:name, :foo),
-    s(:name,  :foo), 
+  s(:arguments,
-    s(:arguments, 
+    s(:int, 42)),
-      s(:int,  42)), 
+  s(:receiver,
-    s(:receiver, 
+    s(:name, :my_my)))
-      s(:name,  :my_my))))

test/cases/call_site/single_self.tst

@@ -1,9 +1,8 @@
 self.foo(42)
 -- -- --
-s(:expressions, 
+s(:call,
-  s(:call, 
+  s(:name, :foo),
-    s(:name,  :foo), 
+  s(:arguments,
-    s(:arguments, 
+    s(:int, 42)),
-      s(:int,  42)), 
+  s(:receiver,
-    s(:receiver, 
+    s(:name, :self)))
-      s(:name,  :self))))

test/cases/call_site/string_receiver.tst

@@ -1,8 +1,7 @@
 "hello".puts()
 -- -- --
-s(:expressions, 
+s(:call,
-  s(:call, 
+  s(:name, :puts),
-    s(:name,  :puts), 
+  s(:arguments),
-    s(:arguments), 
+  s(:receiver,
-    s(:receiver, 
+    s(:string, "hello")))
-      s(:string,  "hello"))))