Skip to content

Commit 3047905

Browse files
fangererfangerer
committed
Rename 'AbstractPythonClass' to 'PythonAbstractClass'.
1 parent 8bbd44a commit 3047905

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+269
-269
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BinasciiModuleBuiltins.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import com.oracle.graal.python.builtins.objects.ints.PInt;
6060
import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
6161
import com.oracle.graal.python.builtins.objects.module.PythonModule;
62-
import com.oracle.graal.python.builtins.objects.type.AbstractPythonClass;
62+
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
6363
import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
6464
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
6565
import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
@@ -96,9 +96,9 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
9696
public void initialize(PythonCore core) {
9797
super.initialize(core);
9898
String pre = "binascii.";
99-
AbstractPythonClass[] errorBases = new AbstractPythonClass[]{core.lookupType(PythonBuiltinClassType.ValueError)};
99+
PythonAbstractClass[] errorBases = new PythonAbstractClass[]{core.lookupType(PythonBuiltinClassType.ValueError)};
100100
builtinConstants.put(ERROR, core.factory().createPythonClass(PythonBuiltinClassType.PythonClass, pre + ERROR, errorBases));
101-
AbstractPythonClass[] incompleteBases = new AbstractPythonClass[]{core.lookupType(PythonBuiltinClassType.Exception)};
101+
PythonAbstractClass[] incompleteBases = new PythonAbstractClass[]{core.lookupType(PythonBuiltinClassType.Exception)};
102102
builtinConstants.put(INCOMPLETE, core.factory().createPythonClass(PythonBuiltinClassType.PythonClass, pre + INCOMPLETE, incompleteBases));
103103
}
104104

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
import com.oracle.graal.python.builtins.objects.set.SetNodes;
118118
import com.oracle.graal.python.builtins.objects.str.PString;
119119
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
120-
import com.oracle.graal.python.builtins.objects.type.AbstractPythonClass;
120+
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
121121
import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
122122
import com.oracle.graal.python.builtins.objects.type.ManagedPythonClass;
123123
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
@@ -1384,8 +1384,8 @@ Object doNativeObjectIndirect(PythonNativeClass self, Object[] varargs, PKeyword
13841384
return callNativeGenericNewNode(self, varargs, kwargs);
13851385
}
13861386

