Remove obsolete method 'PSequence.getSlice'.

fangerer · fangerer · commit 8fad81253846 · 2018-08-13T18:56:38.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PArray.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PArray.java
@@ -79,10 +79,4 @@ public void setSequenceStorage(SequenceStorage store) {
     public int len() {
         return store.length();
     }
-
-    @Override
-    protected Object getSlice(PythonObjectFactory factory, int start, int stop, int step, int length) {
-        throw new UnsupportedOperationException();
-    }
-
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java
@@ -77,11 +77,6 @@ public void setItemNormalized(int index, Object value) {
         }
     }
 
-    @Override
-    public Object getSlice(PythonObjectFactory factory, int start, int stop, int step, int length) {
-        return factory.createByteArray(this.getPythonClass(), store.getSliceInBound(start, stop, step, length));
-    }
-
     @Override
     public void setSlice(int start, int stop, int step, PSequence value) {
         final int normalizedStart = SequenceUtil.normalizeSliceStart(start, step, store.length());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PBytes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PBytes.java
@@ -75,12 +75,6 @@ public Object getItemNormalized(int index) {
         return store.getItemNormalized(index);
     }
 
-    @Override
-    public Object getSlice(PythonObjectFactory factory, int start, int stop, int step, int length) {
-        CompilerDirectives.transferToInterpreter();
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public int index(Object value) {
         int index = store.index(value);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -377,6 +377,12 @@ abstract static class GetItemSliceNode extends PBaseNode {
 
         public abstract SequenceStorage execute(SequenceStorage s, int start, int stop, int step, int length);
 
+        @Specialization
+        @SuppressWarnings("unused")
+        protected EmptySequenceStorage doEmpty(EmptySequenceStorage storage, int start, int stop, int step, int length) {
+            return EmptySequenceStorage.INSTANCE;
+        }
+
         @Specialization(limit = "5", guards = {"storage.getClass() == cachedClass"})
         protected SequenceStorage doManagedStorage(BasicSequenceStorage storage, int start, int stop, int step, int length,
                         @Cached("storage.getClass()") Class<? extends BasicSequenceStorage> cachedClass) {
@@ -487,7 +493,7 @@ protected void doScalarPInt(SequenceStorage storage, PInt idx, Object value) {
         @Specialization
         protected void doSlice(SequenceStorage storage, PSlice slice, PSequence value) {
             SliceInfo info = slice.computeActualIndices(storage.length());
-            getSetItemSliceNode().execute(storage, info.start, info.stop, info.step, info.length);
+            getSetItemSliceNode().execute(storage, info, value);
         }
 
         private SetItemScalarNode getSetItemScalarNode() {
@@ -612,78 +618,11 @@ public abstract static class SetItemSliceNode extends PBaseNode {
         @Child private Node readNode;
         @Child private Node executeNode;
 
-        public abstract Object execute(SequenceStorage s, int start, int stop, int step, int length);
-
-        @Specialization(limit = "5", guards = {"storage.getClass() == cachedClass"})
-        protected SequenceStorage doManagedStorage(BasicSequenceStorage storage, int start, int stop, int step, int length,
-                        @Cached("storage.getClass()") Class<? extends BasicSequenceStorage> cachedClass) {
-            return cachedClass.cast(storage).getSliceInBound(start, stop, step, length);
-        }
-
-        @Specialization(guards = "storage.getElementType() == BYTE")
-        protected NativeSequenceStorage doNativeByte(NativeSequenceStorage storage, int start, @SuppressWarnings("unused") int stop, int step, int length,
-                        @Cached("create()") StorageToNativeNode storageToNativeNode) {
-            byte[] newArray = new byte[length];
-            for (int i = start, j = 0; j < length; i += step, j++) {
-                newArray[j] = (byte) readNativeElement((TruffleObject) storage.getPtr(), i);
-            }
-            return storageToNativeNode.execute(newArray);
-        }
-
-        @Specialization(guards = "storage.getElementType() == INT")
-        protected NativeSequenceStorage doNativeInt(NativeSequenceStorage storage, int start, @SuppressWarnings("unused") int stop, int step, int length,
-                        @Cached("create()") StorageToNativeNode storageToNativeNode) {
-            int[] newArray = new int[length];
-            for (int i = start, j = 0; j < length; i += step, j++) {
-                newArray[j] = (int) readNativeElement((TruffleObject) storage.getPtr(), i);
-            }
-            return storageToNativeNode.execute(newArray);
-        }
+        public abstract Object execute(SequenceStorage s, SliceInfo info, Object iterable);
 
-        @Specialization(guards = "storage.getElementType() == LONG")
-        protected NativeSequenceStorage doNativeLong(NativeSequenceStorage storage, int start, @SuppressWarnings("unused") int stop, int step, int length,
-                        @Cached("create()") StorageToNativeNode storageToNativeNode) {
-            long[] newArray = new long[length];
-            for (int i = start, j = 0; j < length; i += step, j++) {
-                newArray[j] = (long) readNativeElement((TruffleObject) storage.getPtr(), i);
-            }
-            return storageToNativeNode.execute(newArray);
-        }
-
-        @Specialization(guards = "storage.getElementType() == DOUBLE")
-        protected NativeSequenceStorage doNativeDouble(NativeSequenceStorage storage, int start, @SuppressWarnings("unused") int stop, int step, int length,
-                        @Cached("create()") StorageToNativeNode storageToNativeNode) {
-            double[] newArray = new double[length];
-            for (int i = start, j = 0; j < length; i += step, j++) {
-                newArray[j] = (double) readNativeElement((TruffleObject) storage.getPtr(), i);
-            }
-            return storageToNativeNode.execute(newArray);
-        }
-
-        @Specialization(guards = "storage.getElementType() == OBJECT")
-        protected NativeSequenceStorage doNativeObject(NativeSequenceStorage storage, int start, @SuppressWarnings("unused") int stop, int step, int length,
-                        @Cached("create()") StorageToNativeNode storageToNativeNode) {
-            Object[] newArray = new Object[length];
-            for (int i = start, j = 0; j < length; i += step, j++) {
-                newArray[j] = readNativeElement((TruffleObject) storage.getPtr(), i);
-            }
-            return storageToNativeNode.execute(newArray);
-        }
-
-        private Object readNativeElement(TruffleObject ptr, int idx) {
-            try {
-                return ForeignAccess.sendRead(getReadNode(), ptr, idx);
-            } catch (InteropException e) {
-                throw e.raise();
-            }
-        }
-
-        private Node getReadNode() {
-            if (readNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                readNode = insert(Message.READ.createNode());
-            }
-            return readNode;
+        @Specialization
+        Object doGeneric(@SuppressWarnings("unused") SequenceStorage s, @SuppressWarnings("unused") SliceInfo info, @SuppressWarnings("unused") Object iterable) {
+            throw new UnsupportedOperationException();
         }
 
         public static SetItemSliceNode create() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java
@@ -268,84 +268,20 @@ protected Object doGeneric(Object self, Object objectIdx) {
     @GenerateNodeFactory
     public abstract static class GetItemNode extends PythonBinaryBuiltinNode {
 
-        @Child private NormalizeIndexNode normalize = NormalizeIndexNode.forList();
-
-        @Specialization(guards = "isIntStorage(primary)")
-        protected int doPListInt(PList primary, long idx) {
-            IntSequenceStorage storage = (IntSequenceStorage) primary.getSequenceStorage();
-            return storage.getIntItemNormalized(normalize.execute(idx, storage.length()));
-        }
-
-        @Specialization(guards = "isLongStorage(primary)")
-        protected long doPListLong(PList primary, long idx) {
-            LongSequenceStorage storage = (LongSequenceStorage) primary.getSequenceStorage();
-            return storage.getLongItemNormalized(normalize.execute(idx, storage.length()));
-        }
-
-        @Specialization(guards = "isDoubleStorage(primary)")
-        protected double doPListDouble(PList primary, long idx) {
-            DoubleSequenceStorage storage = (DoubleSequenceStorage) primary.getSequenceStorage();
-            return storage.getDoubleItemNormalized(normalize.execute(idx, storage.length()));
-        }
-
-        @Specialization(guards = "isObjectStorage(primary)")
-        protected Object doPListObject(PList primary, long idx) {
-            ObjectSequenceStorage storage = (ObjectSequenceStorage) primary.getSequenceStorage();
-            return storage.getItemNormalized(normalize.execute(idx, storage.length()));
-        }
-
-        @Specialization
-        protected Object doPList(PList list, long idx) {
-            SequenceStorage storage = list.getSequenceStorage();
-            return storage.getItemNormalized(normalize.execute(idx, storage.length()));
-        }
-
-        @Specialization(guards = "isIntStorage(primary)")
-        protected int doPListInt(PList primary, PInt idx) {
-            IntSequenceStorage storage = (IntSequenceStorage) primary.getSequenceStorage();
-            return storage.getIntItemNormalized(normalize.execute(idx, storage.length()));
-        }
-
-        @Specialization(guards = "isLongStorage(primary)")
-        protected long doPListLong(PList primary, PInt idx) {
-            LongSequenceStorage storage = (LongSequenceStorage) primary.getSequenceStorage();
-            return storage.getLongItemNormalized(normalize.execute(idx, storage.length()));
-        }
-
-        @Specialization(guards = "isDoubleStorage(primary)")
-        protected double doPListDouble(PList primary, PInt idx) {
-            DoubleSequenceStorage storage = (DoubleSequenceStorage) primary.getSequenceStorage();
-            return storage.getDoubleItemNormalized(normalize.execute(idx, storage.length()));
-        }
-
-        @Specialization(guards = "isObjectStorage(primary)")
-        protected Object doPListObject(PList primary, PInt idx) {
-            ObjectSequenceStorage storage = (ObjectSequenceStorage) primary.getSequenceStorage();
-            return storage.getItemNormalized(normalize.execute(idx, storage.length()));
-        }
-
         @Specialization
-        protected Object doPList(PList list, PInt idx) {
-            SequenceStorage storage = list.getSequenceStorage();
-            return storage.getItemNormalized(normalize.execute(idx, storage.length()));
+        protected Object doScalar(PList self, Object key,
+                        @Cached("createGetItemNode()") SequenceStorageNodes.GetItemNode getItemNode) {
+            return getItemNode.execute(self.getSequenceStorage(), key);
         }
 
-        @Specialization
-        protected Object doPListSlice(PList self, PSlice slice) {
-            return self.getSlice(factory(), slice);
+        protected static SequenceStorageNodes.GetItemNode createGetItemNode() {
+            return SequenceStorageNodes.GetItemNode.create(NormalizeIndexNode.forList(), (s, f) -> f.createList(s));
         }
 
         protected static GetItemNode create() {
             return ListBuiltinsFactory.GetItemNodeFactory.create();
         }
 
-        @Specialization
-        protected Object doObjectIndex(PList self, Object objectIdx,
-                        @Cached("create()") IndexNode getIndexNode,
-                        @Cached("create()") GetItemNode getRecursiveNode) {
-            return getRecursiveNode.execute(self, getIndexNode.execute(objectIdx));
-        }
-
         @SuppressWarnings("unused")
         @Fallback
         protected Object doGeneric(Object self, Object objectIdx) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/PList.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/PList.java
@@ -55,11 +55,6 @@ public final void setSequenceStorage(SequenceStorage newStorage) {
         this.store = newStorage;
     }
 
-    @Override
-    public final Object getSlice(PythonObjectFactory factory, int start, int stop, int step, int length) {
-        return factory.createList(getPythonClass(), store.getSliceInBound(start, stop, step, length));
-    }
-
     @Override
     public final void setSlice(PSlice slice, PSequence value) {
         // Should not be used. Replaces with ListNodes.SetSliceNode.
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/PRange.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/PRange.java
@@ -111,15 +111,6 @@ public Object getItemNormalized(int index) {
         return index * step + start;
     }
 
-    @Override
-    public Object getSlice(PythonObjectFactory factory, int sliceStart, int sliceStop, int sliceStep, int slicelength) {
-        // Parameters 'sliceStart', 'sliceStop', ... are again a range but of indices.
-        int newStep = step * sliceStep;
-        int newStart = sliceStart == SequenceUtil.MISSING_INDEX ? start : start + sliceStart * step;
-        int newStop = sliceStop == SequenceUtil.MISSING_INDEX ? stop : Math.min(stop, newStart + slicelength * newStep);
-        return factory.createRange(newStart, newStop, newStep);
-    }
-
     @Override
     public int len() {
         return length;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/RangeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/RangeBuiltins.java
@@ -42,11 +42,13 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.iterator.PIntegerIterator;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
+import com.oracle.graal.python.builtins.objects.slice.PSlice.SliceInfo;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 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;
@@ -195,7 +197,11 @@ Object doPRange(PRange primary, long idx) {
 
         @Specialization
         Object doPRange(PRange range, PSlice slice) {
-            return range.getSlice(factory(), 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);
+            return factory().createRange(newStart, newStop, newStep);
         }
 
         @Fallback
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java
@@ -52,11 +52,6 @@ public int len() {
         return value.length();
     }
 
-    @Override
-    public Object getSlice(PythonObjectFactory factory, int start, int stop, int step, int length) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public String toString() {
         return value.toString();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/PTuple.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/PTuple.java
@@ -73,11 +73,6 @@ public Object getItemNormalized(int index) {
         return store.getItemNormalized(index);
     }
 
-    @Override
-    public Object getSlice(PythonObjectFactory factory, int start, int stop, int step, int length) {
-        return factory.createTuple(store.getSliceInBound(start, stop, step, length));
-    }
-
     @Override
     public String toString() {
         CompilerAsserts.neverPartOfCompilation();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/PSequence.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/PSequence.java
@@ -27,9 +27,7 @@
 
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
-import com.oracle.graal.python.builtins.objects.slice.PSlice.SliceInfo;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
-import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
@@ -40,15 +38,6 @@ public PSequence(PythonClass cls) {
         super(cls);
     }
 
-    @Deprecated
-    public final Object getSlice(PythonObjectFactory factory, PSlice slice) {
-        SliceInfo info = slice.computeActualIndices(len());
-        return getSlice(factory, info.start, info.stop, info.step, info.length);
-    }
-
-    @Deprecated
-    protected abstract Object getSlice(PythonObjectFactory factory, int start, int stop, int step, int length);
-
     @Deprecated
     public abstract void setSlice(int start, int stop, int step, PSequence value);
 

Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,4 @@ public void setSequenceStorage(SequenceStorage store) {`
`79`	`79`	`public int len() {`
`80`	`80`	`return store.length();`
`81`	`81`	`}`
`82`		`-`
`83`		`- @Override`
`84`		`- protected Object getSlice(PythonObjectFactory factory, int start, int stop, int step, int length) {`
`85`		`- throw new UnsupportedOperationException();`
`86`		`- }`
`87`		`-`
`88`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,6 @@ public void setItemNormalized(int index, Object value) {`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`- @Override`
`81`		`- public Object getSlice(PythonObjectFactory factory, int start, int stop, int step, int length) {`
`82`		`- return factory.createByteArray(this.getPythonClass(), store.getSliceInBound(start, stop, step, length));`
`83`		`- }`
`84`		`-`
`85`	`80`	`@Override`
`86`	`81`	`public void setSlice(int start, int stop, int step, PSequence value) {`
`87`	`82`	`final int normalizedStart = SequenceUtil.normalizeSliceStart(start, step, store.length());`