[GR-31030] SyntaxError in f-string quits interpreter.

Author: ppisl

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/SourceEvalTests.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.oracle.graal.python.test.parser;
+
+import com.oracle.graal.python.PythonLanguage;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
+import org.graalvm.polyglot.PolyglotException;
+import org.graalvm.polyglot.Source;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class SourceEvalTests {
+
+    @Test
+    public void ExpressionSourceIsInteractive() throws Exception {
+        // The parser creates another source for parsing the string expression.
+        // This test check, whether the exception comes with source with
+        // interactive attribute inherited from the original source
+        Engine engine = Engine.newBuilder().build();
+        Context currentContext = Context.newBuilder().engine(engine).allowExperimentalOptions(true).allowAllAccess(true).build();
+        currentContext.initialize("python");
+        Source source = Source.newBuilder(PythonLanguage.ID, "f'{1+5.6.6}", "InteractiveError").interactive(true).build();
+        try {
+            currentContext.eval(source);
+        } catch (PolyglotException e) {
+            Assert.assertTrue(e.getSourceLocation().getSource().isInteractive());
+            Assert.assertFalse(e.isExit());
+        }
+        source = Source.newBuilder(PythonLanguage.ID, "f'{1+5.6.6}", "InteractiveError2").interactive(false).build();
+        try {
+            currentContext.eval(source);
+        } catch (PolyglotException e) {
+            Assert.assertFalse(e.getSourceLocation().getSource().isInteractive());
+            Assert.assertFalse(e.isExit());
+        }
+        currentContext.close();
+    }
+}

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

@@ -109,8 +109,8 @@ private static Python3Parser getPython3Parser(String sourceText) {
     }
 
     @Override
-    public SSTNode parseExpression(String text, PythonSSTNodeFactory nodeFactory) {
-        Source source = Source.newBuilder(PythonLanguage.ID, text, "<fstring-expr>").build();
+    public SSTNode parseExpression(String text, PythonSSTNodeFactory nodeFactory, boolean fromInteractiveSource) {
+        Source source = Source.newBuilder(PythonLanguage.ID, text, "<fstring-expr>").interactive(fromInteractiveSource).build();
         return parseWithANTLR(ParserMode.FStringExpression, 0, PythonLanguage.getCore(), nodeFactory, source, null,
                         null).antlrResult;
     }

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

@@ -106,7 +106,7 @@ public final class PythonSSTNodeFactory {
      * Service that allows parsing expressions found inside f-strings to SST nodes.
      */
     public interface FStringExprParser {
-        SSTNode parseExpression(String text, PythonSSTNodeFactory nodeFactory);
+        SSTNode parseExpression(String text, PythonSSTNodeFactory nodeFactory, boolean fromInteractiveSource);
     }
 
     private final NodeFactory nodeFactory;

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

@@ -114,7 +114,7 @@ private static SSTNode createFormatStringLiteralSSTNodeFromToken(ArrayList<Token
         int specTokensCount = token.formatTokensCount;
         // the expression has to be wrapped in ()
         code = "(" + code + ")";
-        SSTNode expression = exprParser.parseExpression(code, nodeFactory);
+        SSTNode expression = exprParser.parseExpression(code, nodeFactory, source.isInteractive());
         SSTNode specifier = null;
         if (specTokensCount > 0) {
             SSTNode[] specifierParts = new SSTNode[specTokensCount];