Wrap native 'getset' descriptor functions.

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -142,7 +142,7 @@ void* wrap_unsupported(void *fun, ...);
           truffle_read(PY_TRUFFLE_CEXT, "METH_UNSUPPORTED")))))))
 
 #define get_method_flags_cwrapper(flags)                                \
-    (void*)((((flags) < 0) ?                                                    \
+    (void*)((((flags) < 0) ?                                            \
      wrap_direct :                                                      \
      (((flags) & METH_KEYWORDS) ?                                       \
       wrap_keywords :                                                   \
@@ -156,7 +156,6 @@ void* wrap_unsupported(void *fun, ...);
           wrap_fastcall :                                               \
           wrap_unsupported)))))))
 
-
 #define PY_TRUFFLE_TYPE(__TYPE_NAME__, __SUPER_TYPE__, __FLAGS__, __SIZE__) {\
     PyVarObject_HEAD_INIT((__SUPER_TYPE__), 0)\
     __TYPE_NAME__,                              /* tp_name */\

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

@@ -318,12 +318,16 @@ int PyType_Ready(PyTypeObject* cls) {
         int i = 0;
         PyGetSetDef getset = getsets[i];
         while (getset.name != NULL) {
+            getter getter_fun = getset.get;
+            setter setter_fun = getset.set;
             truffle_invoke(PY_TRUFFLE_CEXT,
                            "AddGetSet",
                            javacls,
                            truffle_read_string(getset.name),
-                           truffle_address_to_function(getset.get),
-                           truffle_address_to_function(getset.set),
+                           getter_fun != NULL ? getter_fun : to_java(Py_None),
+                           wrap_direct,
+                           setter_fun != NULL ? setter_fun : to_java(Py_None),
+                           wrap_direct,
                            getset.doc ? truffle_read_string(getset.doc) : truffle_read_string(""),
                            // do not convert the closure, it is handed to the
                            // getter and setter as-is

graalpython/lib-graalpython/python_cext.py

@@ -656,21 +656,30 @@ def member_setter(self, value):
     object.__setattr__(primary, name, member)
 
 
-def AddGetSet(primary, name, getter, setter, doc, closure):
+def AddGetSet(primary, name, getter, getter_wrapper, setter, setter_wrapper, doc, closure):
     getset = property()
-    getter_w = CreateFunction(name, getter)
-    def member_getter(self):
-        return capi_to_java(getter_w(self, closure))
-    getset.getter(member_getter)
-    setter_w = CreateFunction(name, setter)
-    def member_setter(self, value):
-        setter_w(self, value, closure)
-        return None
-    getset.setter(member_setter)
+    if getter:
+        getter_w = CreateFunction(name, getter, getter_wrapper)
+        def member_getter(self):
+            return capi_to_java(getter_w(self, closure))
+
+        getset.getter(member_getter)
+    if setter:
+        setter_w = CreateFunction(name, setter, setter_wrapper)
+        def member_setter(self, value):
+            setter_w(self, value, closure)
+            return None
+        getset.setter(member_setter)
+    else:
+        getset.setter(lambda self, value: GetSet_SetNotWritable(self, value, name))
     getset.__doc__ = doc
     object.__setattr__(primary, name, getset)
 
 
+def GetSet_SetNotWritable(self, value, attr):
+    raise AttributeError("attribute '%s' of '%s' objects is not writable" % (attr, type(self).__name__))
+
+
 def PyObject_Str(o):
     return str(o)