[GR-11992] Revert "Use str() to convert values toString and print using repr internally for interactive sources"

PullRequest: graalpython/220

Author: timfel

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

@@ -238,7 +238,7 @@ public void accessSuitePy() throws IOException {
             }
         }
         assertNotNull("Dacapo found", dacapo);
-        assertEquals("e39957904b7e79caf4fa54f30e8e4ee74d4e9e37", dacapo.getMember("sha1").toString());
+        assertEquals("'e39957904b7e79caf4fa54f30e8e4ee74d4e9e37'", dacapo.getMember("sha1").toString());
     }
 
     public static class ForeignObjectWithOOInvoke implements TruffleObject {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -34,16 +34,17 @@
 import org.graalvm.options.OptionDescriptors;
 
 import com.oracle.graal.python.builtins.Python3Core;
-import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
+import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
+import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
-import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
+import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.NodeFactory;
 import com.oracle.graal.python.nodes.PNode;
-import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.InvokeNode;
 import com.oracle.graal.python.nodes.control.TopLevelExceptionHandler;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
@@ -328,7 +329,7 @@ public static PythonCore getCore() {
 
     @Override
     protected boolean isVisible(PythonContext context, Object value) {
-        return false;
+        return value != PNone.NONE && value != PNone.NO_VALUE;
     }
 
     @Override
@@ -362,12 +363,12 @@ protected Iterable<Scope> findTopScopes(PythonContext context) {
 
     @Override
     protected String toString(PythonContext context, Object value) {
-        PythonBuiltinClass strType = context.getCore().lookupType(PythonBuiltinClassType.PString);
-        PBuiltinFunction strConstructor = (PBuiltinFunction) strType.getAttribute(SpecialMethodNames.__NEW__);
+        final PythonModule builtins = context.getBuiltins();
+        PBuiltinFunction reprMethod = ((PBuiltinMethod) builtins.getAttribute(BuiltinNames.REPR)).getFunction();
         Object[] userArgs = PArguments.create(2);
-        PArguments.setArgument(userArgs, 0, strType);
+        PArguments.setArgument(userArgs, 0, PNone.NONE);
         PArguments.setArgument(userArgs, 1, value);
-        Object res = InvokeNode.create(strConstructor).execute(null, userArgs, PKeyword.EMPTY_KEYWORDS);
+        Object res = InvokeNode.create(reprMethod).execute(null, userArgs, PKeyword.EMPTY_KEYWORDS);
         return res.toString();
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/TopLevelExceptionHandler.java

@@ -41,12 +41,9 @@
 package com.oracle.graal.python.nodes.control;
 
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemExit;
 
 import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
@@ -84,7 +81,6 @@ public class TopLevelExceptionHandler extends RootNode {
 
     @Child private CreateArgumentsNode createArgs = CreateArgumentsNode.create();
     @Child private LookupAndCallUnaryNode callStrNode = LookupAndCallUnaryNode.create(__STR__);
-    @Child private LookupAndCallUnaryNode callReprNode = LookupAndCallUnaryNode.create(__REPR__);
     @Child private CallNode callNode = CallNode.create();
 
     public TopLevelExceptionHandler(PythonLanguage language, RootNode child) {
@@ -110,9 +106,8 @@ public Object execute(VirtualFrame frame) {
             return null;
         } else {
             assert context.get().getCurrentException() == null;
-            Object result;
             try {
-                result = run(frame);
+                return run(frame);
             } catch (PException e) {
                 printExc(e);
                 return null;
@@ -125,26 +120,6 @@ public Object execute(VirtualFrame frame) {
                 }
                 throw e;
             }
-            if (getSourceSection().getSource().isInteractive()) {
-                printResult(result);
-            }
-            return result;
-        }
-    }
-
-    @TruffleBoundary
-    private void printResult(Object result) {
-        if (result instanceof PNone) {
-            return;
-        }
-        OutputStream out = getCurrentContext(PythonLanguage.class).getStandardOut();
-        String stringResult = callReprNode.executeObject(result).toString();
-        try {
-            out.write(stringResult.getBytes(StandardCharsets.UTF_8));
-            out.write(System.getProperty("line.separator").getBytes(StandardCharsets.UTF_8));
-        } catch (IOException ioex) {
-            // out stream has problems.
-            throw new IllegalStateException(ioex);
         }
     }