diff options
author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-05-17 11:18:23 +0300 |
---|---|---|
committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-05-17 11:20:10 +0300 |
commit | bf271401938d336872b105459e3c4930b183d3fa (patch) | |
tree | 57f71467b201cd6b77d4866bd8c6f7840babf516 | |
parent | ab7bf28489fde83c73da2a3a20b9eadb08e8cc81 (diff) | |
download | micropython-bf271401938d336872b105459e3c4930b183d3fa.tar.gz micropython-bf271401938d336872b105459e3c4930b183d3fa.zip |
py: More mp_identity usage.
-rw-r--r-- | py/objgenerator.c | 6 | ||||
-rw-r--r-- | py/objmap.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/py/objgenerator.c b/py/objgenerator.c index de2ecdd488..8180185b94 100644 --- a/py/objgenerator.c +++ b/py/objgenerator.c @@ -99,10 +99,6 @@ void gen_instance_print(void (*print)(void *env, const char *fmt, ...), void *en print(env, "<generator object '%s' at %p>", mp_obj_code_get_name(self->code_info), self_in); } -mp_obj_t gen_instance_getiter(mp_obj_t self_in) { - return self_in; -} - mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t *ret_val) { assert(MP_OBJ_IS_TYPE(self_in, &mp_type_gen_instance)); mp_obj_gen_instance_t *self = self_in; @@ -251,7 +247,7 @@ const mp_obj_type_t mp_type_gen_instance = { { &mp_type_type }, .name = MP_QSTR_generator, .print = gen_instance_print, - .getiter = gen_instance_getiter, + .getiter = mp_identity, .iternext = gen_instance_iternext, .locals_dict = (mp_obj_t)&gen_instance_locals_dict, }; diff --git a/py/objmap.c b/py/objmap.c index 232e611bd2..6e5c79017d 100644 --- a/py/objmap.c +++ b/py/objmap.c @@ -56,10 +56,6 @@ STATIC mp_obj_t map_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_ return o; } -STATIC mp_obj_t map_getiter(mp_obj_t self_in) { - return self_in; -} - STATIC mp_obj_t map_iternext(mp_obj_t self_in) { assert(MP_OBJ_IS_TYPE(self_in, &mp_type_map)); mp_obj_map_t *self = self_in; @@ -80,6 +76,6 @@ const mp_obj_type_t mp_type_map = { { &mp_type_type }, .name = MP_QSTR_map, .make_new = map_make_new, - .getiter = map_getiter, + .getiter = mp_identity, .iternext = map_iternext, }; |