Skip to content

Commit 8b5d992

Browse files
lukasstadlerfangerer
lukasstadler
authored and
fangerer
committed
style
1 parent 60bde52 commit 8b5d992

File tree

6 files changed

+5
-67
lines changed

6 files changed

+5
-67
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
4646
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.ConstCharPtr;
4747
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
48-
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Pointer;
4948
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyFrameObjectTransfer;
5049
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObject;
5150
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectBorrowed;
@@ -65,7 +64,6 @@
6564
import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
6665
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.FromCharPointerNodeGen;
6766
import com.oracle.graal.python.builtins.objects.cext.capi.PThreadState;
68-
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativeToPythonNode;
6967
import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
7068
import com.oracle.graal.python.builtins.objects.code.CodeNodes;
7169
import com.oracle.graal.python.builtins.objects.code.PCode;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_hash_t;
5252
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
5353
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Void;
54-
import static com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageIterator;
5554
import static com.oracle.graal.python.nodes.ErrorMessages.BAD_ARG_TO_INTERNAL_FUNC_WAS_S_P;
5655
import static com.oracle.graal.python.nodes.ErrorMessages.HASH_MISMATCH;
5756
import static com.oracle.graal.python.nodes.ErrorMessages.OBJ_P_HAS_NO_ATTR_S;
@@ -76,6 +75,7 @@
7675
import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageGetItem;
7776
import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageGetItemWithHash;
7877
import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageGetIterator;
78+
import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageIterator;
7979
import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageIteratorKey;
8080
import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageIteratorKeyHash;
8181
import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageIteratorNext;

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectWrapper;
6868
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PySetObject;
6969
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PySliceObject;
70-
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyThreadState;
7170
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyTupleObject;
7271
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyTypeObject;
7372
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyUnicodeObject;
@@ -108,7 +107,6 @@
108107
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsCharPointerNode;
109108
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ObSizeNode;
110109
import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes;
111-
import com.oracle.graal.python.builtins.objects.cext.capi.PThreadState;
112110
import com.oracle.graal.python.builtins.objects.cext.capi.PyMethodDefWrapper;
113111
import com.oracle.graal.python.builtins.objects.cext.capi.PyProcsWrapper;
114112
import com.oracle.graal.python.builtins.objects.cext.capi.PySequenceArrayWrapper;
@@ -162,7 +160,6 @@
162160
import com.oracle.graal.python.nodes.object.SetDictNode;
163161
import com.oracle.graal.python.nodes.util.CannotCastException;
164162
import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
165-
import com.oracle.graal.python.runtime.object.PythonObjectFactory;
166163
import com.oracle.graal.python.runtime.sequence.PSequence;
167164
import com.oracle.graal.python.runtime.sequence.storage.NativeByteSequenceStorage;
168165
import com.oracle.graal.python.runtime.sequence.storage.NativeObjectSequenceStorage;

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

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
5151
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyTypeObject;
5252
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
53-
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Void;
5453
import static com.oracle.graal.python.builtins.objects.cext.common.CExtContext.METH_CLASS;
5554
import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___DOC__;
5655
import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___NAME__;
@@ -69,7 +68,6 @@
6968
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.PyObjectSetAttrNode;
7069
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltinsFactory.CreateFunctionNodeGen;
7170
import com.oracle.graal.python.builtins.objects.PNone;
72-
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
7371
import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
7472
import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
7573
import com.oracle.graal.python.builtins.objects.cext.capi.CApiMemberAccessNodes.ReadMemberNode;
@@ -82,8 +80,6 @@
8280
import com.oracle.graal.python.builtins.objects.cext.common.CExtContext;
8381
import com.oracle.graal.python.builtins.objects.cext.common.CExtContext.Store;
8482
import com.oracle.graal.python.builtins.objects.cext.common.NativeCExtSymbol;
85-
import com.oracle.graal.python.builtins.objects.cext.structs.CFields;
86-
import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
8783
import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage;
8884
import com.oracle.graal.python.builtins.objects.dict.PDict;
8985
import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
@@ -92,7 +88,6 @@
9288
import com.oracle.graal.python.builtins.objects.object.PythonObject;
9389
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
9490
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
95-
import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
9691
import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
9792
import com.oracle.graal.python.builtins.objects.type.TypeNodes;
9893
import com.oracle.graal.python.lib.PyDictSetDefault;
@@ -390,56 +385,4 @@ int doGeneric(Object cls, PDict dict, TruffleString name, Object getter, Object
390385
return 0;
391386
}
392387
}
393-
/*-
394-
@CApiBuiltin(ret = Void, args = {Pointer, PyTypeObject}, call = Ignored)
395-
abstract static class PyTruffle_InitializeTypeStructure extends CApiBinaryBuiltinNode {
396-
397-
static Object init(Object struct, PythonManagedClass clazz,
398-
@Cached CStructAccess.ReadI64Node readI64,
399-
@Cached CStructAccess.ReadPointerNode readPointer
400-
) {
401-
long original_flags = readI64.read(struct, CFields.PyTypeObject__tp_flags);
402-
long basicsize = readI64.read(struct, CFields.PyTypeObject__tp_basicsize);
403-
long itemsize = readI64.read(struct, CFields.PyTypeObject__tp_itemsize);
404-
Object alloc_fun = readPointer.read(struct, CFields.PyTypeObject__tp_alloc);
405-
Object dealloc_fun = readPointer.read(struct, CFields.PyTypeObject__tp_dealloc);
406-
Object free_fun = readPointer.read(struct, CFields.PyTypeObject__tp_free);
407-
long vectorcall_offset = readI64.read(struct, CFields.PyTypeObject__tp_vectorcall_offset);
408-
Object as_buffer = readPointer.read(struct, CFields.PyTypeObject__tp_as_buffer);
409-
410-
411-
// unsigned long original_flags = structure->tp_flags;
412-
// Py_ssize_t basicsize = structure->tp_basicsize;
413-
// Py_ssize_t itemsize = structure->tp_itemsize;
414-
// allocfunc alloc_fun = structure->tp_alloc;
415-
// destructor dealloc_fun = structure->tp_dealloc;
416-
// freefunc free_fun = structure->tp_free;
417-
// Py_ssize_t vectorcall_offset = structure->tp_vectorcall_offset;
418-
// PyBufferProcs* as_buffer = structure->tp_as_buffer;
419-
// PyTypeObject* type_handle = assign_managed(structure, ptype);
420-
// // write flags as specified in the dummy to the PythonClass object
421-
// set_PyTypeObject_tp_flags(type_handle, original_flags | Py_TPFLAGS_READY | Py_TPFLAGS_IMMUTABLETYPE);
422-
// set_PyTypeObject_tp_basicsize(type_handle, basicsize);
423-
// set_PyTypeObject_tp_itemsize(type_handle, itemsize);
424-
// if (alloc_fun) {
425-
// set_PyTypeObject_tp_alloc(type_handle, alloc_fun);
426-
// }
427-
// if (dealloc_fun) {
428-
// set_PyTypeObject_tp_dealloc(type_handle, dealloc_fun);
429-
// }
430-
// if (free_fun) {
431-
// set_PyTypeObject_tp_free(type_handle, free_fun);
432-
// }
433-
// if (vectorcall_offset) {
434-
// set_PyTypeObject_tp_vectorcall_offset (type_handle, vectorcall_offset);
435-
// }
436-
// if (as_buffer) {
437-
// set_PyTypeObject_tp_as_buffer(type_handle, as_buffer);
438-
// }
439-
440-
return PNone.NO_VALUE;
441-
}
442-
443-
}
444-
*/
445388
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObject;
5959
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
6060
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
61-
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.SIZE_T;
6261
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.VA_LIST_PTR;
6362
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor._PY_ERROR_HANDLER;
6463
import static com.oracle.graal.python.nodes.ErrorMessages.BAD_ARG_TYPE_FOR_BUILTIN_OP;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3468,9 +3468,10 @@ static int doGeneric(@SuppressWarnings("unused") Object hpyContext, Object capsu
34683468
pyCapsule.setPointer(valuePtr);
34693469
}
34703470
case CapsuleKey.Context -> pyCapsule.setContext(valuePtr);
3471-
case CapsuleKey.Name ->
3472-
// we may assume that the pointer is owned
3473-
pyCapsule.setName(fromCharPointerNode.execute(valuePtr, false));
3471+
case CapsuleKey.Name -> {
3472+
// we may assume that the pointer is owned
3473+
pyCapsule.setName(fromCharPointerNode.execute(valuePtr, false));
3474+
}
34743475
case CapsuleKey.Destructor -> pyCapsule.setDestructor(valuePtr);
34753476
default -> throw CompilerDirectives.shouldNotReachHere("invalid key");
34763477
}

0 commit comments

Comments
 (0)