Fixes #3946. warning: Ambiguous first argument

jruby · Jun 14, 2016 · df2e1a3 · df2e1a3
1 parent 2c8c071
commit df2e1a3
Showing 2 changed files with 9 additions and 11 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
@@ -604,8 +604,9 @@ private int hereDocumentIdentifier() throws IOException {
         return term == '`' ? Tokens.tXSTRING_BEG : Tokens.tSTRING_BEG;
     }
 
-    private void arg_ambiguous() {
+    private boolean arg_ambiguous() {
         parser.dispatch("on_arg_ambiguous");
+        return true;
     }
 
     /*
@@ -1826,8 +1827,7 @@ private int minus(boolean spaceSeen) throws IOException {
             setState(EXPR_ENDFN);
             return Tokens.tLAMBDA;
         }
-        if (isBEG() || isSpaceArg(c, spaceSeen)) {
-            if (isARG()) arg_ambiguous();
+        if (isBEG() || (isSpaceArg(c, spaceSeen) && arg_ambiguous())) {
             setState(EXPR_BEG);
             pushback(c);
             if (Character.isDigit(c)) {
@@ -1901,9 +1901,8 @@ private int plus(boolean spaceSeen) throws IOException {
 
             return Tokens.tOP_ASGN;
         }
-
-        if (isBEG() || isSpaceArg(c, spaceSeen)) {
-            if (isARG()) arg_ambiguous();
+
+        if (isBEG() || (isSpaceArg(c, spaceSeen) && arg_ambiguous())) {
             setState(EXPR_BEG);
             pushback(c);
             if (Character.isDigit(c)) {

diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -654,10 +654,11 @@ private int hereDocumentIdentifier() throws IOException {
         return Tokens.tSTRING_BEG;
     }
 
-    private void arg_ambiguous() {
+    private boolean arg_ambiguous() {
         if (warnings.isVerbose() && Options.PARSER_WARN_AMBIGUOUS_ARGUMENTS.load() && !ParserSupport.skipTruffleRubiniusWarnings(this)) {
             warnings.warning(ID.AMBIGUOUS_ARGUMENT, getPosition(), "Ambiguous first argument; make sure.");
         }
+        return true;
     }
 
     /*
@@ -1689,8 +1690,7 @@ private int minus(boolean spaceSeen) throws IOException {
             yaccValue = "->";
             return Tokens.tLAMBDA;
         }
-        if (isBEG() || isSpaceArg(c, spaceSeen)) {
-            if (isARG()) arg_ambiguous();
+        if (isBEG() || (isSpaceArg(c, spaceSeen) && arg_ambiguous())) {
             setState(EXPR_BEG);
             pushback(c);
             yaccValue = "-";
@@ -1773,8 +1773,7 @@ private int plus(boolean spaceSeen) throws IOException {
             return Tokens.tOP_ASGN;
         }
 
-        if (isBEG() || isSpaceArg(c, spaceSeen)) {
-            if (isARG()) arg_ambiguous();
+        if (isBEG() || (isSpaceArg(c, spaceSeen) && arg_ambiguous())) {
             setState(EXPR_BEG);
             pushback(c);
             if (Character.isDigit(c)) {