Remove obsolete method 'PSequence.index'.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/ArrayBuiltins.java

@@ -55,7 +55,6 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
-import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.DoubleSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.IntSequenceStorage;
@@ -104,8 +103,9 @@ abstract static class RMulNode extends MulNode {
     @GenerateNodeFactory
     abstract static class ContainsNode extends PythonBinaryBuiltinNode {
         @Specialization
-        boolean contains(PSequence self, Object other) {
-            return self.index(other) != -1;
+        boolean contains(PArray self, Object other,
+                        @Cached("create()") SequenceStorageNodes.ContainsNode containsNode) {
+            return containsNode.execute(self.getSequenceStorage(), other);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PArray.java

@@ -27,7 +27,6 @@
 
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
-import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PLenSupplier;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
@@ -60,11 +59,6 @@ public void delItem(int idx) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public int index(Object value) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public SequenceStorage getSequenceStorage() {
         return store;

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

@@ -88,6 +88,7 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(extendClasses = PByteArray.class)
@@ -445,8 +446,9 @@ public PByteArray copy(PByteArray byteArray) {
     @GenerateNodeFactory
     public abstract static class ByteArrayIndexNode extends PythonBuiltinNode {
         @Specialization
-        public int index(PByteArray byteArray, Object arg) {
-            return byteArray.index(arg);
+        public int index(PByteArray byteArray, Object arg,
+                        @Cached("create()") BytesNodes.FindNode findNode) {
+            return findNode.execute(byteArray, arg, 0, byteArray.len());
         }
     }
 
@@ -557,8 +559,15 @@ public int len(PByteArray self) {
     @GenerateNodeFactory
     abstract static class ContainsNode extends PythonBinaryBuiltinNode {
         @Specialization
-        boolean contains(PSequence self, Object other) {
-            return self.index(other) != -1;
+        boolean contains(PSequence self, Object other,
+                        @Cached("create()") BranchProfile errorProfile,
+                        @Cached("create()") SequenceStorageNodes.ContainsNode containsNode) {
+
+            if (!containsNode.execute(self.getSequenceStorage(), other)) {
+                errorProfile.enter();
+                throw raise(ValueError, "%s is not in bytes literal", other);
+            }
+            return true;
         }
     }
 

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

@@ -26,7 +26,6 @@
 package com.oracle.graal.python.builtins.objects.bytes;
 
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
 
 import java.util.Arrays;
 
@@ -43,7 +42,6 @@
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStoreException;
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.CompilerDirectives;
 
 public final class PByteArray extends PSequence implements PIBytesLike {
 
@@ -106,18 +104,6 @@ public void delItem(int idx) {
         store.delItemInBound(index);
     }
 
-    @Override
-    public int index(Object value) {
-        int index = store.index(value);
-
-        if (index != -1) {
-            return index;
-        }
-
-        CompilerDirectives.transferToInterpreter();
-        throw PythonLanguage.getCore().raise(ValueError, "%s is not in bytes literal", value);
-    }
-
     @Override
     public SequenceStorage getSequenceStorage() {
         return store;

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

@@ -25,11 +25,8 @@
  */
 package com.oracle.graal.python.builtins.objects.bytes;
 
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
-
 import java.util.Arrays;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PImmutableSequence;
@@ -39,7 +36,6 @@
 import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage.ElementType;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.CompilerDirectives;
 
 public final class PBytes extends PImmutableSequence implements PIBytesLike {
 
@@ -75,18 +71,6 @@ public Object getItemNormalized(int index) {
         return store.getItemNormalized(index);
     }
 
-    @Override
-    public int index(Object value) {
-        int index = store.index(value);
-
-        if (index != -1) {
-            return index;
-        }
-
-        CompilerDirectives.transferToInterpreter();
-        throw PythonLanguage.getCore().raise(ValueError, "%s is not in bytes literal", value);
-    }
-
     @Override
     public String toString() {
         // TODO(fa) really required ?

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java

@@ -1657,6 +1657,26 @@ boolean doEmpty(SequenceStorage left, Object item) {
             return false;
         }
 
+        @Specialization
+        public boolean doByteStorage(ByteSequenceStorage s, int item) {
+            return s.indexOfInt(item) != -1;
+        }
+
+        @Specialization
+        public boolean doIntStorage(IntSequenceStorage s, int item) {
+            return s.indexOfInt(item) != -1;
+        }
+
+        @Specialization
+        public boolean doLongStorage(LongSequenceStorage s, long item) {
+            return s.indexOfLong(item) != -1;
+        }
+
+        @Specialization
+        public boolean doDoubleStorage(DoubleSequenceStorage s, double item) {
+            return s.indexOfDouble(item) != -1;
+        }
+
         @Specialization
         boolean doGeneric(SequenceStorage left, Object item) {
             for (int i = 0; i < left.length(); i++) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java

@@ -1546,27 +1546,10 @@ PNotImplemented contains(@SuppressWarnings("unused") Object self, @SuppressWarni
     @Builtin(name = __CONTAINS__, fixedNumOfArguments = 2)
     @GenerateNodeFactory
     abstract static class ContainsNode extends PythonBinaryBuiltinNode {
-        @SuppressWarnings("unused")
-        @Specialization(guards = "isEmptyStorage(self)")
-        public boolean doPListEmpty(PList self, Object arg) {
-            return false;
-        }
-
-        @Specialization(guards = "isIntStorage(self)")
-        public boolean doPListInt(PList self, int arg) {
-            IntSequenceStorage store = (IntSequenceStorage) self.getSequenceStorage();
-            return store.indexOfInt(arg) != -1;
-        }
-
-        @Specialization(guards = "isDoubleStorage(self)")
-        public boolean doPListDouble(PList self, double other) {
-            DoubleSequenceStorage store = (DoubleSequenceStorage) self.getSequenceStorage();
-            return store.indexOfDouble(other) != -1;
-        }
-
         @Specialization
-        boolean contains(PSequence self, Object other) {
-            return self.index(other) != -1;
+        boolean contains(PSequence self, Object other,
+                        @Cached("create()") SequenceStorageNodes.ContainsNode containsNode) {
+            return containsNode.execute(self.getSequenceStorage(), other);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/PList.java

@@ -27,7 +27,6 @@
 
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
-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.graal.python.runtime.sequence.storage.EmptySequenceStorage;
@@ -183,11 +182,6 @@ public final PList __add__(PList other) throws ArithmeticException {
         return new PList(getPythonClass(), newStore);
     }
 
-    @Override
-    public final int index(Object value) {
-        return store.index(value);
-    }
-
     public final void insert(int index, Object value) {
         try {
             store.insertItem(index, value);

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

@@ -31,9 +31,7 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
-import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PImmutableSequence;
-import com.oracle.graal.python.runtime.sequence.SequenceUtil;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -118,11 +116,7 @@ public int len() {
 
     @Override
     public SequenceStorage getSequenceStorage() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int index(Object value) {
+        CompilerDirectives.transferToInterpreter();
         throw new UnsupportedOperationException();
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java

@@ -26,7 +26,6 @@
 package com.oracle.graal.python.builtins.objects.str;
 
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
-import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PImmutableSequence;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 
@@ -62,12 +61,6 @@ public SequenceStorage getSequenceStorage() {
         throw new UnsupportedOperationException();
     }
 
-    @SuppressWarnings("hiding")
-    @Override
-    public int index(Object value) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public int hashCode() {
         if (value instanceof LazyString) {