create module __init__ method

Author: timfel

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

@@ -380,8 +380,8 @@ protected Iterable<Scope> findTopScopes(PythonContext context) {
         ArrayList<Scope> scopes = new ArrayList<>();
         if (context.getBuiltins() != null) {
             // false during initialization
-            scopes.add(Scope.newBuilder("__main__", context.getMainModule()).build());
-            scopes.add(Scope.newBuilder("builtins", scopeFromObject(context.getBuiltins())).build());
+            scopes.add(Scope.newBuilder(BuiltinNames.__MAIN__, context.getMainModule()).build());
+            scopes.add(Scope.newBuilder(BuiltinNames.BUILTINS, scopeFromObject(context.getBuiltins())).build());
         }
         return scopes;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -40,9 +40,6 @@
 import java.util.function.Supplier;
 import java.util.logging.Level;
 
-import com.oracle.graal.python.builtins.modules.ResourceModuleBuiltins;
-import org.graalvm.nativeimage.ImageInfo;
-
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.modules.ArrayModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.AstModuleBuiltins;
@@ -78,6 +75,7 @@
 import com.oracle.graal.python.builtins.modules.QueueModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.RandomModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.ReadlineModuleBuiltins;
+import com.oracle.graal.python.builtins.modules.ResourceModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.SREModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.SelectModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.SignalModuleBuiltins;
@@ -163,15 +161,16 @@
 import com.oracle.graal.python.builtins.objects.type.TypeBuiltins;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
 import com.oracle.graal.python.builtins.objects.zipimporter.ZipImporterBuiltins;
+import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.PythonParser;
 import com.oracle.graal.python.runtime.PythonParser.ParserMode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
+import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleFile;
@@ -182,6 +181,8 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 
+import org.graalvm.nativeimage.ImageInfo;
+
 /**
  * The core is intended to the immutable part of the interpreter, including most modules and most
  * types.
@@ -428,11 +429,11 @@ private void initializeJavaCore() {
         initializeTypes();
         populateBuiltins();
         publishBuiltinModules();
-        builtinsModule = builtinModules.get("builtins");
+        builtinsModule = builtinModules.get(BuiltinNames.BUILTINS);
     }
 
     private void initializePythonCore(String coreHome) {
-        loadFile("builtins", coreHome);
+        loadFile(BuiltinNames.BUILTINS, coreHome);
         for (String s : coreFiles) {
             loadFile(s, coreHome);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -48,64 +48,64 @@
 public enum PythonBuiltinClassType implements LazyPythonClass {
 
     ForeignObject(BuiltinNames.FOREIGN),
-    Boolean("bool", "builtins"),
+    Boolean("bool", BuiltinNames.BUILTINS),
     GetSetDescriptor("get_set_desc"),
     PArray("array", "array"),
     PArrayIterator("arrayiterator"),
     PIterator("iterator"),
     PBuiltinFunction("method_descriptor"),
     PBuiltinMethod("builtin_function_or_method"),
-    PByteArray("bytearray", "builtins"),
-    PBytes("bytes", "builtins"),
+    PByteArray("bytearray", BuiltinNames.BUILTINS),
+    PBytes("bytes", BuiltinNames.BUILTINS),
     PCell("cell"),
-    PComplex("complex", "builtins"),
-    PDict("dict", "builtins"),
+    PComplex("complex", BuiltinNames.BUILTINS),
+    PDict("dict", BuiltinNames.BUILTINS),
     PDictKeysView("dict_keys"),
     PDictItemsIterator("dict_itemsiterator"),
     PDictItemsView("dict_items"),
     PDictKeysIterator("dict_keysiterator"),
     PDictValuesIterator("dict_valuesiterator"),
     PDictValuesView("dict_values"),
     PEllipsis("ellipsis"),
-    PEnumerate("enumerate", "builtins"),
-    PFloat("float", "builtins"),
+    PEnumerate("enumerate", BuiltinNames.BUILTINS),
+    PFloat("float", BuiltinNames.BUILTINS),
     PFrame("frame"),
-    PFrozenSet("frozenset", "builtins"),
+    PFrozenSet("frozenset", BuiltinNames.BUILTINS),
     PFunction("function"),
     PGenerator("generator"),
-    PInt("int", "builtins"),
-    PList("list", "builtins"),
+    PInt("int", BuiltinNames.BUILTINS),
+    PList("list", BuiltinNames.BUILTINS),
     PMappingproxy("mappingproxy"),
-    PMemoryView("memoryview", "builtins"),
+    PMemoryView("memoryview", BuiltinNames.BUILTINS),
     PMethod("method"),
     PMMap("mmap", "mmap"),
     PNone("NoneType"),
     PNotImplemented("NotImplementedType"),
     PRandom("Random", "_random"),
-    PRange("range", "builtins"),
+    PRange("range", BuiltinNames.BUILTINS),
     PReferenceType("ReferenceType", "_weakref"),
     PSentinelIterator("callable_iterator"),
     PForeignArrayIterator("foreign_iterator"),
-    PReverseIterator("reversed", "builtins"),
-    PSet("set", "builtins"),
-    PSlice("slice", "builtins"),
-    PString("str", "builtins"),
+    PReverseIterator("reversed", BuiltinNames.BUILTINS),
+    PSet("set", BuiltinNames.BUILTINS),
+    PSlice("slice", BuiltinNames.BUILTINS),
+    PString("str", BuiltinNames.BUILTINS),
     PTraceback("traceback"),
-    PTuple("tuple", "builtins"),
-    PythonClass("type", "builtins"),
+    PTuple("tuple", BuiltinNames.BUILTINS),
+    PythonClass("type", BuiltinNames.BUILTINS),
     PythonModule("module"),
-    PythonObject("object", "builtins"),
-    Super("super", "builtins"),
+    PythonObject("object", BuiltinNames.BUILTINS),
+    Super("super", BuiltinNames.BUILTINS),
     PCode("code"),
-    PZip("zip", "builtins"),
+    PZip("zip", BuiltinNames.BUILTINS),
     PZipImporter("zipimporter", "zipimport"),
-    PBuffer("buffer", "builtins"),
+    PBuffer("buffer", BuiltinNames.BUILTINS),
     PThread("start_new_thread", "_thread"),
     PLock("LockType", "_thread"),
     PRLock("RLock", "_thread"),
     PSocket("socket", "_socket"),
-    PStaticmethod("staticmethod", "builtins"),
-    PClassmethod("classmethod", "builtins"),
+    PStaticmethod("staticmethod", BuiltinNames.BUILTINS),
+    PClassmethod("classmethod", BuiltinNames.BUILTINS),
     PScandirIterator("ScandirIterator", "posix"),
     PDirEntry("DirEntry", "posix"),
     PLZMACompressor("LZMACompressor", "_lzma"),
@@ -114,77 +114,77 @@ public enum PythonBuiltinClassType implements LazyPythonClass {
     // Errors and exceptions:
 
     // everything after BaseException is considered to be an exception
-    PBaseException("BaseException", "builtins"),
-    SystemExit("SystemExit", "builtins"),
-    KeyboardInterrupt("KeyboardInterrupt", "builtins"),
-    GeneratorExit("GeneratorExit", "builtins"),
-    Exception("Exception", "builtins"),
-    StopIteration("StopIteration", "builtins"),
-    ArithmeticError("ArithmeticError", "builtins"),
-    FloatingPointError("FloatingPointError", "builtins"),
-    OverflowError("OverflowError", "builtins"),
-    ZeroDivisionError("ZeroDivisionError", "builtins"),
-    AssertionError("AssertionError", "builtins"),
-    AttributeError("AttributeError", "builtins"),
-    BufferError("BufferError", "builtins"),
-    EOFError("EOFError", "builtins"),
-    ImportError("ImportError", "builtins"),
-    ModuleNotFoundError("ModuleNotFoundError", "builtins"),
-    LookupError("LookupError", "builtins"),
-    IndexError("IndexError", "builtins"),
-    KeyError("KeyError", "builtins"),
-    MemoryError("MemoryError", "builtins"),
-    NameError("NameError", "builtins"),
-    UnboundLocalError("UnboundLocalError", "builtins"),
-    OSError("OSError", "builtins"),
-    BlockingIOError("BlockingIOError", "builtins"),
-    ChildProcessError("ChildProcessError", "builtins"),
-    ConnectionError("ConnectionError", "builtins"),
-    BrokenPipeError("BrokenPipeError", "builtins"),
-    ConnectionAbortedError("ConnectionAbortedError", "builtins"),
-    ConnectionRefusedError("ConnectionRefusedError", "builtins"),
-    ConnectionResetError("ConnectionResetError", "builtins"),
-    FileExistsError("FileExistsError", "builtins"),
-    FileNotFoundError("FileNotFoundError", "builtins"),
-    InterruptedError("InterruptedError", "builtins"),
-    IsADirectoryError("IsADirectoryError", "builtins"),
-    NotADirectoryError("NotADirectoryError", "builtins"),
-    PermissionError("PermissionError", "builtins"),
-    ProcessLookupError("ProcessLookupError", "builtins"),
-    TimeoutError("TimeoutError", "builtins"),
+    PBaseException("BaseException", BuiltinNames.BUILTINS),
+    SystemExit("SystemExit", BuiltinNames.BUILTINS),
+    KeyboardInterrupt("KeyboardInterrupt", BuiltinNames.BUILTINS),
+    GeneratorExit("GeneratorExit", BuiltinNames.BUILTINS),
+    Exception("Exception", BuiltinNames.BUILTINS),
+    StopIteration("StopIteration", BuiltinNames.BUILTINS),
+    ArithmeticError("ArithmeticError", BuiltinNames.BUILTINS),
+    FloatingPointError("FloatingPointError", BuiltinNames.BUILTINS),
+    OverflowError("OverflowError", BuiltinNames.BUILTINS),
+    ZeroDivisionError("ZeroDivisionError", BuiltinNames.BUILTINS),
+    AssertionError("AssertionError", BuiltinNames.BUILTINS),
+    AttributeError("AttributeError", BuiltinNames.BUILTINS),
+    BufferError("BufferError", BuiltinNames.BUILTINS),
+    EOFError("EOFError", BuiltinNames.BUILTINS),
+    ImportError("ImportError", BuiltinNames.BUILTINS),
+    ModuleNotFoundError("ModuleNotFoundError", BuiltinNames.BUILTINS),
+    LookupError("LookupError", BuiltinNames.BUILTINS),
+    IndexError("IndexError", BuiltinNames.BUILTINS),
+    KeyError("KeyError", BuiltinNames.BUILTINS),
+    MemoryError("MemoryError", BuiltinNames.BUILTINS),
+    NameError("NameError", BuiltinNames.BUILTINS),
+    UnboundLocalError("UnboundLocalError", BuiltinNames.BUILTINS),
+    OSError("OSError", BuiltinNames.BUILTINS),
+    BlockingIOError("BlockingIOError", BuiltinNames.BUILTINS),
+    ChildProcessError("ChildProcessError", BuiltinNames.BUILTINS),
+    ConnectionError("ConnectionError", BuiltinNames.BUILTINS),
+    BrokenPipeError("BrokenPipeError", BuiltinNames.BUILTINS),
+    ConnectionAbortedError("ConnectionAbortedError", BuiltinNames.BUILTINS),
+    ConnectionRefusedError("ConnectionRefusedError", BuiltinNames.BUILTINS),
+    ConnectionResetError("ConnectionResetError", BuiltinNames.BUILTINS),
+    FileExistsError("FileExistsError", BuiltinNames.BUILTINS),
+    FileNotFoundError("FileNotFoundError", BuiltinNames.BUILTINS),
+    InterruptedError("InterruptedError", BuiltinNames.BUILTINS),
+    IsADirectoryError("IsADirectoryError", BuiltinNames.BUILTINS),
+    NotADirectoryError("NotADirectoryError", BuiltinNames.BUILTINS),
+    PermissionError("PermissionError", BuiltinNames.BUILTINS),
+    ProcessLookupError("ProcessLookupError", BuiltinNames.BUILTINS),
+    TimeoutError("TimeoutError", BuiltinNames.BUILTINS),
     ZipImportError("ZipImportError", "zipimport"),
     ZLibError("error", "zlib"),
     LZMAError("LZMAError", "_lzma"),
 
     // todo: all OS errors
 
-    ReferenceError("ReferenceError", "builtins"),
-    RuntimeError("RuntimeError", "builtins"),
-    NotImplementedError("NotImplementedError", "builtins"),
-    SyntaxError("SyntaxError", "builtins"),
-    IndentationError("IndentationError", "builtins"),
-    TabError("TabError", "builtins"),
-    SystemError("SystemError", "builtins"),
-    TypeError("TypeError", "builtins"),
-    ValueError("ValueError", "builtins"),
-    UnicodeError("UnicodeError", "builtins"),
-    UnicodeDecodeError("UnicodeDecodeError", "builtins"),
-    UnicodeEncodeError("UnicodeEncodeError", "builtins"),
-    UnicodeTranslateError("UnicodeTranslateError", "builtins"),
-    RecursionError("RecursionError", "builtins"),
+    ReferenceError("ReferenceError", BuiltinNames.BUILTINS),
+    RuntimeError("RuntimeError", BuiltinNames.BUILTINS),
+    NotImplementedError("NotImplementedError", BuiltinNames.BUILTINS),
+    SyntaxError("SyntaxError", BuiltinNames.BUILTINS),
+    IndentationError("IndentationError", BuiltinNames.BUILTINS),
+    TabError("TabError", BuiltinNames.BUILTINS),
+    SystemError("SystemError", BuiltinNames.BUILTINS),
+    TypeError("TypeError", BuiltinNames.BUILTINS),
+    ValueError("ValueError", BuiltinNames.BUILTINS),
+    UnicodeError("UnicodeError", BuiltinNames.BUILTINS),
+    UnicodeDecodeError("UnicodeDecodeError", BuiltinNames.BUILTINS),
+    UnicodeEncodeError("UnicodeEncodeError", BuiltinNames.BUILTINS),
+    UnicodeTranslateError("UnicodeTranslateError", BuiltinNames.BUILTINS),
+    RecursionError("RecursionError", BuiltinNames.BUILTINS),
 
     // warnings
-    Warning("Warning", "builtins"),
-    BytesWarning("BytesWarning", "builtins"),
-    DeprecationWarning("DeprecationWarning", "builtins"),
-    FutureWarning("FutureWarning", "builtins"),
-    ImportWarning("ImportWarning", "builtins"),
-    PendingDeprecationWarning("PendingDeprecationWarning", "builtins"),
-    ResourceWarning("ResourceWarning", "builtins"),
-    RuntimeWarning("RuntimeWarning", "builtins"),
-    SyntaxWarning("SyntaxWarning", "builtins"),
-    UnicodeWarning("UnicodeWarning", "builtins"),
-    UserWarning("UserWarning", "builtins");
+    Warning("Warning", BuiltinNames.BUILTINS),
+    BytesWarning("BytesWarning", BuiltinNames.BUILTINS),
+    DeprecationWarning("DeprecationWarning", BuiltinNames.BUILTINS),
+    FutureWarning("FutureWarning", BuiltinNames.BUILTINS),
+    ImportWarning("ImportWarning", BuiltinNames.BUILTINS),
+    PendingDeprecationWarning("PendingDeprecationWarning", BuiltinNames.BUILTINS),
+    ResourceWarning("ResourceWarning", BuiltinNames.BUILTINS),
+    RuntimeWarning("RuntimeWarning", BuiltinNames.BUILTINS),
+    SyntaxWarning("SyntaxWarning", BuiltinNames.BUILTINS),
+    UnicodeWarning("UnicodeWarning", BuiltinNames.BUILTINS),
+    UserWarning("UserWarning", BuiltinNames.BUILTINS);
 
     private final String name;
     private final Shape instanceShape;

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

@@ -54,7 +54,6 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__BASICSIZE__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICTOFFSET__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICT__;
-import static com.oracle.graal.python.nodes.SpecialAttributeNames.__FILE__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__ITEMSIZE__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__MODULE__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
@@ -132,6 +131,7 @@
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetMroNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
+import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithGlobalState.DefaultContextManager;
 import com.oracle.graal.python.nodes.PRaiseNode;
@@ -142,7 +142,6 @@
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.attributes.SetAttributeNode;
-import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
 import com.oracle.graal.python.nodes.builtins.TupleNodes;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
@@ -199,7 +198,7 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-@CoreFunctions(defineModule = "builtins")
+@CoreFunctions(defineModule = BuiltinNames.BUILTINS)
 public final class BuiltinConstructors extends PythonBuiltins {
 
     @Override
@@ -2391,22 +2390,26 @@ private CastToStringNode ensureCastToStringNode() {
         }
     }
 
-    @Builtin(name = MODULE, minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 3, constructsClass = PythonBuiltinClassType.PythonModule, isPublic = false)
+    @Builtin(name = MODULE, minNumOfPositionalArgs = 1, takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PythonObject, isPublic = false)
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class ModuleNode extends PythonBuiltinNode {
-        @Child private WriteAttributeToObjectNode writeFile = WriteAttributeToObjectNode.create();
-
         @Specialization
-        public PythonModule module(LazyPythonClass cls, String name, @SuppressWarnings("unused") PNone path) {
-            return factory().createPythonModule(cls, name);
+        @SuppressWarnings("unused")
+        Object doType(PythonBuiltinClass self, Object[] varargs, PKeyword[] kwargs) {
+            return factory().createPythonModule(self.getType());
+        }
+
+        @Specialization(guards = "!isPythonBuiltinClass(self)")
+        @SuppressWarnings("unused")
+        Object doManaged(PythonManagedClass self, Object[] varargs, PKeyword[] kwargs) {
+            return factory().createPythonModule(self);
         }
 
         @Specialization
-        public PythonModule module(LazyPythonClass cls, String name, String path) {
-            PythonModule module = factory().createPythonModule(cls, name);
-            writeFile.execute(module, __FILE__, path);
-            return module;
+        @SuppressWarnings("unused")
+        Object doType(PythonBuiltinClassType self, Object[] varargs, PKeyword[] kwargs) {
+            return factory().createPythonModule(self);
         }
     }
 

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

@@ -200,7 +200,7 @@
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.Source;
 
-@CoreFunctions(defineModule = "builtins")
+@CoreFunctions(defineModule = BuiltinNames.BUILTINS)
 public final class BuiltinFunctions extends PythonBuiltins {
 
     @Override
@@ -211,7 +211,7 @@ protected List<com.oracle.truffle.api.dsl.NodeFactory<? extends PythonBuiltinBas
     @Override
     public void postInitialize(PythonCore core) {
         super.postInitialize(core);
-        PythonModule builtinsModule = core.lookupBuiltinModule("builtins");
+        PythonModule builtinsModule = core.lookupBuiltinModule(BuiltinNames.BUILTINS);
         builtinsModule.setAttribute(__DEBUG__, !PythonOptions.getOption(core.getContext(), PythonOptions.PythonOptimizeFlag));
     }