[GR-11082] Harmonize sequence operations and move to nodes.

PullRequest: graalpython/177

Author: fangerer

graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java

@@ -388,7 +388,7 @@ protected static boolean isMapping(Value par0) {
         private static boolean hasMemoryError(SnippetRun snippetRun) {
             PolyglotException exception = snippetRun.getException();
             if (exception != null && exception.isGuestException()) {
-                return "MemoryError".equals(exception.getMessage());
+                return "MemoryError".equals(exception.getMessage()) || exception.getMessage().contains("OverflowError");
             }
             return false;
         }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/TestParserTranslator.java

@@ -181,14 +181,14 @@ public void parseNumbers() {
     @Test
     public void parseLiteralList() {
         PList list = literalAs("[1, 2]", ListLiteralNode.class, PList.class);
-        assertEquals(2, list.len());
+        assertEquals(2, list.getSequenceStorage().length());
         assertEquals(1, list.getSequenceStorage().getItemNormalized(0));
         assertEquals(2, list.getSequenceStorage().getItemNormalized(1));
         list = literalAs("[1]", ListLiteralNode.class, PList.class);
-        assertEquals(1, list.len());
+        assertEquals(1, list.getSequenceStorage().length());
         assertEquals(1, list.getSequenceStorage().getItemNormalized(0));
         list = literalAs("[]", ListLiteralNode.class, PList.class);
-        assertEquals(0, list.len());
+        assertEquals(0, list.getSequenceStorage().length());
     }
 
     @Test

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/SequenceStorageTests.java

@@ -55,43 +55,6 @@ public void objectsGetSlice() {
         }
     }
 
-    @Test
-    public void objectsSetSlice() {
-        ObjectSequenceStorage store = new ObjectSequenceStorage(getObjectValues());
-        ObjectSequenceStorage slice = new ObjectSequenceStorage(new Object[]{42, 42, 42});
-
-        store.setSliceInBound(1, 4, 1, slice);
-
-        for (int i = 1; i < 4; i++) {
-            assertEquals(42, store.getItemNormalized(i));
-        }
-    }
-
-    @Test
-    public void objectsSetSliceOutOfBound() {
-        ObjectSequenceStorage store = new ObjectSequenceStorage(getObjectValues());
-        ObjectSequenceStorage slice = new ObjectSequenceStorage(new Object[]{42, 42, 42});
-
-        store.setSliceInBound(5, 8, 1, slice);
-
-        for (int i = 5; i < 8; i++) {
-            assertEquals(42, store.getItemNormalized(i));
-        }
-    }
-
-    @Test
-    public void objectsDel() {
-        ObjectSequenceStorage store = new ObjectSequenceStorage(getObjectValues());
-        store.delItemInBound(4);
-
-        for (int i = 0; i < 4; i++) {
-            assertEquals(i + 1, store.getItemNormalized(i));
-        }
-
-        assertEquals(6, store.getItemNormalized(4));
-        assertEquals(5, store.length());
-    }
-
     @Test
     public void objectsInsert() {
         ObjectSequenceStorage store = new ObjectSequenceStorage(getObjectValues());
@@ -101,27 +64,6 @@ public void objectsInsert() {
         assertEquals(7, store.length());
     }
 
-    @Test
-    public void objectAppend() {
-        ObjectSequenceStorage store = new ObjectSequenceStorage(getObjectValues());
-        store.append(42);
-        assertEquals(42, store.getItemNormalized(6));
-        assertEquals(7, store.length());
-    }
-
-    @Test
-    public void objectExtend() {
-        ObjectSequenceStorage store = new ObjectSequenceStorage(getObjectValues());
-        ObjectSequenceStorage other = new ObjectSequenceStorage(getObjectValues());
-        store.extend(other);
-
-        for (int i = 6; i < 12; i++) {
-            assertEquals(i - 5, store.getItemNormalized(i));
-        }
-
-        assertEquals(12, store.length());
-    }
-
     /**
      * IntSequenceStorage tests.
      */
@@ -147,43 +89,6 @@ public void intGetSlice() {
         }
     }
 
-    @Test
-    public void intSetSlice() throws SequenceStoreException {
-        IntSequenceStorage store = new IntSequenceStorage(getIntValues());
-        IntSequenceStorage slice = new IntSequenceStorage(new int[]{42, 42, 42});
-
-        store.setSliceInBound(1, 4, 1, slice);
-
-        for (int i = 1; i < 4; i++) {
-            assertEquals(42, store.getItemNormalized(i));
-        }
-    }
-
-    @Test
-    public void intSetSliceOutOfBound() throws SequenceStoreException {
-        IntSequenceStorage store = new IntSequenceStorage(getIntValues());
-        IntSequenceStorage slice = new IntSequenceStorage(new int[]{42, 42, 42});
-
-        store.setSliceInBound(5, 8, 1, slice);
-
-        for (int i = 5; i < 8; i++) {
-            assertEquals(42, store.getItemNormalized(i));
-        }
-    }
-
-    @Test
-    public void intDel() {
-        IntSequenceStorage store = new IntSequenceStorage(getIntValues());
-        store.delItemInBound(4);
-
-        for (int i = 0; i < 4; i++) {
-            assertEquals(i + 1, store.getItemNormalized(i));
-        }
-
-        assertEquals(6, store.getItemNormalized(4));
-        assertEquals(5, store.length());
-    }
-
     @Test
     public void intInsert() throws SequenceStoreException {
         IntSequenceStorage store = new IntSequenceStorage(getIntValues());
@@ -192,26 +97,4 @@ public void intInsert() throws SequenceStoreException {
         assertEquals(6, store.getItemNormalized(6));
         assertEquals(7, store.length());
     }
-
-    @Test
-    public void intAppend() throws SequenceStoreException {
-        IntSequenceStorage store = new IntSequenceStorage(getIntValues());
-        store.append(42);
-        assertEquals(42, store.getItemNormalized(6));
-        assertEquals(7, store.length());
-    }
-
-    @Test
-    public void intExtend() throws SequenceStoreException {
-        IntSequenceStorage store = new IntSequenceStorage(getIntValues());
-        IntSequenceStorage other = new IntSequenceStorage(getIntValues());
-        store.extend(other);
-
-        for (int i = 6; i < 12; i++) {
-            assertEquals(i - 5, store.getItemNormalized(i));
-        }
-
-        assertEquals(12, store.length());
-    }
-
 }

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

@@ -58,5 +58,22 @@ def test_import():
 
 def test_create():
     from array import array
-    a = array('b', b'x'*10)
+    a = array('b', b'x' * 10)
     assert str(a) == "array('b', [120, 120, 120, 120, 120, 120, 120, 120, 120, 120])"
+
+
+def test_add():
+    from array import array
+    a0 = array("b", b"hello")
+    a1 = array("b", b"world")
+    assert a0 + a1 == array("b", b"helloworld")
+
+    a0 = array("b", b"hello")
+    a1 = array("l", b"abcdabcd")
+    try:
+        res = a0 + a1
+    except TypeError:
+        assert True
+    else:
+        assert False
+

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

@@ -183,6 +183,82 @@ def test_setitem():
         pass
 
 
+def test_setslice():
+    # whole sequence
+    b = bytearray(b"hello")
+    b[0:5] = b"HELLO"
+    assert b == bytearray(b"HELLO")
+
+    # whole same length as slice
+    b = bytearray(b"hellohellohello")
+    b[5:10] = b"HELLO"
+    assert b == bytearray(b"helloHELLOhello")
+
+    # shrink
+    b = bytearray(b"hellohellohello")
+    b[5:10] = b"hi"
+    assert b == bytearray(b"hellohihello")
+
+    # extend
+    b = bytearray(b"hellohelloworld")
+    b[5:10] = b"beautiful"
+    assert b == bytearray(b"hellobeautifulworld")
+
+    # assign list with integers
+    b = bytearray(b"hellohellohello")
+    b[5:10] = [4, 5, 6, 7, 8]
+    assert b == bytearray(b"hello\x04\x05\x06\x07\x08hello")
+
+    # assign range
+    b = bytearray(b"hellohellohello")
+    b[5:10] = range(5)
+    assert b == bytearray(b'hello\x00\x01\x02\x03\x04hello')
+
+    b = bytearray(range(10))
+    assert list(b) == list(range(10))
+
+    b[0:5] = bytearray([1, 1, 1, 1, 1])
+    assert b == bytearray([1, 1, 1, 1, 1, 5, 6, 7, 8, 9])
+
+    # TODO: seq storage does not yet support deletion ...
+    # del b[0:-5]
+    # assert b == bytearray([5, 6, 7, 8, 9])
+    b = bytearray([5, 6, 7, 8, 9])
+
+    b[0:0] = bytearray([0, 1, 2, 3, 4])
+    assert b == bytearray(range(10))
+    b = bytearray(range(10))
+
+    b[-7:-3] = bytearray([100, 101])
+    assert b == bytearray([0, 1, 2, 100, 101, 7, 8, 9])
+
+    b[3:5] = [3, 4, 5, 6]
+    assert b == bytearray(range(10))
+
+    b[3:0] = [42, 42, 42]
+    assert b == bytearray([0, 1, 2, 42, 42, 42, 3, 4, 5, 6, 7, 8, 9])
+
+    b[3:] = b'foo'
+    assert b == bytearray([0, 1, 2, 102, 111, 111])
+
+    b[:3] = memoryview(b'foo')
+    assert b == bytearray([102, 111, 111, 102, 111, 111])
+
+    b[3:4] = []
+    assert b == bytearray([102, 111, 111, 111, 111])
+
+    for elem in [5, -5, 0, int(10e20), 'str', 2.3,
+                 ['a', 'b'], [b'a', b'b'], [[]]]:
+        def assign():
+            b[3:4] = elem
+        assert_raises(TypeError, assign)
+
+    for elem in [[254, 255, 256], [-256, 9000]]:
+        def assign():
+            b[3:4] = elem
+        assert_raises(ValueError, assign)
+
+
 def test_delitem():
     b = bytearray(range(10))
     del b[0]
@@ -263,53 +339,6 @@ def test_join():
     assert b"--".join([b"hello"]) == b"hello"
 
 
-def test_setslice():
-    b = bytearray(range(10))
-    assert list(b) == list(range(10))
-
-    b[0:5] = bytearray([1, 1, 1, 1, 1])
-    assert b == bytearray([1, 1, 1, 1, 1, 5, 6, 7, 8, 9])
-
-    # TODO: seq storage does not yet support deletion ...
-    # del b[0:-5]
-    # 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 = bytearray(range(10))
-
-    b[-7:-3] = bytearray([100, 101])
-    assert b == bytearray([0, 1, 2, 100, 101, 7, 8, 9])
-
-    b[3:5] = [3, 4, 5, 6]
-    assert b == bytearray(range(10))
-
-    b[3:0] = [42, 42, 42]
-    assert b == bytearray([0, 1, 2, 42, 42, 42, 3, 4, 5, 6, 7, 8, 9])
-
-    b[3:] = b'foo'
-    assert b == bytearray([0, 1, 2, 102, 111, 111])
-
-    b[:3] = memoryview(b'foo')
-    assert b == bytearray([102, 111, 111, 102, 111, 111])
-
-    b[3:4] = []
-    assert b == bytearray([102, 111, 111, 111, 111])
-
-    for elem in [5, -5, 0, int(10e20), 'str', 2.3,
-                 ['a', 'b'], [b'a', b'b'], [[]]]:
-        def assign():
-            b[3:4] = elem
-        assert_raises(TypeError, assign)
-
-    for elem in [[254, 255, 256], [-256, 9000]]:
-        def assign():
-            b[3:4] = elem
-        assert_raises(ValueError, assign)
-
-
 def test_concat():
     a = b'0'
     b = b'1'