Shoe horn first updates for return syntax error from top-level as wel…

…l as fixing a bug with inDef noticing it is still inDef after evaluating a nested def.
jruby · Mar 28, 2018 · a6d4ec3 · a6d4ec3
1 parent 3242f49
commit a6d4ec3
Show file tree

Hide file tree

Showing 5 changed files with 4,903 additions and 4,754 deletions.
diff --git a/core/src/main/java/org/jruby/lexer/yacc/SyntaxException.java b/core/src/main/java/org/jruby/lexer/yacc/SyntaxException.java
@@ -60,7 +60,8 @@ public enum PID {
         NUL_IN_SYMBOL("NUL_IN_SYMBOL"),
         REGEXP_ENCODING_MISMATCH("REGEXP_ENCODING_MISMATCH"),
         INVALID_MULTIBYTE_CHAR("INVALID_MULTIBYTE_CHAR"),
-        RATIONAL_OUT_OF_RANGE("RATIONAL_OUT_OF_RANGE")
+        RATIONAL_OUT_OF_RANGE("RATIONAL_OUT_OF_RANGE"),
+        TOP_LEVEL_RETURN("TOP_LEVEL_RETURN")
         ;
 
         private String id;

diff --git a/core/src/main/java/org/jruby/parser/ParserSupport.java b/core/src/main/java/org/jruby/parser/ParserSupport.java
@@ -80,6 +80,9 @@ public class ParserSupport {
     // Is the parser currently within a method definition
     private boolean inDefinition;
 
+    // Is the parser currently within a class body.
+    private boolean inClass;
+
     protected IRubyWarnings warnings;
 
     protected ParserConfiguration configuration;
@@ -1050,6 +1053,25 @@ public void setInDef(boolean inDef) {
         this.inDefinition = inDef;
     }
 
+    public boolean isInClass() {
+        return inClass;
+    }
+
+    public void setIsInClass(boolean inClass) {
+        this.inClass = inClass;
+    }
+
+    /**
+     * Is the top of this scope a block scope (which happens in evals).
+     * This is supposed to serve same purpose as MRIs: dyna_in_block but
+     * I don't quite get why it is so complicated.  All non-eval parsers
+     * have local scopes except eval but they combine in_main || compile_for_eval?
+     */
+    public boolean isBlockTopLevel() {
+        return getConfiguration().isEvalParse();
+    }
+
+
     /** Getter for property inSingle.
      * @return Value of property inSingle.
      */