[GR-21867] Remove LazyPythonClass

PullRequest: graalpython/1050

Author: qunaibit

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

@@ -172,7 +172,6 @@
 import com.oracle.graal.python.builtins.objects.thread.ThreadBuiltins;
 import com.oracle.graal.python.builtins.objects.traceback.TracebackBuiltins;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
-import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.TypeBuiltins;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
@@ -747,7 +746,7 @@ public SourceSection getSourceSection() {
     @TruffleBoundary
     public RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, Node location, String message, Object... arguments) {
         PBaseException instance;
-        LazyPythonClass cls;
+        Object cls;
         switch (type) {
             case Indentation:
                 cls = IndentationError;

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

@@ -240,7 +240,6 @@ public boolean isAcceptableBase() {
         return basetype;
     }
 
-    @Override
     public String getName() {
         return name;
     }

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

@@ -40,7 +40,6 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.range.PRange;
-import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.control.GetIteratorExpressionNode.GetIteratorNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
@@ -71,15 +70,15 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     abstract static class PythonArrayNode extends PythonBuiltinNode {
 
         @Specialization(guards = "isNoValue(initializer)")
-        PArray array(LazyPythonClass cls, String typeCode, @SuppressWarnings("unused") PNone initializer) {
+        PArray array(Object cls, String typeCode, @SuppressWarnings("unused") PNone initializer) {
             /**
              * TODO @param typeCode should be a char, not a string
              */
             return makeEmptyArray(cls, typeCode.charAt(0));
         }
 
         @Specialization
-        PArray arrayWithRangeInitializer(LazyPythonClass cls, String typeCode, PRange range) {
+        PArray arrayWithRangeInitializer(Object cls, String typeCode, PRange range) {
             if (!typeCode.equals("i")) {
                 typeError(typeCode, range);
             }
@@ -99,7 +98,7 @@ PArray arrayWithRangeInitializer(LazyPythonClass cls, String typeCode, PRange ra
         }
 
         @Specialization
-        PArray arrayWithSequenceInitializer(LazyPythonClass cls, String typeCode, String str) {
+        PArray arrayWithSequenceInitializer(Object cls, String typeCode, String str) {
             if (!typeCode.equals("c")) {
                 typeError(typeCode, str);
             }
@@ -128,7 +127,7 @@ protected boolean isDoubleArray(String typeCode) {
         }
 
         @Specialization(guards = "isByteArray(typeCode)")
-        PArray arrayByteInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
+        PArray arrayByteInitializer(VirtualFrame frame, Object cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
                         @Cached("createCast()") CastToByteNode castToByteNode,
                         @Cached("create()") GetIteratorNode getIterator,
                         @Cached("create()") GetNextNode next,
@@ -153,15 +152,15 @@ PArray arrayByteInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWa
         }
 
         @Specialization(guards = "isCharArray(typeCode)")
-        PArray arrayCharInitializer(LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
+        PArray arrayCharInitializer(Object cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
                         @Cached SequenceNodes.GetSequenceStorageNode getSequenceStorageNode,
                         @Cached SequenceStorageNodes.ToByteArrayNode toByteArrayNode) {
             byte[] byteArray = toByteArrayNode.execute(getSequenceStorageNode.execute(initializer));
             return factory().createArray(cls, byteArray);
         }
 
         @Specialization(guards = "isIntArray(typeCode)")
-        PArray arrayIntInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
+        PArray arrayIntInitializer(VirtualFrame frame, Object cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
                         @Cached("create()") GetIteratorNode getIterator,
                         @Cached("create()") GetNextNode next,
                         @Cached("create()") IsBuiltinClassProfile errorProfile,
@@ -190,7 +189,7 @@ PArray arrayIntInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWar
         }
 
         @Specialization(guards = "isLongArray(typeCode)")
-        PArray arrayLongInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
+        PArray arrayLongInitializer(VirtualFrame frame, Object cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
                         @Cached("create()") GetIteratorNode getIterator,
                         @Cached("create()") GetNextNode next,
                         @Cached("create()") IsBuiltinClassProfile errorProfile,
@@ -219,7 +218,7 @@ PArray arrayLongInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWa
         }
 
         @Specialization(guards = "isDoubleArray(typeCode)")
-        PArray arrayDoubleInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
+        PArray arrayDoubleInitializer(VirtualFrame frame, Object cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
                         @Cached("create()") GetIteratorNode getIterator,
                         @Cached("create()") GetNextNode next,
                         @Cached("create()") IsBuiltinClassProfile errorProfile,
@@ -251,7 +250,7 @@ PArray arrayDoubleInitializer(VirtualFrame frame, LazyPythonClass cls, @Suppress
 
         @Specialization
         @TruffleBoundary
-        PArray arrayWithObjectInitializer(@SuppressWarnings("unused") LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, Object initializer) {
+        PArray arrayWithObjectInitializer(@SuppressWarnings("unused") Object cls, @SuppressWarnings("unused") String typeCode, Object initializer) {
             if (!(isIntArray(typeCode) || isByteArray(typeCode) || isDoubleArray(typeCode) || isCharArray(typeCode))) {
                 // TODO implement support for typecodes: b, B, u, h, H, i, I, l, L, q, Q, f or d
                 throw raise(ValueError, ErrorMessages.BAD_TYPECODE);
@@ -260,7 +259,7 @@ PArray arrayWithObjectInitializer(@SuppressWarnings("unused") LazyPythonClass cl
         }
 
         @Specialization(guards = "!isString(typeCode)")
-        PArray noArray(@SuppressWarnings("unused") LazyPythonClass cls, Object typeCode, @SuppressWarnings("unused") Object initializer) {
+        PArray noArray(@SuppressWarnings("unused") Object cls, Object typeCode, @SuppressWarnings("unused") Object initializer) {
             throw raise(TypeError, ErrorMessages.ARG_MUST_BE_UNICODE, "array()", 1, typeCode);
         }