Add PyUnicode_Split

Author: msimacek

graalpython/com.oracle.graal.python.cext/src/unicodeobject.c

@@ -670,3 +670,8 @@ UPCALL_ID(PyUnicode_Contains)
 int PyUnicode_Contains(PyObject *str, PyObject *substr) {
     return UPCALL_CEXT_I(_jls_PyUnicode_Contains, native_to_java(str), native_to_java(substr));
 }
+
+UPCALL_ID(PyUnicode_Split)
+PyObject* PyUnicode_Split(PyObject *s, PyObject *sep, Py_ssize_t maxsplit) {
+    return UPCALL_CEXT_O(_jls_PyUnicode_Split, native_to_java(s), native_to_java(sep), maxsplit);
+}

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_unicode.py

@@ -744,4 +744,17 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
+    test_PyUnicode_Split = CPyExtFunction(
+        lambda args: args[0].split(args[1], args[2]),
+        lambda: (
+            ("foo.bar.baz", ".", 0),
+            ("foo.bar.baz", ".", 1),
+            ("foo.bar.baz", 7, 0),
+        ),
+        resultspec="O",
+        argspec='OOi',
+        arguments=["PyObject* string", "PyObject* sep", "Py_ssize_t maxsplit"],
+        cmpfunc=unhandled_error_compare
+    )
+
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextUnicodeBuiltins.java

@@ -45,7 +45,13 @@
 import static com.oracle.graal.python.nodes.ErrorMessages.BAD_ARG_TYPE_FOR_BUILTIN_OP;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETITEM__;
 
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
+
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.Python3Core;
@@ -66,6 +72,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.GetNativeNullNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PRaiseNativeNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToNewRefNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TransformExceptionToNativeNode;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.GetByteArrayNode;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
@@ -110,11 +117,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropException;
 import com.oracle.truffle.api.profiles.ConditionProfile;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-import java.nio.charset.StandardCharsets;
 
 @CoreFunctions(extendsModule = PythonCextBuiltins.PYTHON_CEXT)
 @GenerateNodeFactory
@@ -731,7 +733,7 @@ int doGeneric(Object type, long lindex,
     abstract static class PyUnicodeNewNode extends PythonBuiltinNode {
         @Specialization
         Object doGeneric(Object ptr, int elementSize, int isAscii,
-                        @Cached CExtNodes.ToNewRefNode toNewRefNode) {
+                        @Cached ToNewRefNode toNewRefNode) {
             return toNewRefNode.execute(factory().createString(new NativeCharSequence(ptr, elementSize, isAscii != 0)));
         }
     }
@@ -766,6 +768,24 @@ int contains(VirtualFrame frame, Object haystack, Object needle,
         }
     }
 
+    @Builtin(name = "PyUnicode_Split", minNumOfPositionalArgs = 4, declaresExplicitSelf = true)
+    @GenerateNodeFactory
+    abstract static class PyUnicodeSplit extends PythonQuaternaryBuiltinNode {
+        @Specialization
+        Object split(VirtualFrame frame, Object module, Object string, Object sep, Object maxsplit,
+                        @Cached StringBuiltins.SplitNode splitNode,
+                        @Cached ToNewRefNode toSulongNode,
+                        @Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
+                        @Cached GetNativeNullNode getNativeNullNode) {
+            try {
+                return toSulongNode.execute(splitNode.execute(frame, string, sep, maxsplit));
+            } catch (PException e) {
+                transformExceptionToNativeNode.execute(frame, e);
+                return getNativeNullNode.execute(module);
+            }
+        }
+    }
+
     @Builtin(name = "_PyUnicode_AsUTF8String", minNumOfPositionalArgs = 3)
     @GenerateNodeFactory
     abstract static class _PyUnicode_AsUTF8String extends NativeEncoderNode {
@@ -813,7 +833,7 @@ abstract static class PyUnicode_Decode extends NativeBuiltin {
         @Specialization
         Object doDecode(VirtualFrame frame, Object module, PMemoryView mv, String encoding, String errors,
                         @Cached CodecsModuleBuiltins.DecodeNode decodeNode,
-                        @Cached CExtNodes.ToNewRefNode toSulongNode,
+                        @Cached ToNewRefNode toSulongNode,
                         @Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
                         @Cached GetNativeNullNode getNativeNullNode) {
             try {