[GR-10012] merge Gihub PR #4

PullRequest: graalpython/62

Author: cosminbasca

ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  overlay: "04e081a67fa68810f0043968f7537f003ea8fbe6",
+  overlay: "4c51f4dae2d670a4895aaafbe47780ac2541c008",
 
   // ======================================================================================================
   // 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -313,7 +313,7 @@ protected boolean isObjectOfLanguage(Object object) {
     protected Object findMetaObject(PythonContext context, Object value) {
         if (value != null) {
             if (value instanceof PythonObject) {
-                return ((PythonObject) value).asPythonClass().getName();
+                return ((PythonObject) value).asPythonClass();
             } else if (value instanceof PythonAbstractObject ||
                             value instanceof Number ||
                             value instanceof String ||
@@ -339,14 +339,16 @@ protected Iterable<Scope> findLocalScopes(PythonContext context, Node node, Fram
         for (Scope s : super.findLocalScopes(context, node, frame)) {
             scopes.add(s);
         }
-        PythonObject globals = PArguments.getGlobals(frame);
-        if (globals != null) {
-            scopes.add(Scope.newBuilder("globals()", globals).build());
-        }
-        Frame generatorFrame = PArguments.getGeneratorFrame(frame);
-        if (generatorFrame != null) {
-            for (Scope s : super.findLocalScopes(context, node, generatorFrame)) {
-                scopes.add(s);
+        if (frame != null) {
+            PythonObject globals = PArguments.getGlobals(frame);
+            if (globals != null) {
+                scopes.add(Scope.newBuilder("globals()", globals).build());
+            }
+            Frame generatorFrame = PArguments.getGeneratorFrame(frame);
+            if (generatorFrame != null) {
+                for (Scope s : super.findLocalScopes(context, node, generatorFrame)) {
+                    scopes.add(s);
+                }
             }
         }
         return scopes;
@@ -356,6 +358,7 @@ protected Iterable<Scope> findLocalScopes(PythonContext context, Node node, Fram
     protected Iterable<Scope> findTopScopes(PythonContext context) {
         ArrayList<Scope> scopes = new ArrayList<>();
         scopes.add(Scope.newBuilder("__main__", context.getMainModule()).build());
+        scopes.add(Scope.newBuilder("builtins", context.getBuiltins()).build());
         return scopes;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonBaseTreeTranslator.java

@@ -162,7 +162,7 @@ public Object visitChildren(RuleNode node) {
     }
 
     protected void deriveSourceSection(RuleNode node, Object r) {
-        if (r instanceof PNode) {
+        if (r instanceof PNode && ((PNode) r).getSourceSection() == null) {
             SourceSection derivedSection = deriveSourceSection(node);
             if (derivedSection != null) {
                 ((PNode) r).assignSourceSection(derivedSection);
@@ -186,7 +186,7 @@ private SourceSection deriveSourceSection(RuleNode node) {
         } else if (node instanceof ParserRuleContext) {
             int start = ((ParserRuleContext) node).getStart().getStartIndex();
             int stop = ((ParserRuleContext) node).getStop().getStopIndex();
-            return createSourceSection(start, stop - start);
+            return createSourceSection(start, stop - start + 1);
         }
         return null;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java

@@ -91,8 +91,8 @@ private static ParserRuleContext preParseWithAntlr(PythonCore core, Source sourc
                         Token token = ((RecognitionException) e).getOffendingToken();
                         line = token.getLine();
                         column = token.getCharPositionInLine();
-                    } else if (e.getCause() instanceof NoViableAltException) {
-                        Token token = ((NoViableAltException) e.getCause()).getOffendingToken();
+                    } else if (e.getCause() instanceof RecognitionException) {
+                        Token token = ((RecognitionException) e.getCause()).getOffendingToken();
                         line = token.getLine();
                         column = token.getCharPositionInLine();
                     } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/DescriptiveBailErrorListener.java

@@ -38,14 +38,15 @@
  */
 package com.oracle.graal.python.parser.antlr;
 
-import com.oracle.graal.python.runtime.PythonParser.PIncompleteSourceException;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
+import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.misc.IntervalSet;
 
+import com.oracle.graal.python.runtime.PythonParser.PIncompleteSourceException;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+
 /**
  * An error listener that immediately bails out of the parse (does not recover) and throws a runtime
  * exception with a descriptive error message.
@@ -73,7 +74,9 @@ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
                 throw handleRecognitionException;
             }
         }
-
+        if (offendingSymbol instanceof Token) {
+            throw new RuntimeException(entireMessage, new EmptyRecognitionException(entireMessage, recognizer, (Token) offendingSymbol));
+        }
         throw new RuntimeException(entireMessage, e);
     }
 
@@ -83,4 +86,19 @@ private static PIncompleteSourceException handleRecognitionException(IntervalSet
         }
         return null;
     }
+
+    private static class EmptyRecognitionException extends RecognitionException {
+        private static final long serialVersionUID = 1L;
+        private Token offendingToken;
+
+        public EmptyRecognitionException(String message, Recognizer<?, ?> recognizer, Token offendingToken) {
+            super(message, recognizer, offendingToken.getInputStream(), null);
+            this.offendingToken = offendingToken;
+        }
+
+        @Override
+        public Token getOffendingToken() {
+            return offendingToken;
+        }
+    }
 }