Fixes #3763. Syntax error with &.< in combination with other operators

jruby · Mar 29, 2016 · f2ab40c · f2ab40c
1 parent dbbfe58
commit f2ab40c
Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperLexer.java b/core/src/main/java/org/jruby/ext/ripper/RipperLexer.java
@@ -1265,6 +1265,7 @@ private int ampersand(boolean spaceSeen) throws IOException {
             setState(EXPR_BEG);
             return Tokens.tOP_ASGN;
         case '.':
+            setState(EXPR_DOT);
             return Tokens.tANDDOT;
         }
         pushback(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
@@ -1079,6 +1079,7 @@ private int ampersand(boolean spaceSeen) throws IOException {
             setState(EXPR_BEG);
             return Tokens.tOP_ASGN;
         case '.':
+            setState(EXPR_DOT);
             yaccValue = "&.";
             return Tokens.tANDDOT;
         }
@@ -1630,7 +1631,12 @@ private int lessThan(boolean spaceSeen) throws IOException {
             if (tok != 0) return tok;
         }
 
-        setState(isAfterOperator() ? EXPR_ARG : EXPR_BEG);
+        if (isAfterOperator()) {
+            setState(EXPR_ARG);
+        } else {
+            if (isLexState(lex_state, EXPR_CLASS)) commandStart = true;
+            setState(EXPR_BEG);
+        }
 
         switch (c) {
         case '=':