[hotfix] Incomplete source exception flag not set in REPL

PullRequest: graalpython/410

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java

@@ -41,8 +41,10 @@
 package com.oracle.graal.python.test.interop;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -52,6 +54,7 @@
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
+import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Context.Builder;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
@@ -76,6 +79,7 @@
 @RunWith(Enclosed.class)
 public class JavaInteropTest {
     public static class GeneralInterop extends PythonTests {
+        private static final String INCOMPLETE_SOURCE = "class A:";
         private ByteArrayOutputStream out;
         private Context context;
         private ByteArrayOutputStream err;
@@ -107,6 +111,55 @@ public void evalFailsOnError() {
             assertTrue(didFail);
         }
 
+        @Test
+        public void evalNonInteractiveThrowsSyntaxError() throws IOException {
+            try (Context c = Context.newBuilder().allowAllAccess(true).option("python.TerminalIsInteractive", "false").build()) {
+                c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(false).build());
+            } catch (PolyglotException t) {
+                assertTrue(t.isSyntaxError());
+                assertFalse(t.isIncompleteSource());
+                return;
+            }
+            fail();
+        }
+
+        @Test
+        public void evalNonInteractiveInInteractiveTerminalThrowsSyntaxError() throws IOException {
+            try (Context c = Context.newBuilder().allowAllAccess(true).option("python.TerminalIsInteractive", "true").build()) {
+                c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(false).build());
+            } catch (PolyglotException t) {
+                assertTrue(t.isSyntaxError());
+                assertFalse(t.isIncompleteSource());
+                return;
+            }
+            fail();
+        }
+
+        @Test
+        public void evalInteractiveInNonInteractiveTerminalThrowsSyntaxError() throws IOException {
+            try (Context c = Context.newBuilder().allowAllAccess(true).option("python.TerminalIsInteractive", "false").build()) {
+                c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(true).build());
+            } catch (PolyglotException t) {
+                assertTrue(t.isSyntaxError());
+                assertTrue(t.isIncompleteSource());
+                return;
+            }
+            fail();
+        }
+
+        @Test
+        public void evalInteractiveInInteractiveTerminalThrowsSyntaxError() throws IOException {
+            try (Context c = Context.newBuilder().allowAllAccess(true).option("python.TerminalIsInteractive", "true").build()) {
+                c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(true).build());
+            } catch (PolyglotException t) {
+                assertTrue(t.isSyntaxError());
+                assertTrue(t.isIncompleteSource());
+                return;
+            }
+
+            fail();
+        }
+
         @Test
         public void truffleMethodExport() {
             String source = "import polyglot\n" +

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) {