TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py: More mp_identity usage.

Browse Source
This commit is contained in:
Paul Sokolovsky
2014-05-17 11:18:23 +03:00
parent ab7bf28489
commit bf27140193
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
py/objgenerator.c
View File

@@ -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); 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) { 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)); assert(MP_OBJ_IS_TYPE(self_in, &mp_type_gen_instance));
mp_obj_gen_instance_t *self = self_in; mp_obj_gen_instance_t *self = self_in;
@@ -251,7 +247,7 @@ const mp_obj_type_t mp_type_gen_instance = {
{ &mp_type_type }, { &mp_type_type },
.name = MP_QSTR_generator, .name = MP_QSTR_generator,
.print = gen_instance_print, .print = gen_instance_print,
.getiter = gen_instance_getiter, .getiter = mp_identity,
.iternext = gen_instance_iternext, .iternext = gen_instance_iternext,
.locals_dict = (mp_obj_t)&gen_instance_locals_dict, .locals_dict = (mp_obj_t)&gen_instance_locals_dict,
}; };

6
py/objmap.c
View File

@@ -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; 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) { STATIC mp_obj_t map_iternext(mp_obj_t self_in) {
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_map)); assert(MP_OBJ_IS_TYPE(self_in, &mp_type_map));
mp_obj_map_t *self = self_in; mp_obj_map_t *self = self_in;
@@ -80,6 +76,6 @@ const mp_obj_type_t mp_type_map = {
{ &mp_type_type }, { &mp_type_type },
.name = MP_QSTR_map, .name = MP_QSTR_map,
.make_new = map_make_new, .make_new = map_make_new,
.getiter = map_getiter, .getiter = mp_identity,
.iternext = map_iternext, .iternext = map_iternext,
}; };