Skip to content

Commit f6532bb

Browse files
dpgeorgedpgeorge
committed
py: Simplify and remove redundant code for __iter__ method lookup.
1 parent d1c3788 commit f6532bb

5 files changed

Lines changed: 39 additions & 38 deletions

File tree

‎py/obj.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ struct _mp_obj_type_t {
285285
// value=MP_OBJ_NULL means delete, value=MP_OBJ_SENTINEL means load, else store
286286
// can return MP_OBJ_NULL if op not supported
287287

288-
mp_fun_1_t getiter;
288+
mp_fun_1_t getiter; // corresponds to __iter__ special method
289289
mp_fun_1_t iternext; // may return MP_OBJ_STOP_ITERATION as an optimisation instead of raising StopIteration() (with no args)
290290

291291
mp_buffer_p_t buffer_p;

‎py/objtype.c‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -644,21 +644,13 @@ STATIC mp_obj_t instance_getiter(mp_obj_t self_in) {
644644
};
645645
mp_obj_class_lookup(&lookup, self->base.type);
646646
if (member[0] == MP_OBJ_NULL) {
647-
// This kinda duplicates code in mp_getiter()
648-
lookup.attr = MP_QSTR___getitem__;
649-
lookup.meth_offset = 0; // TODO
650-
mp_obj_class_lookup(&lookup, self->base.type);
651-
if (member[0] != MP_OBJ_NULL) {
652-
// __getitem__ exists, create an iterator
653-
return mp_obj_new_getitem_iter(member);
654-
}
655647
return MP_OBJ_NULL;
656-
}
657-
if (member[0] == MP_OBJ_SENTINEL) {
648+
} else if (member[0] == MP_OBJ_SENTINEL) {
658649
mp_obj_type_t *type = mp_obj_get_type(self->subobj[0]);
659650
return type->getiter(self->subobj[0]);
651+
} else {
652+
return mp_call_method_n_kw(0, 0, member);
660653
}
661-
return mp_call_method_n_kw(0, 0, member);
662654
}
663655

664656
STATIC mp_int_t instance_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {

‎py/runtime.c‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -957,37 +957,31 @@ void mp_store_attr(mp_obj_t base, qstr attr, mp_obj_t value) {
957957

958958
mp_obj_t mp_getiter(mp_obj_t o_in) {
959959
assert(o_in);
960+
961+
// check for native getiter (corresponds to __iter__)
960962
mp_obj_type_t *type = mp_obj_get_type(o_in);
961963
if (type->getiter != NULL) {
962964
mp_obj_t iter = type->getiter(o_in);
963-
if (iter == MP_OBJ_NULL) {
964-
goto not_iterable;
965+
if (iter != MP_OBJ_NULL) {
966+
return iter;
965967
}
966-
return iter;
968+
}
969+
970+
// check for __getitem__
971+
mp_obj_t dest[2];
972+
mp_load_method_maybe(o_in, MP_QSTR___getitem__, dest);
973+
if (dest[0] != MP_OBJ_NULL) {
974+
// __getitem__ exists, create and return an iterator
975+
return mp_obj_new_getitem_iter(dest);
976+
}
977+
978+
// object not iterable
979+
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
980+
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
981+
"object not iterable"));
967982
} else {
968-
// check for __iter__ method
969-
mp_obj_t dest[2];
970-
mp_load_method_maybe(o_in, MP_QSTR___iter__, dest);
971-
if (dest[0] != MP_OBJ_NULL) {
972-
// __iter__ exists, call it and return its result
973-
return mp_call_method_n_kw(0, 0, dest);
974-
} else {
975-
mp_load_method_maybe(o_in, MP_QSTR___getitem__, dest);
976-
if (dest[0] != MP_OBJ_NULL) {
977-
// __getitem__ exists, create an iterator
978-
return mp_obj_new_getitem_iter(dest);
979-
} else {
980-
// object not iterable
981-
not_iterable:
982-
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
983-
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
984-
"object not iterable"));
985-
} else {
986-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
987-
"'%s' object is not iterable", mp_obj_get_type_str(o_in)));
988-
}
989-
}
990-
}
983+
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
984+
"'%s' object is not iterable", mp_obj_get_type_str(o_in)));
991985
}
992986
}
993987

‎tests/basics/iter0.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# builtin type that is not iterable
2+
try:
3+
for i in 1:
4+
pass
5+
except TypeError:
6+
print('TypeError')

‎tests/basics/iter1.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# test user defined iterators
22

3+
# this class is not iterable
4+
class NotIterable:
5+
pass
6+
try:
7+
for i in NotIterable():
8+
pass
9+
except TypeError:
10+
print('TypeError')
11+
312
class MyStopIteration(StopIteration):
413
pass
514

0 commit comments

Comments
 (0)