Merge branch 'cplusplus' of https://github.com/ian-v/micropython into ian-v-cplusplus
Conflicts:
py/objcomplex.c
diff --git a/py/objgenerator.c b/py/objgenerator.c
index a91b0d6..7eeb4ef 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -39,14 +39,7 @@
const mp_obj_type_t gen_wrap_type = {
{ &mp_const_type },
"generator",
- NULL, // print
- NULL, // make_new
- gen_wrap_call_n, // call_n
- NULL, // unary_op
- NULL, // binary_op
- NULL, // getiter
- NULL, // iternext
- .methods = {{NULL, NULL},},
+ .call_n = gen_wrap_call_n,
};
mp_obj_t mp_obj_new_gen_wrap(uint n_locals, uint n_stack, mp_obj_t fun) {
@@ -94,14 +87,9 @@
const mp_obj_type_t gen_instance_type = {
{ &mp_const_type },
"generator",
- gen_instance_print, // print
- NULL, // make_new
- NULL, // call_n
- NULL, // unary_op
- NULL, // binary_op
- gen_instance_getiter, // getiter
- gen_instance_iternext, // iternext
- .methods = {{NULL, NULL},},
+ .print = gen_instance_print,
+ .getiter = gen_instance_getiter,
+ .iternext = gen_instance_iternext,
};
// args are in reverse order in the array