Fix bug where keyword args would not parse without method parens

adambeynon · adambeynon · commit 6068423a65ce · 2015-05-05T10:46:57.000+01:00
This correctly sets the lexer state to :expr_endfn in various circumstances, so might actually fix more bugs at the same time. Fixes #688.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## edge (upcoming 0.8.0)
 
+*   Parser: Fix bug where keyword arguments could not be parsed if
+    method definition did not have parens around arguments.
+
 *   Support calling `String#[]` and `String#slice` with a regexp argument
 
 *   `String#[]` and `String#slice` implementation fully compliant with rubyspec
diff --git a/lib/opal/parser/grammar.rb b/lib/opal/parser/grammar.rb
diff --git a/lib/opal/parser/grammar.y b/lib/opal/parser/grammar.y
@@ -899,6 +899,7 @@ rule
                 | kDEF fname
                     {
                       push_scope
+                      lexer.lex_state = :expr_endfn
                     }
                     f_arglist bodystmt kEND
                     {
@@ -912,6 +913,7 @@ rule
                     fname
                     {
                       push_scope
+                      lexer.lex_state = :expr_endfn
                     }
                     f_arglist bodystmt kEND
                     {
@@ -1456,6 +1458,7 @@ xstring_contents: none
                 | f_args term
                     {
                       result = val[0]
+                      lexer.lex_state = :expr_beg
                     }
 
      kwrest_mark: tPOW
diff --git a/lib/opal/parser/lexer.rb b/lib/opal/parser/lexer.rb
@@ -620,6 +620,8 @@ def process_identifier(matched, cmd_start)
 
       if [:expr_beg, :expr_dot, :expr_mid, :expr_arg, :expr_cmdarg].include? @lex_state
         @lex_state = cmd_start ? :expr_cmdarg : :expr_arg
+      elsif @lex_state == :expr_fname
+        @lex_state = :expr_endfn
       else
         @lex_state = :expr_end
       end
diff --git a/spec/lib/parser/def_spec.rb b/spec/lib/parser/def_spec.rb
@@ -70,5 +70,11 @@
     it "should parse combinations of keyword args" do
       parsed("def foo(a:, b: 1, **c); end")[3].should == [:args, [:kwarg, :a], [:kwoptarg, :b, [:int, 1]], [:kwrestarg, :c]]
     end
+
+    it "should parse keywords without parens" do
+      parsed("def foo a:; end")[3].should == [:args, [:kwarg, :a]]
+      parsed("def foo a:, b:; end")[3].should == [:args, [:kwarg, :a], [:kwarg, :b]]
+      parsed("def foo a: 1, b: 2; end")[3].should == [:args, [:kwoptarg, :a, [:int, 1]], [:kwoptarg, :b, [:int, 2]]]
+    end
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -899,6 +899,7 @@ rule`
`899`	`899`	`\| kDEF fname`
`900`	`900`	`{`
`901`	`901`	`push_scope`
	`902`	`+ lexer.lex_state = :expr_endfn`
`902`	`903`	`}`
`903`	`904`	`f_arglist bodystmt kEND`
`904`	`905`	`{`
`@@ -912,6 +913,7 @@ rule`
`912`	`913`	`fname`
`913`	`914`	`{`
`914`	`915`	`push_scope`
	`916`	`+ lexer.lex_state = :expr_endfn`
`915`	`917`	`}`
`916`	`918`	`f_arglist bodystmt kEND`
`917`	`919`	`{`
`@@ -1456,6 +1458,7 @@ xstring_contents: none`
`1456`	`1458`	`\| f_args term`
`1457`	`1459`	`{`
`1458`	`1460`	`result = val[0]`
	`1461`	`+ lexer.lex_state = :expr_beg`
`1459`	`1462`	`}`
`1460`	`1463`
`1461`	`1464`	`kwrest_mark: tPOW`