Support writing to buffer decorator.

fangerer · fangerer · commit 3ffe6d05a9b4 · 2018-07-31T16:46:59.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.h b/graalpython/com.oracle.graal.python.cext/src/capi.h
@@ -68,6 +68,7 @@ typedef struct {
 
 typedef struct {
     PyObject_VAR_HEAD
+    int readonly;
     void *buf_delegate;
 } PyBufferDecorator;
 
diff --git a/graalpython/com.oracle.graal.python.cext/src/memoryobject.c b/graalpython/com.oracle.graal.python.cext/src/memoryobject.c
@@ -44,5 +44,5 @@ PyTypeObject PyMemoryView_Type = PY_TRUFFLE_TYPE("memoryview", &PyType_Type, Py_
 PyTypeObject PyBuffer_Type = PY_TRUFFLE_TYPE("buffer", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, sizeof(PyBufferDecorator));
 
 int bufferdecorator_getbuffer(PyBufferDecorator *self, Py_buffer *view, int flags) {
-    return PyBuffer_FillInfo(view, (PyObject*)self, polyglot_get_member(self, "buf_delegate"), PyObject_Size((PyObject *)self), 1, flags);
+    return PyBuffer_FillInfo(view, (PyObject*)self, polyglot_get_member(self, "buf_delegate"), PyObject_Size((PyObject *)self), self->readonly, flags);
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
@@ -47,6 +47,7 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.ZIP;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__FILE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.DECODE;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETITEM__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.NotImplementedError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
@@ -340,9 +341,6 @@ public PDict dictEmpty(PythonClass cls, Object[] args, PKeyword[] keywordArgs) {
     @Builtin(name = ENUMERATE, fixedNumOfArguments = 2, keywordArguments = {"start"}, constructsClass = PEnumerate.class)
     @GenerateNodeFactory
     public abstract static class EnumerateNode extends PythonBuiltinNode {
-        /**
-         * TODO enumerate can take a keyword argument start, and currently that's not supported.
-         */
 
         @Specialization
         public PEnumerate enumerate(PythonClass cls, Object iterable, @SuppressWarnings("unused") PNone keywordArg,
@@ -1678,19 +1676,32 @@ Object slice(PythonClass cls, Object start, Object stop, Object step,
     }
 
     // buffer([iterable])
-    @Builtin(name = "buffer", fixedNumOfArguments = 2, constructsClass = PBuffer.class)
+    @Builtin(name = "buffer", minNumOfArguments = 2, maxNumOfArguments = 3, constructsClass = PBuffer.class)
     @GenerateNodeFactory
     public abstract static class BufferNode extends PythonBuiltinNode {
+        @Child private LookupInheritedAttributeNode getSetItemNode;
+
+        @Specialization(guards = "isNoValue(readOnly)")
+        protected PBuffer construct(PythonClass cls, Object delegate, @SuppressWarnings("unused") PNone readOnly) {
+            return factory().createBuffer(cls, delegate, !hasSetItem(delegate));
+        }
 
         @Specialization
-        protected PBuffer construct(PythonClass cls, Object value) {
-            return factory().createBuffer(cls, value);
+        protected PBuffer construct(PythonClass cls, Object delegate, boolean readOnly) {
+            return factory().createBuffer(cls, delegate, readOnly);
         }
 
         @Fallback
-        public PBuffer listObject(@SuppressWarnings("unused") Object cls, Object arg) {
-            CompilerAsserts.neverPartOfCompilation();
-            throw new RuntimeException("buffer does not support iterable object " + arg);
+        public PBuffer doGeneric(@SuppressWarnings("unused") Object cls, Object delegate, @SuppressWarnings("unused") Object readOnly) {
+            throw raise(TypeError, "cannot create buffer for object %s", delegate);
+        }
+
+        public boolean hasSetItem(Object object) {
+            if (getSetItemNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                getSetItemNode = LookupInheritedAttributeNode.create(__SETITEM__);
+            }
+            return getSetItemNode.execute(object) != PNone.NO_VALUE;
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeMemberNames.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeMemberNames.java
@@ -91,6 +91,7 @@ public final class NativeMemberNames {
     public static final String MD_DEF = "md_def";
     public static final String MD_DICT = "md_dict";
     public static final String BUF_DELEGATE = "buf_delegate";
+    public static final String BUF_READONLY = "readonly";
     public static final String NB_ADD = "nb_add";
     public static final String NB_INDEX = "nb_index";
     public static final String NB_POW = "nb_power";
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapperMR.java
@@ -40,6 +40,8 @@
  */
 package com.oracle.graal.python.builtins.objects.cext;
 
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETITEM__;
+
 import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToSulongNode;
@@ -57,6 +59,7 @@
 import com.oracle.graal.python.nodes.PBaseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
+import com.oracle.graal.python.nodes.call.special.LookupAndCallTernaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.truffle.PythonTypes;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -227,29 +230,40 @@ Object doTuple(PTuple tuple, long idx, Object value) {
         }
 
         @Specialization
-        Object doTuple(PList list, long idx, Object value,
+        Object doList(PList list, long idx, Object value,
                         @Cached("createListSetItem()") ListBuiltins.SetItemNode setItemNode) {
             return setItemNode.execute(list, idx, getToJavaNode().execute(value));
         }
 
         @Specialization
-        Object doTuple(PBytes tuple, long idx, byte value) {
+        Object doBytes(PBytes tuple, long idx, byte value) {
             // TODO(fa) do proper index conversion
             tuple.getInternalByteArray()[(int) idx] = value;
             return value;
         }
 
         @Specialization
-        Object doTuple(PByteArray tuple, long idx, byte value) {
+        Object doByteArray(PByteArray tuple, long idx, byte value) {
             // TODO(fa) do proper index conversion
             tuple.getInternalByteArray()[(int) idx] = value;
             return value;
         }
 
+        @Specialization
+        Object doGeneric(Object tuple, Object idx, Object value,
+                        @Cached("createSetItem()") LookupAndCallTernaryNode setItemNode) {
+            setItemNode.execute(tuple, idx, value);
+            return value;
+        }
+
         protected static ListBuiltins.SetItemNode createListSetItem() {
             return ListBuiltinsFactory.SetItemNodeFactory.create();
         }
 
+        protected static LookupAndCallTernaryNode createSetItem() {
+            return LookupAndCallTernaryNode.create(__SETITEM__);
+        }
+
         private CExtNodes.ToJavaNode getToJavaNode() {
             if (toJavaNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java
@@ -409,10 +409,15 @@ Object doMdDef(PythonObject object, @SuppressWarnings("unused") String key) {
         }
 
         @Specialization(guards = "eq(BUF_DELEGATE, key)")
-        Object doObSval(PBuffer object, @SuppressWarnings("unused") String key) {
+        Object doBufDelegate(PBuffer object, @SuppressWarnings("unused") String key) {
             return new PySequenceArrayWrapper(object.getDelegate(), 1);
         }
 
+        @Specialization(guards = "eq(BUF_READONLY, key)")
+        int doBufReadonly(PBuffer object, @SuppressWarnings("unused") String key) {
+            return object.isReadOnly() ? 1 : 0;
+        }
+
         @Specialization(guards = "eq(START, key)")
         int doStart(PSlice object, @SuppressWarnings("unused") String key) {
             return object.getStart();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/PBuffer.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/PBuffer.java
@@ -46,14 +46,19 @@
 public class PBuffer extends PythonBuiltinObject {
 
     private final Object delegate;
+    private final boolean readOnly;
 
-    public PBuffer(PythonClass cls, Object iterable) {
+    public PBuffer(PythonClass cls, Object iterable, boolean readOnly) {
         super(cls);
         this.delegate = iterable;
+        this.readOnly = readOnly;
     }
 
     public Object getDelegate() {
         return delegate;
     }
 
+    public boolean isReadOnly() {
+        return readOnly;
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java
@@ -695,12 +695,12 @@ public PForeignArrayIterator createForeignArrayIterator(TruffleObject iterable,
         return trace(new PForeignArrayIterator(lookupClass(PythonBuiltinClassType.PForeignArrayIterator), iterable, size));
     }
 
-    public PBuffer createBuffer(PythonClass cls, Object iterable) {
-        return trace(new PBuffer(cls, iterable));
+    public PBuffer createBuffer(PythonClass cls, Object iterable, boolean readonly) {
+        return trace(new PBuffer(cls, iterable, readonly));
     }
 
-    public PBuffer createBuffer(Object iterable) {
-        return trace(new PBuffer(lookupClass(PythonBuiltinClassType.PBuffer), iterable));
+    public PBuffer createBuffer(Object iterable, boolean readonly) {
+        return trace(new PBuffer(lookupClass(PythonBuiltinClassType.PBuffer), iterable, readonly));
     }
 
     public PCode createCode(RootNode result) {

Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,5 @@ PyTypeObject PyMemoryView_Type = PY_TRUFFLE_TYPE("memoryview", &PyType_Type, Py_`
`44`	`44`	`PyTypeObject PyBuffer_Type = PY_TRUFFLE_TYPE("buffer", &PyType_Type, Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, sizeof(PyBufferDecorator));`
`45`	`45`
`46`	`46`	`int bufferdecorator_getbuffer(PyBufferDecorator self, Py_buffer view, int flags) {`
`47`		`- return PyBuffer_FillInfo(view, (PyObject)self, polyglot_get_member(self, "buf_delegate"), PyObject_Size((PyObject )self), 1, flags);`
	`47`	`+ return PyBuffer_FillInfo(view, (PyObject)self, polyglot_get_member(self, "buf_delegate"), PyObject_Size((PyObject )self), self->readonly, flags);`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,14 +46,19 @@`
`46`	`46`	`public class PBuffer extends PythonBuiltinObject {`
`47`	`47`
`48`	`48`	`private final Object delegate;`
	`49`	`+ private final boolean readOnly;`
`49`	`50`
`50`		`- public PBuffer(PythonClass cls, Object iterable) {`
	`51`	`+ public PBuffer(PythonClass cls, Object iterable, boolean readOnly) {`
`51`	`52`	`super(cls);`
`52`	`53`	`this.delegate = iterable;`
	`54`	`+ this.readOnly = readOnly;`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`public Object getDelegate() {`
`56`	`58`	`return delegate;`
`57`	`59`	`}`
`58`	`60`
	`61`	`+ public boolean isReadOnly() {`
	`62`	`+ return readOnly;`
	`63`	`+ }`
`59`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -695,12 +695,12 @@ public PForeignArrayIterator createForeignArrayIterator(TruffleObject iterable,`
`695`	`695`	`return trace(new PForeignArrayIterator(lookupClass(PythonBuiltinClassType.PForeignArrayIterator), iterable, size));`
`696`	`696`	`}`
`697`	`697`
`698`		`- public PBuffer createBuffer(PythonClass cls, Object iterable) {`
`699`		`- return trace(new PBuffer(cls, iterable));`
	`698`	`+ public PBuffer createBuffer(PythonClass cls, Object iterable, boolean readonly) {`
	`699`	`+ return trace(new PBuffer(cls, iterable, readonly));`
`700`	`700`	`}`
`701`	`701`
`702`		`- public PBuffer createBuffer(Object iterable) {`
`703`		`- return trace(new PBuffer(lookupClass(PythonBuiltinClassType.PBuffer), iterable));`
	`702`	`+ public PBuffer createBuffer(Object iterable, boolean readonly) {`
	`703`	`+ return trace(new PBuffer(lookupClass(PythonBuiltinClassType.PBuffer), iterable, readonly));`
`704`	`704`	`}`
`705`	`705`
`706`	`706`	`public PCode createCode(RootNode result) {`