Fixes #2744. Syntax error with file that has OK syntax with MRI 2.2

jruby · Jun 4, 2015 · 5f93f4c · 5f93f4c
1 parent 73035f8
commit 5f93f4c
Showing 4 changed files with 3,854 additions and 3,902 deletions.
diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -748,6 +748,10 @@ private boolean isLabelSuffix() {
         return peek(':') && !peek(':', 1);
     }
 
+    private boolean isAfterOperator() {
+        return lex_state == LexState.EXPR_FNAME || lex_state == LexState.EXPR_DOT;
+    }
+
     private void determineExpressionState() {
         switch (lex_state) {
         case EXPR_FNAME: case EXPR_DOT:
@@ -2190,7 +2194,7 @@ private int pipe() throws IOException {
 
     private int plus(boolean spaceSeen) throws IOException {
         int c = nextc();
-        if (lex_state == LexState.EXPR_FNAME || lex_state == LexState.EXPR_DOT) {
+        if (isAfterOperator()) {
             setState(LexState.EXPR_ARG);
             if (c == '@') {
                 yaccValue = "+@";

diff --git a/core/src/main/java/org/jruby/parser/RubyParser.java b/core/src/main/java/org/jruby/parser/RubyParser.java
diff --git a/core/src/main/java/org/jruby/parser/RubyParser.y b/core/src/main/java/org/jruby/parser/RubyParser.y
@@ -1173,8 +1173,12 @@ arg             : lhs '=' arg {
                 | kDEFINED opt_nl arg {
                     $$ = support.new_defined($1, $3);
                 }
-                | arg '?' arg opt_nl ':' arg {
-                    $$ = new IfNode(support.getPosition($1), support.getConditionNode($1), $3, $6);
+                | arg '?' {
+                    lexer.getConditionState().begin();
+                } arg opt_nl ':' {
+                    lexer.getConditionState().end();
+                } arg {
+                    $$ = new IfNode(support.getPosition($1), support.getConditionNode($1), $4, $8);
                 }
                 | primary {
                     $$ = $1;

diff --git a/core/src/main/java/org/jruby/parser/YyTables.java b/core/src/main/java/org/jruby/parser/YyTables.java