Fixes #1629. Another unexpected kDO_BLOCK error in parser

jruby · Jun 5, 2015 · 8f4ec6b · 8f4ec6b · olleolleolle · Jun 5, 2015
1 parent f4ede91
commit 8f4ec6b
Showing 6 changed files with 3,954 additions and 3,858 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
@@ -1941,13 +1941,12 @@ private int identifier(int c, boolean commandState) throws IOException {
         String tempVal = createTokenString();
 
         if (isLabelPossible(commandState)) {
-            int c2 = nextc();
-            if (c2 == ':' && !peek(':')) {
+            if (isLabelSuffix()) {
                 setState(LexState.EXPR_LABELARG);
+                nextc();
                 yaccValue = tempVal.intern();
                 return Tokens.tLABEL;
             }
-            pushback(c2);
         }
 
         if (lex_state != LexState.EXPR_DOT) {

diff --git a/core/src/main/java/org/jruby/lexer/yacc/StackState.java b/core/src/main/java/org/jruby/lexer/yacc/StackState.java
@@ -43,6 +43,10 @@ public void reset(long backup) {
         stack = backup;
     }
 
+    public long getStack() {
+        return stack;
+    }
+
     // PUSH(1)
     public long begin() {
         long old = stack;

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
@@ -1331,21 +1331,29 @@ primary         : literal
                 | tFID {
                     $$ = support.new_fcall($1);
                 }
-                | kBEGIN bodystmt kEND {
-                    $$ = new BeginNode($1, $2 == null ? NilImplicitNode.NIL : $2);
+                | kBEGIN {
+                    $$ = lexer.getCmdArgumentState().getStack();
+                    lexer.getCmdArgumentState().reset();
+                } bodystmt kEND {
+                    lexer.getCmdArgumentState().reset($<Long>2.longValue());
+                    $$ = new BeginNode($1, $3 == null ? NilImplicitNode.NIL : $3);
                 }
                 | tLPAREN_ARG {
                     lexer.setState(LexState.EXPR_ENDARG);
                 } rparen {
                     $$ = null; //FIXME: Should be implicit nil?
                 }
-                | tLPAREN_ARG expr {
+                | tLPAREN_ARG {
+                    $$ = lexer.getCmdArgumentState().getStack();
+                    lexer.getCmdArgumentState().reset();
+                } expr {
                     lexer.setState(LexState.EXPR_ENDARG); 
                 } rparen {
+                    lexer.getCmdArgumentState().reset($<Long>2.longValue());
                     if (Options.PARSER_WARN_GROUPED_EXPRESSIONS.load()) {
                       support.warning(ID.GROUPED_EXPRESSION, $1, "(...) interpreted as grouped expression");
                     }
-                    $$ = $2;
+                    $$ = $3;
                 }
                 | tLPAREN compstmt tRPAREN {
                     if ($2 != null) {
@@ -2011,7 +2019,9 @@ string_content  : tSTRING_CONTENT {
                    $$ = lexer.getStrTerm();
                    lexer.setStrTerm(null);
                    lexer.getConditionState().stop();
-                   lexer.getCmdArgumentState().stop();
+                } {
+                   $$ = lexer.getCmdArgumentState().getStack();
+                   lexer.getCmdArgumentState().reset();
                 } {
                    $$ = lexer.getState();
                    lexer.setState(LexState.EXPR_BEG);
@@ -2020,12 +2030,12 @@ string_content  : tSTRING_CONTENT {
                    lexer.setBraceNest(0);
                 } compstmt tSTRING_DEND {
                    lexer.getConditionState().restart();
-                   lexer.getCmdArgumentState().restart();
                    lexer.setStrTerm($<StrTerm>2);
-                   lexer.setState($<LexState>3);
-                   lexer.setBraceNest($<Integer>4);
+                   lexer.getCmdArgumentState().reset($<Long>3.longValue());
+                   lexer.setState($<LexState>4);
+                   lexer.setBraceNest($<Integer>5);
 
-                   $$ = support.newEvStrNode(support.getPosition($5), $5);
+                   $$ = support.newEvStrNode(support.getPosition($6), $6);
                 }
 
 string_dvar     : tGVAR {

diff --git a/core/src/main/java/org/jruby/parser/YyTables.java b/core/src/main/java/org/jruby/parser/YyTables.java
diff --git a/spec/regression/parser_regressions_spec.rb b/spec/regression/parser_regressions_spec.rb
@@ -0,0 +1,37 @@
+require 'rspec'
+
+describe "The Parsing experience" do
+  it "parses a cond which used to get confused as a tLABEL" do
+    cond = true
+    x = '('
+    a = cond ? x + ')': ''
+    a.should eq('()')
+  end
+
+  it "parse the stabby lambda even if args params separated by space" do
+    a = -> () { 1 }
+    a.call.should eq(1)
+  end
+
+  it "parses a jumbled mess of nestng" do
+    self.class.send(:define_method, :foo) { |a| a[:key].call[:key] }
+    var = 1
+    res = foo key: (proc do
+                      {
+                        key: "#{var}#{var}",
+                        other_key: proc do
+                        end
+                      }
+                    end)
+
+    res.should eq("11")
+  end
+
+  it "parsers a block do inside of a call arg list" do
+    self.class.send(:define_method, :foo) { |a| a }
+    res = foo (10.times.to_a.map do |i|
+                 7 + i
+               end)
+    res.should eq([7,8,9,10,11,12,13,14,15,16])
+  end
+end