[GR-18775] Error from sys.excepthook.

PullRequest: graalpython/684

Author: ppisl

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

@@ -25,6 +25,8 @@
  */
 package com.oracle.graal.python.parser;
 
+import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.ParserRuleContext;
@@ -39,6 +41,7 @@
 import com.oracle.graal.python.runtime.PythonParser;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.TruffleException;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -164,6 +167,7 @@ public Node parseN(ParserMode mode, ParserErrorCallback errors, Source source, F
                 default:
                     throw new RuntimeException("unexpected mode: " + mode);
             }
+
         } catch (Exception e) {
             if ((mode == ParserMode.InteractiveStatement || mode == ParserMode.Statement) && e instanceof PIncompleteSourceException) {
                 ((PIncompleteSourceException) e).setSource(source);
@@ -186,7 +190,6 @@ public Node parseN(ParserMode mode, ParserErrorCallback errors, Source source, F
         } catch (Exception e) {
             throw handleParserError(errors, source, e, !(mode == ParserMode.InteractiveStatement || mode == ParserMode.Statement));
         }
-
     }
 
     // @Override
@@ -262,13 +265,18 @@ public String unescapeJavaString(String str) {
     }
 
     private static PException handleParserError(ParserErrorCallback errors, Source source, Exception e, boolean showBadLine) {
-        if (e instanceof PException) {
+        if (e instanceof TruffleException && ((TruffleException) e).isSyntaxError() && e instanceof PException) {
+            if (!showBadLine) {
+                PBaseException instance = ((PException) e).getExceptionObject();
+                // In cpython shell the line with the error is not displayed, so we should do it in
+                // the same way.
+                // This rely on implementation in traceback.py file. See comment in
+                // Python3Core.raiseInvalidSyntax method
+                instance.setAttribute("text", PNone.NONE);
+            }
             return (PException) e;
         }
-        // In cpython shell the line with the error is not displayed, so we should do it in the same
-        // way
-        // This rely on implementation in traceback.py file. See comment in
-        // Python3Core.raiseInvalidSyntax method
+
         SourceSection section = showBadLine ? PythonErrorStrategy.getPosition(source, e) : source.createUnavailableSection();
         // from parser we are getting RuntimeExceptions
         String message = e instanceof RuntimeException && e.getMessage() != null ? e.getMessage() : "invalid syntax";

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/FactorySSTVisitor.java

@@ -101,7 +101,6 @@
 import com.oracle.graal.python.nodes.subscript.SliceLiteralNode;
 import com.oracle.graal.python.parser.ScopeInfo.ScopeKind;
 import com.oracle.graal.python.runtime.PythonParser;
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.SyntaxError;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -250,7 +249,7 @@ public PNode visit(AssignmentSSTNode node) {
     public PNode visit(AugAssignmentSSTNode node) {
         ExpressionNode lhs = (ExpressionNode) node.lhs.accept(this);
         if (!(lhs instanceof ReadNode)) {
-            throw errors.raise(SyntaxError, "illegal expression for augmented assignment");
+            throw errors.raiseInvalidSyntax(source, createSourceSection(node.startOffset, node.endOffset), "illegal expression for augmented assignment");
         }
         ExpressionNode rhs = (ExpressionNode) node.rhs.accept(this);
         ExpressionNode binOp = nodeFactory.createInplaceOperation(node.operation, lhs, rhs);
@@ -625,15 +624,15 @@ public PNode visit(ForSSTNode node) {
             target = targets[0];
             if (!(target instanceof ReadNode || target instanceof TupleLiteralNode || target instanceof ListLiteralNode)) {
                 if (target instanceof StarredExpressionNode) {
-                    throw errors.raise(SyntaxError, "starred assignment target must be in a list or tuple");
+                    throw errors.raiseInvalidSyntax(source, createSourceSection(node.startOffset, node.endOffset), "starred assignment target must be in a list or tuple");
                 } else {
                     // TODO handle this???
                     // String text = ctx.getText();
                     // if (environment.isNonlocal(text)) {
                     // throw errors.raise(SyntaxError, "no binding for nonlocal variable \"%s\"
                     // found", text);
                     // }
-                    throw errors.raise(SyntaxError, "Cannot assign to %s", target);
+                    throw errors.raiseInvalidSyntax(source, createSourceSection(node.startOffset, node.endOffset), "Cannot assign to %s", target);
                 }
             }
         } else {
@@ -1101,9 +1100,9 @@ public PNode visit(VarLookupSSTNode node) {
         PNode result = (PNode) scopeEnvironment.findVariable(node.name);
         if (result == null) {
             if (scopeEnvironment.isNonlocal(node.name)) {
-                throw errors.raise(SyntaxError, "no binding for nonlocal variable \"%s\" found", node.name);
+                throw errors.raiseInvalidSyntax(source, createSourceSection(node.startOffset, node.endOffset), "no binding for nonlocal variable \"%s\" found", node.name);
             }
-            throw errors.raise(SyntaxError, "Cannot assign to %s", node.name);
+            throw errors.raiseInvalidSyntax(source, createSourceSection(node.startOffset, node.endOffset), "Cannot assign to %s", node.name);
         }
         result.assignSourceSection(createSourceSection(node.startOffset, node.endOffset));
         // scopeEnvironment.setCurrentScope(oldScope);
@@ -1213,7 +1212,11 @@ private StatementNode createDestructuringAssignment(ExpressionNode[] leftHandSid
             temps[i] = tempRead;
             if (leftHandSides[i] instanceof StarredExpressionNode) {
                 if (starredIndex != -1) {
-                    throw errors.raise(SyntaxError, "two starred expressions in assignment");
+                    SourceSection section = leftHandSides[0].getSourceSection();
+                    if (section == null) {
+                        section = ((StarredExpressionNode) leftHandSides[i]).getValue().getSourceSection();
+                    }
+                    throw errors.raiseInvalidSyntax(source, section, "two starred expressions in assignment");
                 }
                 starredIndex = i;
                 statements[i] = createAssignment(((StarredExpressionNode) leftHandSides[i]).getValue(), (ExpressionNode) tempRead);