summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2015-02-09 15:08:00 +0000
committerDamien George <damien.p.george@gmail.com>2015-02-09 15:08:00 +0000
commit48244044a2b434406f95b4df76835262cda09dba (patch)
tree4ad0671dcf2a6cedac8dc3452905e62052433858 /py
parent1a6721fefdae5291728cf57490950734b2b8b8a6 (diff)
downloadmicropython-48244044a2b434406f95b4df76835262cda09dba.tar.gz
micropython-48244044a2b434406f95b4df76835262cda09dba.zip
py: Allow subclass of native object to delegate to the native buffer_p.
Addresses issue #1109.
Diffstat (limited to 'py')
-rw-r--r--py/objtype.c24
1 files changed, 23 insertions, 1 deletions
diff --git a/py/objtype.c b/py/objtype.c
index 07aa56434a..d10d6cbd5a 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -666,6 +666,25 @@ STATIC mp_obj_t instance_getiter(mp_obj_t self_in) {
return mp_call_function_n_kw(meth, 0, 0, NULL);
}
+STATIC mp_int_t instance_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
+ mp_obj_instance_t *self = self_in;
+ mp_obj_t member[2] = {MP_OBJ_NULL};
+ struct class_lookup_data lookup = {
+ .obj = self,
+ .attr = MP_QSTR_, // don't actually look for a method
+ .meth_offset = offsetof(mp_obj_type_t, buffer_p.get_buffer),
+ .dest = member,
+ .is_type = false,
+ };
+ mp_obj_class_lookup(&lookup, self->base.type);
+ if (member[0] == MP_OBJ_SENTINEL) {
+ mp_obj_type_t *type = mp_obj_get_type(self->subobj[0]);
+ return type->buffer_p.get_buffer(self->subobj[0], bufinfo, flags);
+ } else {
+ return 1; // object does not support buffer protocol
+ }
+}
+
/******************************************************************************/
// type object
// - the struct is mp_obj_type_t and is defined in obj.h so const types can be made
@@ -807,13 +826,16 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
o->name = name;
o->print = instance_print;
o->make_new = instance_make_new;
+ o->call = mp_obj_instance_call;
o->unary_op = instance_unary_op;
o->binary_op = instance_binary_op;
o->load_attr = mp_obj_instance_load_attr;
o->store_attr = mp_obj_instance_store_attr;
o->subscr = instance_subscr;
- o->call = mp_obj_instance_call;
o->getiter = instance_getiter;
+ //o->iternext = ; not implemented
+ o->buffer_p.get_buffer = instance_get_buffer;
+ //o->stream_p = ; not implemented
o->bases_tuple = bases_tuple;
o->locals_dict = locals_dict;