add bytearray.{l,r,}strip and tests

Author: timfel

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

@@ -523,3 +523,9 @@ def test_binary_op():
     assert b"123" <= b"1234"
     assert b"123" >= b"123"
     assert not (b"123" >= b"1234")
+
+
+def test_strip_bytearray():
+    assert bytearray(b'abc').strip(b'ac') == b'b'
+    assert bytearray(b'abc').lstrip(b'ac') == b'bc'
+    assert bytearray(b'abc').rstrip(b'ac') == b'ab'

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

@@ -709,17 +709,68 @@ Object doGeneric(@SuppressWarnings("unused") Object self) {
         }
     }
 
-    @Builtin(name = "rstrip", minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, keywordArguments = {"bytes"})
+    @Builtin(name = "lstrip", minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, keywordArguments = {"bytes"})
     @GenerateNodeFactory
-    abstract static class RStripNode extends PythonBuiltinNode {
+    abstract static class LStripNode extends PythonBinaryBuiltinNode {
         @Specialization
+        PByteArray strip(PByteArray self, @SuppressWarnings("unused") PNone bytes,
+                        @Cached("create()") BytesNodes.ToBytesNode toBytesNode) {
+            byte[] bs = toBytesNode.execute(self);
+            int i = 0;
+            for (i = 0; i < bs.length; i++) {
+                if (!isWhitespace(bs[i])) {
+                    break;
+                }
+            }
+            return newBytesFrom(bs, i);
+        }
+
         @TruffleBoundary
+        private static boolean isWhitespace(byte b) {
+            return Character.isWhitespace(b);
+        }
+
+        @Specialization
+        PByteArray strip(PByteArray self, PBytes bytes,
+                        @Cached("create()") BytesNodes.ToBytesNode selfToBytesNode,
+                        @Cached("create()") BytesNodes.ToBytesNode otherToBytesNode) {
+            byte[] stripBs = selfToBytesNode.execute(bytes);
+            byte[] bs = otherToBytesNode.execute(self);
+            int i = 0;
+            outer: for (i = 0; i < bs.length; i++) {
+                for (byte b : stripBs) {
+                    if (b == bs[i]) {
+                        continue outer;
+                    }
+                }
+                break;
+            }
+            return newBytesFrom(bs, i);
+        }
+
+        private PByteArray newBytesFrom(byte[] bs, int i) {
+            byte[] out;
+            if (i != 0) {
+                int len = bs.length - i;
+                out = new byte[len];
+                System.arraycopy(bs, i, out, 0, len);
+            } else {
+                out = bs;
+            }
+            return factory().createByteArray(out);
+        }
+    }
+
+    @Builtin(name = "rstrip", minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, keywordArguments = {"bytes"})
+    @GenerateNodeFactory
+    abstract static class RStripNode extends PythonBinaryBuiltinNode {
+        @Specialization
         PByteArray strip(PByteArray self, @SuppressWarnings("unused") PNone bytes,
                         @Cached("create()") BytesNodes.ToBytesNode toBytesNode) {
             byte[] bs = toBytesNode.execute(self);
             int len = bs.length;
             for (int i = bs.length - 1; i >= 0; i--) {
-                if (Character.isWhitespace(bs[i])) {
+                if (isWhitespace(bs[i])) {
                     len--;
                 } else {
                     break;
@@ -728,8 +779,12 @@ PByteArray strip(PByteArray self, @SuppressWarnings("unused") PNone bytes,
             return newBytesUpTo(bs, len);
         }
 
-        @Specialization
         @TruffleBoundary
+        private static boolean isWhitespace(byte b) {
+            return Character.isWhitespace(b);
+        }
+
+        @Specialization
         PByteArray strip(PByteArray self, PBytes bytes,
                         @Cached("create()") BytesNodes.ToBytesNode selfToBytesNode,
                         @Cached("create()") BytesNodes.ToBytesNode otherToBytesNode) {
@@ -740,10 +795,10 @@ PByteArray strip(PByteArray self, PBytes bytes,
                 for (byte b : stripBs) {
                     if (b == bs[i]) {
                         len--;
-                    } else {
-                        break outer;
+                        continue outer;
                     }
                 }
+                break;
             }
             return newBytesUpTo(bs, len);
         }
@@ -759,5 +814,4 @@ private PByteArray newBytesUpTo(byte[] bs, int len) {
             return factory().createByteArray(out);
         }
     }
-
 }

graalpython/lib-graalpython/bytearray.py

@@ -40,3 +40,10 @@
 # an empty file for now
 
 bytearray.decode = bytes.decode
+
+
+def strip(self, what=None):
+    return self.lstrip(what).rstrip(what)
+
+
+bytearray.strip = strip