1387-
private static PythonNativeClass findFirstNativeBaseClass(AbstractPythonClass[] methodResolutionOrder) {
1388-
for (AbstractPythonClass cls : methodResolutionOrder) {
1387+
private static PythonNativeClass findFirstNativeBaseClass(PythonAbstractClass[] methodResolutionOrder) {
1388+
for (PythonAbstractClass cls : methodResolutionOrder) {
13891389
if (PGuards.isNativeClass(cls)) {
13901390
return PythonNativeClass.cast(cls);
13911391
}
@@ -1769,13 +1769,13 @@ public Object type(Object cls, Object obj, PNone bases, PNone dict, PKeyword[] k
17691769
}
17701770

17711771
@Specialization
1772-
public Object type(VirtualFrame frame, AbstractPythonClass cls, String name, PTuple bases, PDict namespace, PKeyword[] kwds,
1772+
public Object type(VirtualFrame frame, PythonAbstractClass cls, String name, PTuple bases, PDict namespace, PKeyword[] kwds,
17731773
@Cached("create()") GetClassNode getMetaclassNode,
17741774
@Cached("create(__NEW__)") LookupInheritedAttributeNode getNewFuncNode,
17751775
@Cached("create()") CallDispatchNode callNewFuncNode,
17761776
@Cached("create()") CreateArgumentsNode createArgs) {
17771777
// Determine the proper metatype to deal with this
1778-
AbstractPythonClass metaclass = calculate_metaclass(cls, bases, getMetaclassNode);
1778+
PythonAbstractClass metaclass = calculate_metaclass(cls, bases, getMetaclassNode);
17791779
if (metaclass != cls) {
17801780
Object newFunc = getNewFuncNode.execute(metaclass);
17811781
if (newFunc instanceof PBuiltinFunction && (((PBuiltinFunction) newFunc).getFunctionRootNode() == getRootNode())) {
@@ -1823,22 +1823,22 @@ private String getModuleNameFromGlobals(PythonObject globals) {
18231823
}
18241824

18251825
@TruffleBoundary
1826-
private Object typeMetaclass(String name, PTuple bases, PDict namespace, AbstractPythonClass metaclass) {
1826+
private Object typeMetaclass(String name, PTuple bases, PDict namespace, PythonAbstractClass metaclass) {
18271827

18281828
Object[] array = bases.getArray();
18291829

1830-
AbstractPythonClass[] basesArray;
1830+
PythonAbstractClass[] basesArray;
18311831
if (array.length == 0) {
18321832
// Adjust for empty tuple bases
1833-
basesArray = new AbstractPythonClass[]{getCore().lookupType(PythonBuiltinClassType.PythonObject)};
1833+
basesArray = new PythonAbstractClass[]{getCore().lookupType(PythonBuiltinClassType.PythonObject)};
18341834
} else {
1835-
basesArray = new AbstractPythonClass[array.length];
1835+
basesArray = new PythonAbstractClass[array.length];
18361836
for (int i = 0; i < array.length; i++) {
18371837
// TODO: deal with non-class bases
1838-
if (!(array[i] instanceof AbstractPythonClass)) {
1838+
if (!(array[i] instanceof PythonAbstractClass)) {
18391839
throw raise(NotImplementedError, "creating a class with non-class bases");
18401840
} else {
1841-
basesArray[i] = (AbstractPythonClass) array[i];
1841+
basesArray[i] = (PythonAbstractClass) array[i];
18421842
}
18431843
}
18441844
}
@@ -2075,18 +2075,18 @@ private boolean addDictIfNative(ManagedPythonClass pythonClass) {
20752075
return addedNewDict;
20762076
}
20772077

2078-
private AbstractPythonClass[] getMro(AbstractPythonClass pythonClass) {
2078+
private PythonAbstractClass[] getMro(PythonAbstractClass pythonClass) {
20792079
if (getMroNode == null) {
20802080
CompilerDirectives.transferToInterpreterAndInvalidate();
20812081
getMroNode = insert(GetMroNode.create());
20822082
}
20832083
return getMroNode.execute(pythonClass);
20842084
}
20852085

2086-
private AbstractPythonClass calculate_metaclass(AbstractPythonClass cls, PTuple bases, GetClassNode getMetaclassNode) {
2087-
AbstractPythonClass winner = cls;
2086+
private PythonAbstractClass calculate_metaclass(PythonAbstractClass cls, PTuple bases, GetClassNode getMetaclassNode) {
2087+
PythonAbstractClass winner = cls;
20882088
for (Object base : bases.getArray()) {
2089-
AbstractPythonClass typ = getMetaclassNode.execute(base);
2089+
PythonAbstractClass typ = getMetaclassNode.execute(base);
20902090
if (isSubType(winner, typ)) {
20912091
continue;
20922092
} else if (isSubType(typ, winner)) {
@@ -2099,7 +2099,7 @@ private AbstractPythonClass calculate_metaclass(AbstractPythonClass cls, PTuple
20992099
return winner;
21002100
}
21012101

2102-
private boolean isSubType(AbstractPythonClass subclass, AbstractPythonClass superclass) {
2102+
private boolean isSubType(PythonAbstractClass subclass, PythonAbstractClass superclass) {
21032103
if (isSubtypeNode == null) {
21042104
CompilerDirectives.transferToInterpreterAndInvalidate();
21052105
isSubtypeNode = insert(IsSubtypeNode.create());
@@ -2519,22 +2519,22 @@ private void denyInstantiationAfterInitialization() {
25192519

25202520
@Specialization(guards = {"!isNoValue(get)", "!isNoValue(set)"})
25212521
@TruffleBoundary
2522-
Object call(@SuppressWarnings("unused") LazyPythonClass getSetClass, Object get, Object set, String name, AbstractPythonClass owner) {
2522+
Object call(@SuppressWarnings("unused") LazyPythonClass getSetClass, Object get, Object set, String name, PythonAbstractClass owner) {
25232523
denyInstantiationAfterInitialization();
25242524
return factory().createGetSetDescriptor(get, set, name, owner);
25252525
}
25262526

25272527
@Specialization(guards = {"!isNoValue(get)", "isNoValue(set)"})
25282528
@TruffleBoundary
2529-
Object call(@SuppressWarnings("unused") LazyPythonClass getSetClass, Object get, @SuppressWarnings("unused") PNone set, String name, AbstractPythonClass owner) {
2529+
Object call(@SuppressWarnings("unused") LazyPythonClass getSetClass, Object get, @SuppressWarnings("unused") PNone set, String name, PythonAbstractClass owner) {
25302530
denyInstantiationAfterInitialization();
25312531
return factory().createGetSetDescriptor(get, null, name, owner);
25322532
}
25332533

25342534
@Specialization(guards = {"isNoValue(get)", "isNoValue(set)"})
25352535
@TruffleBoundary
25362536
@SuppressWarnings("unused")
2537-
Object call(LazyPythonClass getSetClass, PNone get, PNone set, String name, AbstractPythonClass owner) {
2537+
Object call(LazyPythonClass getSetClass, PNone get, PNone set, String name, PythonAbstractClass owner) {
25382538
denyInstantiationAfterInitialization();
25392539
return factory().createGetSetDescriptor(null, null, name, owner);
25402540
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
import com.oracle.graal.python.builtins.objects.set.PFrozenSet;
115115
import com.oracle.graal.python.builtins.objects.str.PString;
116116
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
117-
import com.oracle.graal.python.builtins.objects.type.AbstractPythonClass;
117+
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
118118
import com.oracle.graal.python.builtins.objects.type.TypeBuiltins;
119119
import com.oracle.graal.python.builtins.objects.type.TypeNodes;
120120
import com.oracle.graal.python.nodes.BuiltinNames;
@@ -1037,10 +1037,10 @@ private boolean isInstanceCheckInternal(Object instance, Object cls) {
10371037
public abstract boolean executeWith(Object instance, Object cls);
10381038

10391039
@Specialization
1040-
public boolean isInstance(Object instance, AbstractPythonClass cls,
1040+
public boolean isInstance(Object instance, PythonAbstractClass cls,
10411041
@Cached("create()") TypeNodes.IsSameTypeNode isSameTypeNode,
10421042
@Cached("create()") IsSubtypeNode isSubtypeNode) {
1043-
AbstractPythonClass instanceClass = getClassNode.execute(instance);
1043+
PythonAbstractClass instanceClass = getClassNode.execute(instance);
10441044
return isSameTypeNode.execute(instanceClass, cls) || isSubtypeNode.execute(instanceClass, cls) || isInstanceCheckInternal(instance, cls);
10451045
}
10461046

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
import com.oracle.graal.python.builtins.objects.str.PString;
119119
import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
120120
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
121-
import com.oracle.graal.python.builtins.objects.type.AbstractPythonClass;
121+
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
122122
import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
123123
import com.oracle.graal.python.builtins.objects.type.ManagedPythonClass;
124124
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
@@ -205,7 +205,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
205205
public void initialize(PythonCore core) {
206206
super.initialize(core);
207207
PythonClass errorHandlerClass = core.factory().createPythonClass(PythonBuiltinClassType.PythonClass, "CErrorHandler",
208-
new AbstractPythonClass[]{core.lookupType(PythonBuiltinClassType.PythonObject)});
208+
new PythonAbstractClass[]{core.lookupType(PythonBuiltinClassType.PythonObject)});
209209
builtinConstants.put("CErrorHandler", errorHandlerClass);
210210
builtinConstants.put(ERROR_HANDLER, core.factory().createPythonObject(errorHandlerClass));
211211
builtinConstants.put(NATIVE_NULL, new PythonNativeNull());
@@ -1342,13 +1342,13 @@ abstract static class PyTruffle_GetTpFlags extends NativeBuiltin {
13421342

13431343
@Specialization
13441344
long doPythonObject(PythonNativeWrapper nativeWrapper) {
1345-
AbstractPythonClass pclass = getClassNode().execute(nativeWrapper.getDelegate());
1345+
PythonAbstractClass pclass = getClassNode().execute(nativeWrapper.getDelegate());
13461346
return getTypeFlagsNode().execute(pclass);
13471347
}
13481348

13491349
@Specialization
13501350
long doPythonObject(PythonAbstractObject object) {
1351-
AbstractPythonClass pclass = getClassNode().execute(object);
1351+
PythonAbstractClass pclass = getClassNode().execute(object);
13521352
return getTypeFlagsNode().execute(pclass);
13531353
}
13541354

@@ -2318,7 +2318,7 @@ public abstract static class PyTruffle_Compute_Mro extends PythonUnaryBuiltinNod
23182318

23192319
@Specialization
23202320
Object doIt(PythonNativeObject self) {
2321-
AbstractPythonClass[] doSlowPath = TypeNodes.ComputeMroNode.doSlowPath(PythonNativeClass.cast(self));
2321+
PythonAbstractClass[] doSlowPath = TypeNodes.ComputeMroNode.doSlowPath(PythonNativeClass.cast(self));
23222322
return factory().createTuple(new MroSequenceStorage(doSlowPath));
23232323
}
23242324
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
import com.oracle.graal.python.builtins.objects.function.PKeyword;
7474
import com.oracle.graal.python.builtins.objects.ints.PInt;
7575
import com.oracle.graal.python.builtins.objects.str.PString;
76-
import com.oracle.graal.python.builtins.objects.type.AbstractPythonClass;
76+
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
7777
import com.oracle.graal.python.builtins.objects.type.ManagedPythonClass;
7878
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
7979
import com.oracle.graal.python.builtins.objects.type.TypeNodes;
@@ -846,12 +846,12 @@ public abstract static class GetNativeClassNode extends CExtBaseNode {
846846

847847
@CompilationFinal private TruffleObject func;
848848

849-
public abstract AbstractPythonClass execute(PythonAbstractNativeObject object);
849+
public abstract PythonAbstractClass execute(PythonAbstractNativeObject object);
850850

851851
@Specialization(guards = "object == cachedObject", limit = "1")
852-
AbstractPythonClass getNativeClassCached(@SuppressWarnings("unused") PythonAbstractNativeObject object,
852+
PythonAbstractClass getNativeClassCached(@SuppressWarnings("unused") PythonAbstractNativeObject object,
853853
@SuppressWarnings("unused") @Cached("object") PythonAbstractNativeObject cachedObject,
854-
@Cached("getNativeClass(cachedObject)") AbstractPythonClass cachedClass) {
854+
@Cached("getNativeClass(cachedObject)") PythonAbstractClass cachedClass) {
855855
// TODO: (tfel) is this really something we can do? It's so rare for this class to
856856
// change that it shouldn't be worth the effort, but in native code, anything can
857857
// happen. OTOH, CPython also has caches that can become invalid when someone just goes
@@ -860,14 +860,14 @@ AbstractPythonClass getNativeClassCached(@SuppressWarnings("unused") PythonAbstr
860860
}
861861

862862
@Specialization
863-
AbstractPythonClass getNativeClass(PythonAbstractNativeObject object) {
863+
PythonAbstractClass getNativeClass(PythonAbstractNativeObject object) {
864864
// do not convert wrap 'object.object' since that is really the native pointer object
865-
return (AbstractPythonClass) getToJavaNode().execute(getCallGetObTypeNode().call(object.object));
865+
return (PythonAbstractClass) getToJavaNode().execute(getCallGetObTypeNode().call(object.object));
866866
}
867867

868868
@TruffleBoundary
869-
public static AbstractPythonClass doSlowPath(PythonAbstractNativeObject object) {
870-
return (AbstractPythonClass) AsPythonObjectNode.doSlowPath(PCallCapiFunction.doSlowPath(NativeCAPISymbols.FUN_GET_OB_TYPE, object.getPtr()), true);
869+
public static PythonAbstractClass doSlowPath(PythonAbstractNativeObject object) {
870+
return (PythonAbstractClass) AsPythonObjectNode.doSlowPath(PCallCapiFunction.doSlowPath(NativeCAPISymbols.FUN_GET_OB_TYPE, object.getPtr()), true);
871871
}
872872

873873
private AsPythonObjectNode getToJavaNode() {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PThreadStateMR.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import com.oracle.graal.python.builtins.objects.dict.PDict;
5656
import com.oracle.graal.python.builtins.objects.exception.PBaseException;
5757
import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
58-
import com.oracle.graal.python.builtins.objects.type.AbstractPythonClass;
58+
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
5959
import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
6060
import com.oracle.graal.python.nodes.PNodeWithContext;
6161
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
@@ -135,7 +135,7 @@ abstract static class ThreadStateReadNode extends PNodeWithContext {
135135
public abstract Object execute(Object key);
136136

137137
@Specialization(guards = "eq(key, CUR_EXC_TYPE)")
138-
AbstractPythonClass doCurExcType(@SuppressWarnings("unused") String key) {
138+
PythonAbstractClass doCurExcType(@SuppressWarnings("unused") String key) {
139139
PythonContext context = getContext();
140140
PException currentException = context.getCurrentException();
141141
if (currentException != null) {
@@ -168,7 +168,7 @@ PTraceback doCurExcTraceback(@SuppressWarnings("unused") String key) {
168168
}
169169

170170
@Specialization(guards = "eq(key, EXC_TYPE)")
171-
AbstractPythonClass doExcType(@SuppressWarnings("unused") String key) {
171+
PythonAbstractClass doExcType(@SuppressWarnings("unused") String key) {
172172
PythonContext context = getContext();
173173
PException currentException = context.getCaughtException();
174174
if (currentException != null) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyBufferProcsWrapper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
package com.oracle.graal.python.builtins.objects.cext;
4242

4343
import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonNativeWrapper;
44-
import com.oracle.graal.python.builtins.objects.type.AbstractPythonClass;
44+
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
4545
import com.oracle.truffle.api.interop.ForeignAccess;
4646
import com.oracle.truffle.api.interop.TruffleObject;
4747

4848
public class PyBufferProcsWrapper extends PythonNativeWrapper {
4949

50-
public PyBufferProcsWrapper(AbstractPythonClass delegate) {
50+
public PyBufferProcsWrapper(PythonAbstractClass delegate) {
5151
super(delegate);
5252
}
5353

@@ -60,7 +60,7 @@ public ForeignAccess getForeignAccess() {
6060
return PyBufferProcsWrapperMRForeign.ACCESS;
6161
}
6262

63-
public AbstractPythonClass getPythonClass() {
64-
return (AbstractPythonClass) getDelegate();
63+
public PythonAbstractClass getPythonClass() {
64+
return (PythonAbstractClass) getDelegate();
6565
}
6666
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyBufferProcsWrapperMR.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToSulongNode;
4545
import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonClassNativeWrapper;
4646
import com.oracle.graal.python.builtins.objects.cext.PyBufferProcsWrapperMRFactory.GetBufferProcsNodeGen;
47-
import com.oracle.graal.python.builtins.objects.type.AbstractPythonClass;
47+
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
4848
import com.oracle.graal.python.builtins.objects.type.ManagedPythonClass;
4949
import com.oracle.graal.python.nodes.PNodeWithContext;
5050
import com.oracle.truffle.api.CompilerDirectives;
@@ -73,7 +73,7 @@ public Object access(PyBufferProcsWrapper object, String key) {
7373
abstract static class GetBufferProcsNode extends PNodeWithContext {
7474
@Child private ToSulongNode toSulongNode;
7575

76-
public abstract Object execute(AbstractPythonClass clazz, String key);
76+
public abstract Object execute(PythonAbstractClass clazz, String key);
7777

7878
@Specialization
7979
Object doManagedClass(ManagedPythonClass clazz, String key) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonNativeClass.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*/
4141
package com.oracle.graal.python.builtins.objects.cext;
4242

43-
import com.oracle.graal.python.builtins.objects.type.AbstractPythonClass;
43+
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
4444
import com.oracle.truffle.api.interop.TruffleObject;
4545

4646
/**
@@ -49,7 +49,7 @@
4949
* types are assumed to be mutated afterwards, so accessing the struct in native mode would work,
5050
* but our copy should just never become stale.
5151
*/
52-
public interface PythonNativeClass extends AbstractPythonClass {
52+
public interface PythonNativeClass extends PythonAbstractClass {
5353

5454
TruffleObject getPtr();
5555

0 commit comments

Comments
 (0)