Fix str.partition and str.rpartition

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unicode.txt

@@ -53,6 +53,7 @@
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_lower
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_mul
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_none_arguments
+*graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_partition
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_printable_repr
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_printing
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_replace_id
@@ -61,6 +62,8 @@
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_rfind
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_rindex
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_rjust
+*graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_rpartition
+*graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_rsplit
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_slice
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_splitlines
 *graalpython.lib-python.3.test.test_unicode.UnicodeTest.test_startswith

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

@@ -920,36 +920,71 @@ private static String capitalize(String self) {
         }
     }
 
+    // str.partition
+    @Builtin(name = "partition", minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    public abstract static class PartitionNode extends PythonBinaryBuiltinNode {
+
+        @Specialization
+        Object doString(String self, String sep) {
+            if (sep.isEmpty()) {
+                throw raise(ValueError, ErrorMessages.EMPTY_SEPARATOR);
+            }
+            int indexOf = self.indexOf(sep);
+            String[] partitioned = new String[3];
+            if (indexOf == -1) {
+                partitioned[0] = self;
+                partitioned[1] = "";
+                partitioned[2] = "";
+            } else {
+                partitioned[0] = PString.substring(self, 0, indexOf);
+                partitioned[1] = sep;
+                partitioned[2] = PString.substring(self, indexOf + sep.length());
+            }
+            return factory().createTuple(partitioned);
+        }
+
+        @Specialization(replaces = "doString")
+        Object doGeneric(Object self, Object sep,
+                        @Cached CastToJavaStringCheckedNode castSelfNode,
+                        @Cached CastToJavaStringCheckedNode castSepNode) {
+            String selfStr = castSelfNode.cast(self, ErrorMessages.REQUIRES_STR_OBJECT_BUT_RECEIVED_P, "partition", self);
+            String sepStr = castSepNode.cast(sep, ErrorMessages.MUST_BE_STR_NOT_P, sep);
+            return doString(selfStr, sepStr);
+        }
+    }
+
     // str.rpartition
     @Builtin(name = "rpartition", minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class RPartitionNode extends PythonBinaryBuiltinNode {
 
         @Specialization
-        PList doString(String self, String sep,
-                        @Shared("appendNode") @Cached AppendNode appendNode) {
+        Object doString(String self, String sep) {
+            if (sep.isEmpty()) {
+                throw raise(ValueError, ErrorMessages.EMPTY_SEPARATOR);
+            }
             int lastIndexOf = self.lastIndexOf(sep);
-            PList list = factory().createList();
+            String[] partitioned = new String[3];
             if (lastIndexOf == -1) {
-                appendNode.execute(list, "");
-                appendNode.execute(list, "");
-                appendNode.execute(list, self);
+                partitioned[0] = "";
+                partitioned[1] = "";
+                partitioned[2] = self;
             } else {
-                appendNode.execute(list, PString.substring(self, 0, lastIndexOf));
-                appendNode.execute(list, sep);
-                appendNode.execute(list, PString.substring(self, lastIndexOf + sep.length()));
+                partitioned[0] = PString.substring(self, 0, lastIndexOf);
+                partitioned[1] = sep;
+                partitioned[2] = PString.substring(self, lastIndexOf + sep.length());
             }
-            return list;
+            return factory().createTuple(partitioned);
         }
 
         @Specialization(replaces = "doString")
-        PList doGeneric(Object self, Object sep,
+        Object doGeneric(Object self, Object sep,
                         @Cached CastToJavaStringCheckedNode castSelfNode,
-                        @Cached CastToJavaStringCheckedNode castSepNode,
-                        @Shared("appendNode") @Cached AppendNode appendNode) {
+                        @Cached CastToJavaStringCheckedNode castSepNode) {
             String selfStr = castSelfNode.cast(self, ErrorMessages.REQUIRES_STR_OBJECT_BUT_RECEIVED_P, "rpartition", self);
             String sepStr = castSepNode.cast(sep, ErrorMessages.MUST_BE_STR_NOT_P, sep);
-            return doString(selfStr, sepStr, appendNode);
+            return doString(selfStr, sepStr);
         }
     }
 

graalpython/lib-graalpython/str.py

@@ -24,17 +24,6 @@
 import _codecs
 
 
-def partition(self, sep):
-    l = self.split(sep, 1)
-    if len(l) == 1:
-        return l[0], "", ""
-    else:
-        return l[0], sep, l[1]
-
-
-str.partition = partition
-
-
 def expandtabs(self, tabsize=8):
     """
     S.expandtabs(tabsize=8) -> str