Complete implementation of 'SSN.SetItemSliceNode' and add 'SSN.DeleteNode'.

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/test_bytes.py

@@ -225,9 +225,8 @@ def test_setslice():
     # assert b == bytearray([5, 6, 7, 8, 9])
     b = bytearray([5, 6, 7, 8, 9])
 
-    # TODO: seq setSlice is broken ...
-    # b[0:0] = bytearray([0, 1, 2, 3, 4])
-    # assert b == bytearray(range(10))
+    b[0:0] = bytearray([0, 1, 2, 3, 4])
+    assert b == bytearray(range(10))
     b = bytearray(range(10))
 
     b[-7:-3] = bytearray([100, 101])

graalpython/com.oracle.graal.python.test/src/tests/test_list.py

@@ -615,6 +615,10 @@ def test_append(self):
         l.append("hello")
         self.assertEqual(l, [1, 0x1FF, 0x1FFFFFFFF, "hello"])
 
+        l = ["a", "b", "c"]
+        l.append("d")
+        self.assertEqual(l, ["a", "b", "c", "d"])
+
 
 class ListCompareTest(CompareTest):
 

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

@@ -59,12 +59,10 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.NoGeneralizationNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.NormalizeIndexNode;
-import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
 import com.oracle.graal.python.builtins.objects.range.PRange;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
-import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.expression.BinaryComparisonNode;
@@ -115,68 +113,18 @@ public PNone init(Object self, Object args, Object kwargs) {
     @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
     public abstract static class DelItemNode extends PythonBinaryBuiltinNode {
-        @Child private SequenceStorageNodes.NormalizeIndexNode normalize = SequenceStorageNodes.NormalizeIndexNode.forArray();
-
-        @Specialization(guards = "isByteStorage(primary)")
-        protected PNone doBytes(PByteArray primary, long idx) {
-            ByteSequenceStorage storage = (ByteSequenceStorage) primary.getSequenceStorage();
-            storage.delItemInBound(normalize.execute(idx, storage.length()));
-            return PNone.NONE;
-        }
-
-        @Specialization(guards = "isByteStorage(primary)")
-        protected PNone doBytes(PByteArray primary, PInt idx) {
-            ByteSequenceStorage storage = (ByteSequenceStorage) primary.getSequenceStorage();
-            storage.delItemInBound(normalize.execute(idx, storage.length()));
-            return PNone.NONE;
-        }
-
-        @Specialization(guards = "isIntStorage(primary)")
-        protected PNone doInt(PByteArray primary, long idx) {
-            IntSequenceStorage storage = (IntSequenceStorage) primary.getSequenceStorage();
-            storage.delItemInBound(normalize.execute(idx, storage.length()));
-            return PNone.NONE;
-        }
-
-        @Specialization(guards = "isIntStorage(primary)")
-        protected PNone doInt(PByteArray primary, PInt idx) {
-            IntSequenceStorage storage = (IntSequenceStorage) primary.getSequenceStorage();
-            storage.delItemInBound(normalize.execute(idx, storage.length()));
-            return PNone.NONE;
-        }
-
-        @Specialization
-        protected PNone doArray(PByteArray byteArray, long idx) {
-            SequenceStorage storage = byteArray.getSequenceStorage();
-            storage.delItemInBound(normalize.execute(idx, storage.length()));
-            return PNone.NONE;
-        }
-
-        @Specialization
-        protected PNone doArray(PByteArray byteArray, PInt idx) {
-            SequenceStorage storage = byteArray.getSequenceStorage();
-            storage.delItemInBound(normalize.execute(idx, storage.length()));
-            return PNone.NONE;
-        }
-
         @Specialization
-        protected PNone doSlice(PByteArray self, PSlice slice) {
-            self.delSlice(slice);
+        protected PNone doGeneric(PByteArray self, Object key,
+                        @Cached("create()") SequenceStorageNodes.DeleteNode deleteNode) {
+            deleteNode.execute(self.getSequenceStorage(), key);
             return PNone.NONE;
         }
 
         @SuppressWarnings("unused")
         @Fallback
         protected Object doGeneric(Object self, Object idx) {
-            if (!isValidIndexType(idx)) {
-                throw raise(TypeError, "bytearray indices must be integers or slices, not %p", idx);
-            }
             throw raise(TypeError, "descriptor '__delitem__' requires a 'bytearray' object but received a '%p'", idx);
         }
-
-        protected boolean isValidIndexType(Object idx) {
-            return PGuards.isInteger(idx) || idx instanceof PSlice;
-        }
     }
 
     @Builtin(name = __EQ__, fixedNumOfPositionalArgs = 2)