implement 'y' and 'y#' argument formats

Author: timfel

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

@@ -79,6 +79,26 @@ int get_buffer_rw(PyObject *arg, Py_buffer *view) {
     return 0;
 }
 
+Py_ssize_t convertbuffer(PyObject *arg, const void **p) {
+    PyBufferProcs *pb = Py_TYPE(arg)->tp_as_buffer;
+    Py_ssize_t count;
+    Py_buffer view;
+
+    *p = NULL;
+    if (pb != NULL && pb->bf_releasebuffer != NULL) {
+        // *errmsg = "read-only bytes-like object";
+        return -3;
+    }
+
+    int get_buffer_result = get_buffer_r(arg, &view);
+    if (get_buffer_result < 0) {
+        return get_buffer_result;
+    }
+    count = view.len;
+    *p = view.buf;
+    PyBuffer_Release(&view);
+    return count;
+}
 
 typedef int (*parseargs_func)(PyObject *argv, PyObject *kwds, const char *format, void* kwdnames, void* varargs);
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java

@@ -767,7 +767,7 @@ public long getId() {
 
     /**
      * Enum of basic C types. These type names need to stay in sync with the declarations in
-     * 'capi.c'.
+     * 'modsupport.c'.
      */
     public enum LLVMType {
         int_t,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java

@@ -147,6 +147,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_GET_NEWFUNC_TYPE_ID("get_newfunc_typeid"),
     FUN_GET_BUFFER_R("get_buffer_r"),
     FUN_GET_BUFFER_RW("get_buffer_rw"),
+    FUN_CONVERTBUFFER("convertbuffer"),
     FUN_NATIVE_UNICODE_AS_STRING("native_unicode_as_string"),
     FUN_PY_UNICODE_GET_LENGTH("PyUnicode_GetLength"),
     FUN_GET_UINT32_ARRAY_TYPE_ID("get_uint32_array_typeid"),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtParseArgumentsNode.java

@@ -43,6 +43,7 @@
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.OverflowError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.SystemError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
+import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_CONVERTBUFFER;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_GET_BUFFER_R;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_GET_BUFFER_RW;
 
@@ -371,6 +372,7 @@ static ParserState doBufferR(ParserState stateIn, Object kwds, @SuppressWarnings
                         @Shared("getArgNode") @Cached GetArgNode getArgNode,
                         @Cached GetVaArgsNode getVaArgNode,
                         @Cached PCallCExtFunction callGetBufferRwNode,
+                        @Shared("writeOutVarNode") @Cached WriteOutVarNode writeOutVarNode,
                         @Cached(value = "createTN(stateIn)", uncached = "getUncachedTN(stateIn)") CExtToNativeNode argToSulongNode,
                         @Shared("raiseNode") @Cached PRaiseNativeNode raiseNode) throws InteropException, ParseArgumentsException {
             ParserState state = stateIn;
@@ -383,15 +385,13 @@ static ParserState doBufferR(ParserState stateIn, Object kwds, @SuppressWarnings
                     getbuffer(state.nativeContext, callGetBufferRwNode, raiseNode, argToSulongNode.execute(arg), pybufferPtr, true);
                 }
             } else {
-                // TODO(fa) convertbuffer: create a temporary 'Py_buffer' struct, call
-                // 'get_buffer_r' and output the buffer's data pointer
-                getVaArgNode.getPyObjectPtr(varargs, state.outIndex);
+                Object voidPtr = getVaArgNode.getVoidPtr(varargs, state.outIndex);
+                Object count = convertbuffer(state.nativeContext, callGetBufferRwNode, raiseNode, argToSulongNode.execute(arg), voidPtr);
                 if (isLookahead(format, format_idx, '#')) {
                     /* format_idx++; */
                     // 'y#'
-                    // TODO(fa) additionally store size
-                    getVaArgNode.getPyObjectPtr(varargs, state.outIndex);
                     state = state.incrementOutIndex();
+                    writeOutVarNode.writeInt64(varargs, state.outIndex, count);
                 }
             }
             return state.incrementOutIndex();
@@ -940,6 +940,25 @@ private static void getbuffer(CExtContext nativeContext, PCallCExtFunction callG
             }
         }
 
+        private static int convertbuffer(CExtContext nativeContext, PCallCExtFunction callConvertbuffer, PRaiseNativeNode raiseNode, Object sulongArg, Object voidPtr)
+                        throws ParseArgumentsException {
+            Object rc = callConvertbuffer.call(nativeContext, FUN_CONVERTBUFFER, sulongArg, voidPtr);
+            if (!(rc instanceof Number)) {
+                CompilerDirectives.shouldNotReachHere("wrong result of internal function");
+                throw raise(raiseNode, SystemError, ErrorMessages.RETURNED_UNEXPECTE_RET_CODE_EXPECTED_INT_BUT_WAS_S, FUN_CONVERTBUFFER, rc.getClass());
+            }
+            int i = intValue((Number) rc);
+            // first two results are the error results from getbuffer, the third is the one from convertbuffer
+            if (i == -1) {
+                throw raise(raiseNode, TypeError, ErrorMessages.READ_WRITE_BYTELIKE_OBJ);
+            } else if (i == -2) {
+                throw raise(raiseNode, TypeError, ErrorMessages.CONTIGUOUS_BUFFER);
+            } else if (i == -3) {
+                throw raise(raiseNode, TypeError, ErrorMessages.READ_ONLY_BYTELIKE_OBJ);
+            }
+            return i;
+        }
+
         @TruffleBoundary
         private static int intValue(Number rc) {
             return rc.intValue();
@@ -1215,6 +1234,10 @@ public final void writeUInt64(Object valist, int index, Object value) throws Int
             execute(valist, index, LLVMType.uint64_ptr_t, value);
         }
 
+        public final void writePySsizeT(Object valist, int index, Object value) throws InteropException {
+            execute(valist, index, LLVMType.Py_ssize_ptr_t, value);
+        }
+
         public final void writeFloat(Object valist, int index, Object value) throws InteropException {
             execute(valist, index, LLVMType.float_ptr_t, value);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/GetVaArgsNode.java

@@ -85,6 +85,10 @@ public final Object getCharPtr(Object valist, int index) throws InteropException
         return execute(valist, index, LLVMType.char_ptr_t);
     }
 
+    public final Object getVoidPtr(Object valist, int index) throws InteropException {
+        return execute(valist, index, LLVMType.void_ptr_t);
+    }
+
     public final Object getPyComplexPtr(Object valist, int index) throws InteropException {
         return execute(valist, index, LLVMType.Py_complex_ptr_t);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -485,6 +485,7 @@ public abstract class ErrorMessages {
     public static final String PYTHON_INT_TOO_LARGE_TO_CONV_TO_C_TYPE = "Python int too large to convert to %s-byte C type";
     public static final String RANGE_OUT_OF_BOUNDS = "range index out of range";
     public static final String READ_BYTE_OUT_OF_RANGE = "read byte out of range";
+    public static final String READ_ONLY_BYTELIKE_OBJ = "read-only bytes-like object";
     public static final String READ_WRITE_BYTELIKE_OBJ = "read-write bytes-like object";
     public static final String READONLY_ATTRIBUTE = "readonly attribute";
     public static final String REQUIRES_CODE_OBJ = "%s() requires a code object with %d free vars, not %d";