[GR-34916] Intrinsify python_cext - PythonCextBuiltins refactoring.

PullRequest: graalpython/2066

Author: tomasstupka

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

@@ -32,6 +32,8 @@
 public @interface CoreFunctions {
     String defineModule() default "";
 
+    String extendsModule() default "";
+
     /**
      * Most builtins are not OS specific. If specified, the builtin is included only if the os
      * matches

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

@@ -84,7 +84,7 @@
 import com.oracle.graal.python.builtins.modules.PosixShMemModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.PosixSubprocessModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.PwdModuleBuiltins;
-import com.oracle.graal.python.builtins.modules.PythonCextBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins;
 import com.oracle.graal.python.builtins.modules.QueueModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.RandomModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.ReadlineModuleBuiltins;
@@ -109,6 +109,15 @@
 import com.oracle.graal.python.builtins.modules.bz2.BZ2CompressorBuiltins;
 import com.oracle.graal.python.builtins.modules.bz2.BZ2DecompressorBuiltins;
 import com.oracle.graal.python.builtins.modules.bz2.BZ2ModuleBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextBytesBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextComplexBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextDictBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextFloatBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextListBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextLongBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextAbstractBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextSetBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltins;
 import com.oracle.graal.python.builtins.modules.csv.CSVDialectBuiltins;
 import com.oracle.graal.python.builtins.modules.csv.CSVModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.csv.CSVReaderBuiltins;
@@ -395,8 +404,7 @@ private static void filterBuiltins(List<PythonBuiltins> builtins) {
     }
 
     private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed) {
-        List<PythonBuiltins> builtins = new ArrayList<>(Arrays.asList(
-                        new BuiltinConstructors(),
+        List<PythonBuiltins> builtins = new ArrayList<>(Arrays.asList(new BuiltinConstructors(),
                         new BuiltinFunctions(),
                         new DecoratedMethodBuiltins(),
                         new ClassmethodBuiltins(),
@@ -467,6 +475,15 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
                         new RandomModuleBuiltins(),
                         new RandomBuiltins(),
                         new PythonCextBuiltins(),
+                        new PythonCextAbstractBuiltins(),
+                        new PythonCextBytesBuiltins(),
+                        new PythonCextComplexBuiltins(),
+                        new PythonCextDictBuiltins(),
+                        new PythonCextFloatBuiltins(),
+                        new PythonCextListBuiltins(),
+                        new PythonCextLongBuiltins(),
+                        new PythonCextSetBuiltins(),
+                        new PythonCextUnicodeBuiltins(),
                         new WeakRefModuleBuiltins(),
                         new ReferenceTypeBuiltins(),
                         new WarningsModuleBuiltins(),
@@ -942,6 +959,9 @@ private void populateBuiltins() {
             if (annotation.defineModule().length() > 0) {
                 addBuiltinsTo(builtinModules.get(annotation.defineModule()), builtin);
             }
+            if (annotation.extendsModule().length() > 0) {
+                addBuiltinsTo(builtinModules.get(annotation.extendsModule()), builtin);
+            }
             for (PythonBuiltinClassType klass : annotation.extendClasses()) {
                 addBuiltinsTo(lookupType(klass), builtin);
             }

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

@@ -75,7 +75,8 @@ public void initialize(Python3Core core) {
             CoreFunctions annotation = getClass().getAnnotation(CoreFunctions.class);
             final boolean declaresExplicitSelf;
             PythonBuiltinClassType constructsClass = builtin.constructsClass();
-            if (annotation.defineModule().length() > 0 && constructsClass == PythonBuiltinClassType.nil) {
+            if ((annotation.defineModule().length() > 0 || annotation.extendsModule().length() > 0) && constructsClass == PythonBuiltinClassType.nil) {
+                assert annotation.defineModule().isEmpty() && !annotation.extendsModule().isEmpty() || !annotation.defineModule().isEmpty() && annotation.extendsModule().isEmpty();
                 assert !builtin.isGetter();
                 assert !builtin.isSetter();
                 assert annotation.extendClasses().length == 0;