Skip to content

Commit ac12267

Browse files
committed
Fix style
1 parent 1b2191e commit ac12267

4 files changed

Lines changed: 9 additions & 14 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,8 @@
205205
import com.oracle.truffle.api.RootCallTarget;
206206
import com.oracle.truffle.api.Truffle;
207207
import com.oracle.truffle.api.TruffleLogger;
208-
import com.oracle.truffle.api.dsl.Bind;
209208
import com.oracle.truffle.api.dsl.Cached;
210209
import com.oracle.truffle.api.dsl.Cached.Exclusive;
211-
import com.oracle.truffle.api.dsl.Fallback;
212210
import com.oracle.truffle.api.dsl.GenerateCached;
213211
import com.oracle.truffle.api.dsl.GenerateInline;
214212
import com.oracle.truffle.api.dsl.GenerateUncached;

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@
5454
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
5555
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_hash_t;
5656
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Void;
57-
import static com.oracle.graal.python.runtime.nativeaccess.NativeMemory.NULLPTR;
58-
import static com.oracle.graal.python.runtime.nativeaccess.NativeMemory.readLong;
59-
import static com.oracle.graal.python.runtime.nativeaccess.NativeMemory.writeLong;
6057
import static com.oracle.graal.python.nodes.ErrorMessages.BAD_ARG_TO_INTERNAL_FUNC_WAS_S_P;
6158
import static com.oracle.graal.python.nodes.ErrorMessages.HASH_MISMATCH;
6259
import static com.oracle.graal.python.nodes.ErrorMessages.OBJ_P_HAS_NO_ATTR_S;
6360
import static com.oracle.graal.python.nodes.SpecialMethodNames.T_KEYS;
6461
import static com.oracle.graal.python.nodes.SpecialMethodNames.T_UPDATE;
6562
import static com.oracle.graal.python.runtime.PythonContext.NATIVE_NULL;
63+
import static com.oracle.graal.python.runtime.nativeaccess.NativeMemory.NULLPTR;
64+
import static com.oracle.graal.python.runtime.nativeaccess.NativeMemory.readLong;
65+
import static com.oracle.graal.python.runtime.nativeaccess.NativeMemory.writeLong;
6666

6767
import java.util.logging.Level;
6868

