Fixes #4314. 2.3 syntax failure: 'a b: 1' does not parse as method wi…

…th kwarg
jruby · Nov 17, 2016 · f755629 · f755629
1 parent a93ed52
commit f755629
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperLexer.java b/core/src/main/java/org/jruby/ext/ripper/RipperLexer.java
@@ -336,7 +336,7 @@ public int tokenize_ident(int result) {
         String value = createTokenString();
 
         if (!isLexState(last_state, EXPR_DOT|EXPR_FNAME) && parser.getCurrentScope().isDefined(value) >= 0) {
-            setState(EXPR_END);
+            setState(EXPR_END|EXPR_LABEL);
         }
 
         identValue = value.intern();

diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -1056,7 +1056,7 @@ private int yylex() throws IOException {
     private int identifierToken(int result, String value) {
         if (result == Tokens.tIDENTIFIER && !isLexState(last_state, EXPR_DOT|EXPR_FNAME) &&
                 parserSupport.getCurrentScope().isDefined(value) >= 0) {
-            setState(EXPR_END);
+            setState(EXPR_END|EXPR_LABEL);
         }
 
         yaccValue = value;

diff --git a/test/mri/excludes/TestSyntax.rb b/test/mri/excludes/TestSyntax.rb
@@ -1,6 +1,5 @@
 exclude :test__END___cr, "needs investigation"
 exclude :test_alias_symbol, "needs investigation #4308"
-exclude :test_cmdarg_kwarg_lvar_clashing_method, "needs investigation #4308"
 exclude :test_constant_reassignment_nested, "needs investigation"
 exclude :test_constant_reassignment_toplevel, "needs investigation"
 exclude :test_dedented_heredoc_with_blank_more_indented_line, "needs investigation #4308"