Fixes #3639. superclass production in parser became less restrictive …

…in 2.3
jruby · Feb 3, 2016 · 0f21ba1 · 0f21ba1
1 parent 33225b1
commit 0f21ba1
Showing 6 changed files with 8,935 additions and 8,963 deletions.
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParser.java b/core/src/main/java/org/jruby/ext/ripper/RipperParser.java
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParser.y b/core/src/main/java/org/jruby/ext/ripper/RipperParser.y
@@ -1791,15 +1791,12 @@ var_lhs         : /*mri:user_variable*/ tIDENTIFIER {
 backref         : tNTH_REF
                 | tBACK_REF
 
-superclass      : term {
-                    $$ = null;
-                }
-                | tLT {
+superclass      : tLT {
                    p.setState(LexState.EXPR_BEG);
                 } expr_value term {
                     $$ = $3;
                 }
-                | error term {
+                | /* none */ {
                    $$ = null;
                 }
 

diff --git a/core/src/main/java/org/jruby/ext/ripper/YyTables.java b/core/src/main/java/org/jruby/ext/ripper/YyTables.java
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
@@ -2191,16 +2191,13 @@ backref         : tNTH_REF {
                     $$ = $1;
                 }
 
-superclass      : term {
-                    $$ = null;
-                }
-                | tLT {
+superclass      : tLT {
                    lexer.setState(LexState.EXPR_BEG);
                    lexer.commandStart = true;
                 } expr_value term {
                     $$ = $3;
                 }
-                | error term {
+                | /* none */ {
                    $$ = null;
                 }
 

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