AST conversion python->java

Author: otethal

graalpython/com.oracle.graal.python.pegparser/src/com/oracle/graal/python/pegparser/sst/ConstantValue.java

@@ -150,6 +150,11 @@ public static ConstantValue ofRaw(Object o) {
         return new ConstantValue(o, Kind.RAW);
     }
 
+    public static ConstantValue ofArbitraryPythonObject(Object o) {
+        assert Kind.ARBITRARY_PYTHON_OBJECT.checkValueType(o);
+        return new ConstantValue(o, Kind.ARBITRARY_PYTHON_OBJECT);
+    }
+
     public enum Kind {
         ARBITRARY_PYTHON_OBJECT() {
             @Override

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

@@ -524,9 +524,21 @@ public RootCallTarget parseForBytecodeInterpreter(PythonContext context, Source
         RaisePythonExceptionErrorCallback errorCb = new RaisePythonExceptionErrorCallback(source, PythonOptions.isPExceptionWithJavaStacktrace(this));
         try {
             Parser parser = Compiler.createParser(source.getCharacters().toString(), errorCb, type, interactiveTerminal);
-            Compiler compiler = new Compiler(errorCb);
             ModTy mod = (ModTy) parser.parse();
             assert mod != null;
+            return compileForBytecodeInterpreter(context, mod, source, topLevel, optimize, argumentNames);
+        } catch (PException e) {
+            if (topLevel) {
+                PythonUtils.getOrCreateCallTarget(new TopLevelExceptionHandler(this, e)).call();
+            }
+            throw e;
+        }
+    }
+
+    public RootCallTarget compileForBytecodeInterpreter(PythonContext context, ModTy mod, Source source, boolean topLevel, int optimize, List<String> argumentNames) {
+        RaisePythonExceptionErrorCallback errorCb = new RaisePythonExceptionErrorCallback(source, PythonOptions.isPExceptionWithJavaStacktrace(this));
+        try {
+            Compiler compiler = new Compiler(errorCb);
             boolean hasArguments = argumentNames != null && !argumentNames.isEmpty();
             if (hasArguments) {
                 mod = transformASTForExecutionWithArguments(argumentNames, mod);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -1148,14 +1148,7 @@ Object compile(TruffleString expression, TruffleString filename, TruffleString m
             } else {
                 ct = getCore().getLanguage().cacheCode(filename, createCode);
             }
-            RootCallTarget rootCallTarget = (RootCallTarget) ct;
-            RootNode rootNode = rootCallTarget.getRootNode();
-            if (rootNode instanceof PBytecodeRootNode) {
-                ((PBytecodeRootNode) rootNode).triggerDeferredDeprecationWarnings();
-            } else if (rootNode instanceof PRootNode) {
-                ((PRootNode) rootNode).triggerDeprecationWarnings();
-            }
-            return factory().createCode(rootCallTarget);
+            return wrapRootCallTarget((RootCallTarget) ct);
         }
 
         @Specialization(limit = "3")
@@ -1214,11 +1207,29 @@ Object generic(VirtualFrame frame, Object wSource, Object wFilename, Object wMod
                 }
                 checkOptimize(optimize, kwOptimize);
             }
+            if (getCore().isCoreInitialized() && AstModuleBuiltins.isAst(getContext(), wSource)) {
+                ModTy mod = AstModuleBuiltins.obj2sst(getContext(), wSource);
+                // TODO _PyAST_Validate
+                // TODO fake source
+                Source source = Source.newBuilder(PythonLanguage.ID, "", "").build();
+                RootCallTarget rootCallTarget = getLanguage().compileForBytecodeInterpreter(getContext(), mod, source, false, optimize, null);
+                return wrapRootCallTarget(rootCallTarget);
+            }
             TruffleString source = sourceAsString(frame, wSource, filename, interopLib, acquireLib, bufferLib, handleDecodingErrorNode, asStrNode, switchEncodingNode);
             checkSource(source);
             return compile(source, filename, mode, flags, kwDontInherit, optimize);
         }
 
+        private PCode wrapRootCallTarget(RootCallTarget rootCallTarget) {
+            RootNode rootNode = rootCallTarget.getRootNode();
+            if (rootNode instanceof PBytecodeRootNode) {
+                ((PBytecodeRootNode) rootNode).triggerDeferredDeprecationWarnings();
+            } else if (rootNode instanceof PRootNode) {
+                ((PRootNode) rootNode).triggerDeprecationWarnings();
+            }
+            return factory().createCode(rootCallTarget);
+        }
+
         private void checkSource(TruffleString source) throws PException {
             if (source.indexOfCodePointUncached(0, 0, source.codePointLengthUncached(TS_ENCODING), TS_ENCODING) > -1) {
                 throw raise(ValueError, ErrorMessages.SRC_CODE_CANNOT_CONTAIN_NULL_BYTES);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ast/AstModuleBuiltins.java

@@ -56,10 +56,12 @@
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
+import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.pegparser.sst.ModTy;
 import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -92,12 +94,6 @@ public void initialize(Python3Core core) {
         clsAst.setAttribute(T__FIELDS, emptyTuple);
         clsAst.setAttribute(T__ATTRIBUTES, emptyTuple);
         // TODO clsAst.setAttribute('__match_args__', emptyTuple);
-    }
-
-    @Override
-    @SuppressWarnings("unused")
-    public void postInitialize(Python3Core core) {
-        super.postInitialize(core);
         PythonModule astModule = core.lookupBuiltinModule(T__AST);
         AstTypeFactory astTypeFactory = new AstTypeFactory(core.getLanguage(), core.factory(), astModule);
         AstState state = new AstState(astTypeFactory, core.lookupType(PythonBuiltinClassType.AST));
@@ -108,7 +104,18 @@ private static AstState getAstState(PythonContext context) {
         return (AstState) ReadAttributeFromObjectNode.getUncached().execute(context.lookupBuiltinModule(T__AST), AST_STATE_KEY);
     }
 
+    @TruffleBoundary
     public static Object sst2Obj(PythonContext context, ModTy mod) {
         return mod.accept(new Sst2ObjVisitor(getAstState(context)));
     }
+
+    @TruffleBoundary
+    public static ModTy obj2sst(PythonContext context, Object obj) {
+        return new Obj2Sst(getAstState(context)).obj2ModTy(obj);
+    }
+
+    @TruffleBoundary
+    public static boolean isAst(PythonContext context, Object obj) {
+        return Obj2SstBase.isInstanceOf(obj, getAstState(context).clsAst);
+    }
 }