fix syntax error reporting in interactive shell

timfel · timfel · commit 8391bec9d837 · 2019-02-18T12:02:55.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java
@@ -71,7 +71,7 @@ public Node parse(ParserMode mode, ParserErrorCallback errors, Source source, Fr
                     throw new RuntimeException("unexpected mode: " + mode);
             }
         } catch (Exception e) {
-            if (mode == ParserMode.InteractiveStatement && e instanceof PIncompleteSourceException) {
+            if ((mode == ParserMode.InteractiveStatement || mode == ParserMode.Statement) && e instanceof PIncompleteSourceException) {
                 ((PIncompleteSourceException) e).setSource(source);
                 throw e;
             } else if (mode == ParserMode.InlineEvaluation) {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public Node parse(ParserMode mode, ParserErrorCallback errors, Source source, Fr`
`71`	`71`	`throw new RuntimeException("unexpected mode: " + mode);`
`72`	`72`	`}`
`73`	`73`	`} catch (Exception e) {`
`74`		`- if (mode == ParserMode.InteractiveStatement && e instanceof PIncompleteSourceException) {`
	`74`	`+ if ((mode == ParserMode.InteractiveStatement \|\| mode == ParserMode.Statement) && e instanceof PIncompleteSourceException) {`
`75`	`75`	`((PIncompleteSourceException) e).setSource(source);`
`76`	`76`	`throw e;`
`77`	`77`	`} else if (mode == ParserMode.InlineEvaluation) {`