fix using the displayhook when we run through our own launcher and add test

timfel · timfel · commit 40209318c808 · 2019-02-08T00:10:41.000+01:00
diff --git a/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java b/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
@@ -608,11 +608,7 @@ public int readEvalPrint(Context context, ConsoleHandler consoleHandler) {
                     while (true) { // processing subsequent lines while input is incomplete
                         lastStatus = 0;
                         try {
-                            Value result = context.eval(Source.newBuilder(getLanguageId(), sb.toString(), "<stdin>").interactive(true).buildLiteral());
-                            Value displayhook = sys.getMember("displayhook");
-                            if (displayhook != null && displayhook.canExecute()) {
-                                displayhook.execute(result);
-                            }
+                            context.eval(Source.newBuilder(getLanguageId(), sb.toString(), "<stdin>").interactive(true).buildLiteral());
                         } catch (PolyglotException e) {
                             if (continuePrompt == null) {
                                 continuePrompt = doEcho ? sys.getMember("ps2").asString() : null;
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_parser.py b/graalpython/com.oracle.graal.python.test/src/tests/test_parser.py
@@ -98,3 +98,19 @@ def func():
             pass
         return func
     assert run_me() == "just a string, not func", run_me()
+
+
+def test_single_input_non_interactive():
+    import sys
+    oldhook = sys.displayhook
+    got_value = None
+    def newhook(value):
+        nonlocal got_value
+        got_value = value
+    sys.displayhook = newhook
+    try:
+        code = compile('sum([1, 2, 3])', '', 'single')
+        assert exec(code) == None
+        assert got_value == 6
+    finally:
+        sys.displayhook = oldhook
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java
@@ -233,17 +233,33 @@ protected CallTarget parse(ParsingRequest request) {
         if (core.isInitialized()) {
             context.initializeMainModule(source.getPath());
         }
-        RootNode root = doParse(core, source);
+        RootNode root = doParse(context, source);
         if (core.isInitialized()) {
             return Truffle.getRuntime().createCallTarget(new TopLevelExceptionHandler(this, root));
         } else {
             return Truffle.getRuntime().createCallTarget(root);
         }
     }
 
-    private RootNode doParse(PythonCore pythonCore, Source source) {
+    private RootNode doParse(PythonContext context, Source source) {
+        ParserMode mode = null;
+        if (source.isInteractive()) {
+            if (PythonOptions.getOption(context, PythonOptions.TerminalIsInteractive)) {
+                // if we run through our own launcher, the sys.__displayhook__ would provide the
+                // printing
+                mode = ParserMode.Statement;
+            } else {
+                // if we're not run through our own launcher, the embedder will expect the normal
+                // Truffle printing
+                mode = ParserMode.InteractiveStatement;
+            }
+        } else {
+            // by default we assume a module
+            mode = ParserMode.File;
+        }
+        PythonCore pythonCore = context.getCore();
         try {
-            return (RootNode) pythonCore.getParser().parse(source.isInteractive() ? ParserMode.InteractiveStatement : ParserMode.File, pythonCore, source, null);
+            return (RootNode) pythonCore.getParser().parse(mode, pythonCore, source, null);
         } catch (PException e) {
             // handle PException during parsing (PIncompleteSourceException will propagate through)
             Truffle.getRuntime().createCallTarget(new TopLevelExceptionHandler(this, e)).call();
@@ -343,13 +359,7 @@ public static PythonCore getCore() {
 
     @Override
     protected boolean isVisible(PythonContext context, Object value) {
-        if (PythonOptions.getOption(context, PythonOptions.TerminalIsInteractive)) {
-            // if we run through our own launcher, the sys.__displayhook__ would provide the
-            // printing
-            return false;
-        } else {
-            return value != PNone.NONE && value != PNone.NO_VALUE;
-        }
+        return value != PNone.NONE && value != PNone.NO_VALUE;
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/BuiltinNames.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/BuiltinNames.java
@@ -56,6 +56,7 @@ public abstract class BuiltinNames {
     public static final String __DEBUG__ = "__debug__";
 
     // sys
+    public static final String DISPLAYHOOK = "displayhook";
     public static final String BREAKPOINTHOOK = "breakpointhook";
     public static final String EXCEPTHOOK = "excepthook";
     public static final String LAST_TYPE = "last_type";
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/NodeFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/NodeFactory.java
@@ -101,6 +101,7 @@
 import com.oracle.graal.python.nodes.statement.ImportFromNode;
 import com.oracle.graal.python.nodes.statement.ImportNode;
 import com.oracle.graal.python.nodes.statement.ImportStarNode;
+import com.oracle.graal.python.nodes.statement.PrintExpressionNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.nodes.statement.TryExceptNode;
 import com.oracle.graal.python.nodes.statement.TryFinallyNode;
@@ -565,4 +566,8 @@ public PDataModelEmulationNode createIsCallable() {
     public PDataModelEmulationNode createIsIterable() {
         return IsIterableNode.create();
     }
+
+    public PrintExpressionNode createPrintExpression(ExpressionNode body) {
+        return PrintExpressionNode.create(body);
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/PrintExpressionNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/PrintExpressionNode.java
@@ -0,0 +1,33 @@
+package com.oracle.graal.python.nodes.statement;
+
+import static com.oracle.graal.python.nodes.BuiltinNames.DISPLAYHOOK;
+
+import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.module.PythonModule;
+import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
+import com.oracle.graal.python.nodes.call.CallNode;
+import com.oracle.graal.python.nodes.expression.ExpressionNode;
+import com.oracle.truffle.api.frame.VirtualFrame;
+
+public class PrintExpressionNode extends ExpressionNode {
+    @Child GetAttributeNode getAttribute = GetAttributeNode.create(DISPLAYHOOK);
+    @Child CallNode callNode = CallNode.create();
+    @Child ExpressionNode valueNode;
+
+    public PrintExpressionNode(ExpressionNode valueNode) {
+        this.valueNode = valueNode;
+    }
+
+    @Override
+    public Object execute(VirtualFrame frame) {
+        Object value = valueNode.execute(frame);
+        PythonModule sysModule = getContext().getCore().lookupBuiltinModule("sys");
+        Object displayhook = getAttribute.executeObject(sysModule);
+        callNode.execute(frame, displayhook, value);
+        return PNone.NONE;
+    }
+
+    public static PrintExpressionNode create(ExpressionNode valueNode) {
+        return new PrintExpressionNode(valueNode);
+    }
+}
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,15 +71,14 @@ public Node parse(ParserMode mode, ParserErrorCallback errors, Source source, Fr
                     throw new RuntimeException("unexpected mode: " + mode);
             }
         } catch (Exception e) {
-            if (mode == ParserMode.InteractiveStatement || mode == ParserMode.InlineEvaluation) {
+            if (mode == ParserMode.InteractiveStatement && e instanceof PIncompleteSourceException) {
+                ((PIncompleteSourceException) e).setSource(source);
+                throw e;
+            } else if (mode == ParserMode.InlineEvaluation) {
                 try {
                     parser.reset();
                     input = parser.eval_input();
                 } catch (Exception e2) {
-                    if (mode == ParserMode.InteractiveStatement && e instanceof PIncompleteSourceException) {
-                        ((PIncompleteSourceException) e).setSource(source);
-                        throw e;
-                    }
                     throw handleParserError(errors, source, e);
                 }
             } else {
@@ -98,7 +97,7 @@ public Node parse(ParserMode mode, ParserErrorCallback errors, Source source, Fr
         defineScopes.createFrameSlotsForCellAndFreeVars();
 
         // create Truffle ASTs
-        return PythonTreeTranslator.translate(errors, source.getName(), input, environment, source, mode == ParserMode.InlineEvaluation);
+        return PythonTreeTranslator.translate(errors, source.getName(), input, environment, source, mode);
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonTreeTranslator.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonTreeTranslator.java
@@ -95,6 +95,7 @@
 import com.oracle.graal.python.parser.antlr.Python3Parser.Lambdef_nocond_bodyContext;
 import com.oracle.graal.python.parser.antlr.Python3Parser.VarargslistContext;
 import com.oracle.graal.python.runtime.PythonParser.ParserErrorCallback;
+import com.oracle.graal.python.runtime.PythonParser.ParserMode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
@@ -114,33 +115,32 @@ public final class PythonTreeTranslator extends Python3BaseVisitor<Object> {
     protected final Source source;
     protected final String name;
 
-    protected final boolean isInlineMode;
+    protected final ParserMode mode;
 
-    public PythonTreeTranslator(ParserErrorCallback errors, String name, TranslationEnvironment environment, Source source, boolean isInlineMode) {
+    public PythonTreeTranslator(ParserErrorCallback errors, String name, TranslationEnvironment environment, Source source, ParserMode mode) {
         this.errors = errors;
         this.name = name;
         this.environment = environment;
         this.source = source;
-        this.isInlineMode = isInlineMode;
+        this.mode = mode;
         this.factory = errors.getLanguage().getNodeFactory();
         this.loops = new LoopsBookKeeper();
         this.assigns = new AssignmentTranslator(errors, environment, this);
     }
 
-    public static Node translate(ParserErrorCallback errors, String name, ParserRuleContext input, TranslationEnvironment environment, Source source, boolean isInlineMode) {
-        PythonTreeTranslator translator = new PythonTreeTranslator(errors, name, environment, source, isInlineMode);
+    public static Node translate(ParserErrorCallback errors, String name, ParserRuleContext input, TranslationEnvironment environment, Source source, ParserMode mode) {
+        PythonTreeTranslator translator = new PythonTreeTranslator(errors, name, environment, source, mode);
         try {
             Object parseResult = input.accept(translator);
-            if (!isInlineMode && parseResult instanceof RootNode || isInlineMode && parseResult instanceof PNode) {
+            if (mode == ParserMode.InlineEvaluation) {
+                assert parseResult instanceof PNode : "expected PNode result for InlineEvaluation";
                 return (Node) parseResult;
             } else {
-                throw new RuntimeException("Unexpected parse result");
+                assert parseResult instanceof RootNode : "expected RootNode result from parsing";
+                return (Node) parseResult;
             }
         } catch (PException e) {
             throw e;
-        } catch (Exception t) {
-            t.printStackTrace();
-            throw new RuntimeException("Failed in " + translator + " with error " + t, t);
         }
     }
 
@@ -253,8 +253,12 @@ public Object visitSingle_input(Python3Parser.Single_inputContext ctx) {
         ExpressionNode body = asExpression(super.visitSingle_input(ctx));
         deriveSourceSection(ctx, body);
         environment.popScope();
-        if (isInlineMode) {
+        if (mode == ParserMode.InlineEvaluation) {
             return body;
+        } else if (mode == ParserMode.Statement) {
+            body = factory.createPrintExpression(body);
+            deriveSourceSection(ctx, body);
+            return factory.createModuleRoot("<expression>", getModuleDoc(ctx), body, ctx.scope.getFrameDescriptor());
         } else {
             return factory.createModuleRoot("<expression>", getModuleDoc(ctx), body, ctx.scope.getFrameDescriptor());
         }