@@ -71,7 +71,6 @@
7171
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApi5BuiltinNode;
7272
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBinaryBuiltinNode;
7373
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBuiltin;
74-
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiNullaryBuiltinNode;
7574
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiQuaternaryBuiltinNode;
7675
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiTernaryBuiltinNode;
7776
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiUnaryBuiltinNode;
@@ -116,13 +115,13 @@
116115
import com.oracle.graal.python.lib.PyObjectGetAttr;
117116
import com.oracle.graal.python.lib.PyObjectHashNode;
118117
import com.oracle.graal.python.lib.PyUnicodeCheckNode;
119-
import com.oracle.graal.python.runtime.nativeaccess.NativeMemory;
120118
import com.oracle.graal.python.nodes.PRaiseNode;
121119
import com.oracle.graal.python.nodes.builtins.ListNodes.ConstructListNode;
122120
import com.oracle.graal.python.nodes.call.CallNode;
123121
import com.oracle.graal.python.nodes.util.CastToJavaLongExactNode;
124122
import com.oracle.graal.python.runtime.PythonContext;
125123
import com.oracle.graal.python.runtime.exception.PException;
124+
import com.oracle.graal.python.runtime.nativeaccess.NativeMemory;
126125
import com.oracle.graal.python.runtime.object.PFactory;
127126
import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
128127
import com.oracle.graal.python.util.PythonUtils;

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555
import static com.oracle.graal.python.builtins.modules.CodecsModuleBuiltins.T_UTF_32_LE;
5656
import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Direct;
5757
import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
58-
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.GRAALPY_UNICODE_INTERN_STATE_INTERNED;
59-
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.GRAALPY_UNICODE_INTERN_STATE_NOT_INTERNED;
6058
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.CONST_WCHAR_PTR;
6159
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.ConstCharPtr;
6260
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.ConstCharPtrAsTruffleString;
@@ -71,11 +69,11 @@
7169
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
7270
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
7371
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor._PY_ERROR_HANDLER;
72+
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.GRAALPY_UNICODE_INTERN_STATE_INTERNED;
73+
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.GRAALPY_UNICODE_INTERN_STATE_NOT_INTERNED;
7474
import static com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.getByteArray;
7575
import static com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess.writeLongField;
7676
import static com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess.writePtrField;
77-
import static com.oracle.graal.python.runtime.nativeaccess.NativeMemory.NULLPTR;
78-
import static com.oracle.graal.python.runtime.nativeaccess.NativeMemory.readByteArrayElement;
7977
import static com.oracle.graal.python.nodes.ErrorMessages.BAD_ARG_TYPE_FOR_BUILTIN_OP;
8078
import static com.oracle.graal.python.nodes.ErrorMessages.PRECISION_TOO_LARGE;
8179
import static com.oracle.graal.python.nodes.ErrorMessages.SEPARATOR_EXPECTED_STR_INSTANCE_P_FOUND;
@@ -86,6 +84,8 @@
8684
import static com.oracle.graal.python.nodes.StringLiterals.T_UTF8;
8785
import static com.oracle.graal.python.nodes.util.CastToJavaIntLossyNode.castLong;
8886
import static com.oracle.graal.python.runtime.PythonContext.NATIVE_NULL;
87+
import static com.oracle.graal.python.runtime.nativeaccess.NativeMemory.NULLPTR;
88+
import static com.oracle.graal.python.runtime.nativeaccess.NativeMemory.readByteArrayElement;
8989
import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
9090
import static com.oracle.truffle.api.strings.TruffleString.Encoding.UTF_16LE;
9191
import static com.oracle.truffle.api.strings.TruffleString.Encoding.UTF_32LE;
@@ -142,11 +142,9 @@
142142
import com.oracle.graal.python.lib.PyObjectLookupAttr;
143143
import com.oracle.graal.python.lib.PySliceNew;
144144
import com.oracle.graal.python.lib.PyTupleGetItem;
145-
import com.oracle.graal.python.lib.PyUnicodeCheckExactNode;
146145
import com.oracle.graal.python.lib.PyUnicodeFSDecoderNode;
147146
import com.oracle.graal.python.lib.PyUnicodeFromEncodedObject;
148147
import com.oracle.graal.python.lib.RichCmpOp;
149-
import com.oracle.graal.python.runtime.nativeaccess.NativeMemory;
150148
import com.oracle.graal.python.nodes.ErrorMessages;
151149
import com.oracle.graal.python.nodes.HiddenAttr;
152150
import com.oracle.graal.python.nodes.PGuards;
@@ -162,6 +160,7 @@
162160
import com.oracle.graal.python.runtime.PythonContext;
163161
import com.oracle.graal.python.runtime.exception.PException;
164162
import com.oracle.graal.python.runtime.exception.PythonErrorType;
163+
import com.oracle.graal.python.runtime.nativeaccess.NativeMemory;
165164
import com.oracle.graal.python.runtime.object.PFactory;
166165
import com.oracle.graal.python.util.ConcurrentWeakSet;
167166
import com.oracle.graal.python.util.OverflowException;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import com.oracle.graal.python.runtime.PythonOptions;
4747
import com.oracle.truffle.api.CompilerAsserts;
4848
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
49-
import com.oracle.truffle.api.HostCompilerDirectives.InliningCutoff;
5049
import com.oracle.truffle.api.dsl.NeverDefault;
5150
import com.oracle.truffle.api.nodes.Node;
5251
import com.oracle.truffle.api.object.DynamicObject;

0 commit comments

Comments
 (0)