objnamedtuple: Support iteration.

pfalcon · pfalcon · commit 7067d69bccba · 2014-05-10T21:26:07.000+03:00
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
@@ -160,6 +160,7 @@ mp_obj_t mp_obj_new_namedtuple_type(qstr name, const char *fields) {
     o->base.load_attr = namedtuple_load_attr;
     o->base.store_attr = namedtuple_store_attr;
     o->base.subscr = tuple_subscr;
+    o->base.getiter = tuple_getiter;
     o->base.bases_tuple = (mp_obj_t)&namedtuple_base_tuple;
     o->fields = fields;
     return o;
diff --git a/py/objtuple.c b/py/objtuple.c
@@ -174,7 +174,7 @@ mp_obj_t tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     }
 }
 
-STATIC mp_obj_t tuple_getiter(mp_obj_t o_in) {
+mp_obj_t tuple_getiter(mp_obj_t o_in) {
     return mp_obj_new_tuple_iterator(o_in, 0);
 }
 
diff --git a/py/objtuple.h b/py/objtuple.h
@@ -34,3 +34,4 @@ void tuple_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_o
 mp_obj_t tuple_unary_op(int op, mp_obj_t self_in);
 mp_obj_t tuple_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs);
 mp_obj_t tuple_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value);
+mp_obj_t tuple_getiter(mp_obj_t o_in);
diff --git a/tests/basics/namedtuple1.py b/tests/basics/namedtuple1.py
@@ -16,6 +16,8 @@
 print(t + t)
 print(t * 3)
 
+print([f for f in t])
+
 print(isinstance(t, tuple))
 
 try:

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ mp_obj_t tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`177`		`-STATIC mp_obj_t tuple_getiter(mp_obj_t o_in) {`
	`177`	`+mp_obj_t tuple_getiter(mp_obj_t o_in) {`
`178`	`178`	`return mp_obj_new_tuple_iterator(o_in, 0);`
`179`	`179`	`}`
`180`	`180`