Finally get rid of 'SequenceUtil'.

Author: fangerer

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

@@ -125,7 +125,6 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.sequence.PSequence;
-import com.oracle.graal.python.runtime.sequence.SequenceUtil;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -1984,17 +1983,17 @@ Object call(Object klsas, Object set, Object get, Object name, Object owner) {
     public abstract static class CreateSliceNode extends PythonBuiltinNode {
         @Specialization(guards = "isNoValue(second)")
         Object sliceStop(PythonClass cls, int first, PNone second, PNone third) {
-            return factory().createSlice(SequenceUtil.MISSING_INDEX, first, SequenceUtil.MISSING_INDEX);
+            return factory().createSlice(PSlice.MISSING_INDEX, first, PSlice.MISSING_INDEX);
         }
 
         @Specialization(guards = "isNone(second)")
         Object sliceStart(PythonClass cls, int first, PNone second, PNone third) {
-            return factory().createSlice(first, SequenceUtil.MISSING_INDEX, SequenceUtil.MISSING_INDEX);
+            return factory().createSlice(first, PSlice.MISSING_INDEX, PSlice.MISSING_INDEX);
         }
 
         @Specialization(guards = "isNoValue(third)")
         Object slice(PythonClass cls, int first, int second, PNone third) {
-            return factory().createSlice(first, second, SequenceUtil.MISSING_INDEX);
+            return factory().createSlice(first, second, PSlice.MISSING_INDEX);
         }
 
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/ByteArrayBuiltins.java

@@ -26,6 +26,7 @@
 
 package com.oracle.graal.python.builtins.objects.bytes;
 
+import static com.oracle.graal.python.builtins.objects.slice.PSlice.MISSING_INDEX;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ADD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__BOOL__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DELITEM__;
@@ -46,7 +47,6 @@
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
-import static com.oracle.graal.python.runtime.sequence.SequenceUtil.MISSING_INDEX;
 
 import java.util.List;
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/AccessForeignItemNodes.java

@@ -62,7 +62,6 @@
 import com.oracle.graal.python.nodes.interop.PTypeToForeignNode;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PSequence;
-import com.oracle.graal.python.runtime.sequence.SequenceUtil;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -100,15 +99,15 @@ protected SliceInfo materializeSlice(PSlice idxSlice, TruffleObject object, Node
             // determine start
             boolean isStartMissing = false;
             int start = idxSlice.getStart();
-            if (start == SequenceUtil.MISSING_INDEX) {
+            if (start == PSlice.MISSING_INDEX) {
                 start = 0;
                 isStartMissing = true;
             }
 
             // determine stop
             int end = idxSlice.getStop();
             int foreignSize = -1;
-            if (end == SequenceUtil.MISSING_INDEX) {
+            if (end == PSlice.MISSING_INDEX) {
                 foreignSize = getForeignSize(object, getSizeNode, foreign2PTypeNode);
                 end = foreignSize;
             } else if (isStartMissing) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/RangeBuiltins.java

@@ -49,7 +49,6 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
-import com.oracle.graal.python.runtime.sequence.SequenceUtil;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -210,8 +209,8 @@ Object doPRange(PRange primary, PInt idx) {
         Object doPRange(PRange range, PSlice slice) {
             SliceInfo info = slice.computeActualIndices(range.len());
             int newStep = range.getStep() * info.step;
-            int newStart = info.start == SequenceUtil.MISSING_INDEX ? range.getStart() : range.getStart() + info.start * range.getStep();
-            int newStop = info.stop == SequenceUtil.MISSING_INDEX ? range.getStop() : Math.min(range.getStop(), newStart + info.length * newStep);
+            int newStart = info.start == PSlice.MISSING_INDEX ? range.getStart() : range.getStart() + info.start * range.getStep();
+            int newStop = info.stop == PSlice.MISSING_INDEX ? range.getStop() : Math.min(range.getStop(), newStart + info.length * newStep);
             return factory().createRange(newStart, newStop, newStep);
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PSlice.java

@@ -26,7 +26,6 @@
 package com.oracle.graal.python.builtins.objects.slice;
 
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
-import static com.oracle.graal.python.runtime.sequence.SequenceUtil.MISSING_INDEX;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
@@ -37,6 +36,8 @@
 
 public class PSlice extends PythonBuiltinObject {
 
+    public static final int MISSING_INDEX = Integer.MIN_VALUE;
+
     protected int start;
     protected int stop;
     protected final int step;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/SliceBuiltins.java

@@ -38,7 +38,6 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
-import com.oracle.graal.python.runtime.sequence.SequenceUtil;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -74,7 +73,7 @@ boolean doPRange(PSlice left, PSlice right) {
 
     @Builtin(name = "start", fixedNumOfPositionalArgs = 1, isGetter = true)
     @GenerateNodeFactory
-    @ImportStatic(SequenceUtil.class)
+    @ImportStatic(PSlice.class)
     abstract static class StartNode extends PythonUnaryBuiltinNode {
 
         @Specialization(guards = "self.getStart() != MISSING_INDEX")
@@ -90,7 +89,7 @@ protected Object getNone(@SuppressWarnings("unused") PSlice self) {
 
     @Builtin(name = "stop", fixedNumOfPositionalArgs = 1, isGetter = true)
     @GenerateNodeFactory
-    @ImportStatic(SequenceUtil.class)
+    @ImportStatic(PSlice.class)
     abstract static class StopNode extends PythonUnaryBuiltinNode {
 
         @Specialization(guards = "self.getStop() != MISSING_INDEX")
@@ -106,7 +105,7 @@ protected Object getNone(@SuppressWarnings("unused") PSlice self) {
 
     @Builtin(name = "step", fixedNumOfPositionalArgs = 1, isGetter = true)
     @GenerateNodeFactory
-    @ImportStatic(SequenceUtil.class)
+    @ImportStatic(PSlice.class)
     abstract static class StepNode extends PythonUnaryBuiltinNode {
 
         @Specialization(guards = "self.getStep() != MISSING_INDEX")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/SliceLiteralNode.java

@@ -25,7 +25,7 @@
  */
 package com.oracle.graal.python.nodes.subscript;
 
-import static com.oracle.graal.python.runtime.sequence.SequenceUtil.MISSING_INDEX;
+import static com.oracle.graal.python.builtins.objects.slice.PSlice.MISSING_INDEX;
 
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.ints.PInt;