Delegate operations to 'nativememoryview' object.

Author: fangerer

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

@@ -103,6 +103,7 @@ public final class NativeMemberNames {
     public static final String IM_FUNC = "im_func";
     public static final String IM_SELF = "im_self";
     public static final String SQ_REPEAT = "sq_repeat";
+    public static final String MEMORYVIEW_FLAGS = "flags";
 
     @CompilationFinal(dimensions = 1) public static final String[] values;
     static {

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

@@ -72,6 +72,7 @@
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
+import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.PBaseNode;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
@@ -162,7 +163,7 @@ public Object access(PythonNativeWrapper object, String key) {
     @ImportStatic({NativeMemberNames.class, SpecialMethodNames.class, SpecialAttributeNames.class})
     @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class ReadNativeMemberNode extends PBaseNode {
-        @Child GetClassNode getClass = GetClassNode.create();
+        @Child GetClassNode getClassNode;
         @Child private ToSulongNode toSulongNode;
         @Child private HashingStorageNodes.GetItemNode getItemNode;
         @Child private CExtNodes.SizeofWCharNode sizeofWcharNode;
@@ -186,7 +187,7 @@ int doObRefcnt(@SuppressWarnings("unused") Object o, @SuppressWarnings("unused")
 
         @Specialization(guards = "eq(OB_TYPE, key)")
         Object doObType(Object object, @SuppressWarnings("unused") String key) {
-            return getToSulongNode().execute(getClass.execute(object));
+            return getToSulongNode().execute(getClass(object));
         }
 
         @Specialization(guards = "eq(OB_SIZE, key)")
@@ -425,6 +426,12 @@ Object doImFunc(PBuiltinMethod object, @SuppressWarnings("unused") String key) {
             return getToSulongNode().execute(object.getFunction());
         }
 
+// @Specialization(guards = {"isMemoryView(object)", "eq(MEMORYVIEW_FLAGS)" })
+// Object doImFunc(PythonObject object, @SuppressWarnings("unused") String key,
+// @Cached("create()") ReadAttributeFromObjectNode readAttrNode) {
+// return readAttrNode.execute(object, NativeMemberNames.MEMORYVIEW_FLAGS);
+// }
+
         @Fallback
         Object doGeneric(Object object, String key) {
             // This is the preliminary generic case: There are native members we know that they
@@ -443,6 +450,11 @@ protected boolean eq(String expected, String actual) {
             return expected.equals(actual);
         }
 
+        protected boolean isMemoryView(Object obj) {
+            // TODO
+            return getClass(obj).getName().equals(BuiltinNames.MEMORYVIEW);
+        }
+
         public static ReadNativeMemberNode create() {
             return ReadNativeMemberNodeGen.create();
         }
@@ -470,6 +482,14 @@ private int sizeofWchar() {
             }
             return (int) sizeofWcharNode.execute();
         }
+
+        private PythonClass getClass(Object obj) {
+            if (getClassNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                getClassNode = insert(GetClassNode.create());
+            }
+            return getClassNode.execute(obj);
+        }
     }
 
     @Resolve(message = "WRITE")

graalpython/lib-graalpython/memoryview.py

@@ -37,13 +37,27 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-# memoryview is implemented in C
-import sys
+# memoryview is mainly implemented in C
 
-class memoryview():
-    def __new__(cls, *args, **kwargs):
+def make_init():
+    def __memoryview_init(self, *args, **kwargs):
         import _memoryview
-        sys.modules['builtins'].memoryview = _memoryview.nativememoryview
-        return _memoryview.nativememoryview(*args, **kwargs)
+        self.__c_memoryview = _memoryview.nativememoryview(*args, **kwargs)
 
-sys.modules['builtins'].memoryview = memoryview
+    return __memoryview_init
+
+def make_getitem():
+    def __memoryview_getitem(self, *args, **kwargs):
+        import _memoryview
+        res = _memoryview.nativememoryview(*args, **kwargs)
+        return memoryview(res) if isinstance(res, _memoryview.nativememoryview) else res
+    return __memoryview_getitem
+
+memoryview.__init__ = make_init()
+memoryview.__repr__ = lambda self: self.__c_memoryview.__repr__()
+memoryview.__len__ = lambda self: self.__c_memoryview.__len__()
+memoryview.__getitem__ = make_getitem()
+memoryview.__setitem__ = lambda self, key, value: self.__c_memoryview.__setitem__(key, value)
+
+del make_init
+del make_getitem