summaryrefslogtreecommitdiffstatshomepage
path: root/py/objgenerator.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-03-26 19:27:58 +0000
committerDamien George <damien.p.george@gmail.com>2014-03-26 19:27:58 +0000
commit66eaf84b8c2db6afad7ec49eb296a019a2f377df (patch)
treea05406b020ba4102ffd90fdfb5357a301b9de637 /py/objgenerator.c
parent688e220d268609ec1a5be7a9b532637fe8c1f765 (diff)
downloadmicropython-66eaf84b8c2db6afad7ec49eb296a019a2f377df.tar.gz
micropython-66eaf84b8c2db6afad7ec49eb296a019a2f377df.zip
py: Replace mp_const_stop_iteration object with MP_OBJ_NULL.
Diffstat (limited to 'py/objgenerator.c')
-rw-r--r--py/objgenerator.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/py/objgenerator.c b/py/objgenerator.c
index eed5a55111..0a4dcd7b17 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -78,7 +78,7 @@ mp_obj_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw
mp_obj_gen_instance_t *self = self_in;
if (self->ip == 0) {
*ret_kind = MP_VM_RETURN_NORMAL;
- return mp_const_stop_iteration;
+ return MP_OBJ_NULL;
}
if (self->sp == self->state - 1) {
if (send_value != mp_const_none) {
@@ -122,7 +122,7 @@ STATIC mp_obj_t gen_resume_and_raise(mp_obj_t self_in, mp_obj_t send_value, mp_o
case MP_VM_RETURN_NORMAL:
// Optimize return w/o value in case generator is used in for loop
if (ret == mp_const_none) {
- return mp_const_stop_iteration;
+ return MP_OBJ_NULL;
} else {
nlr_jump(mp_obj_new_exception_args(&mp_type_StopIteration, 1, &ret));
}
@@ -145,7 +145,7 @@ mp_obj_t gen_instance_iternext(mp_obj_t self_in) {
STATIC mp_obj_t gen_instance_send(mp_obj_t self_in, mp_obj_t send_value) {
mp_obj_t ret = gen_resume_and_raise(self_in, send_value, MP_OBJ_NULL);
- if (ret == mp_const_stop_iteration) {
+ if (ret == MP_OBJ_NULL) {
nlr_jump(mp_obj_new_exception(&mp_type_StopIteration));
} else {
return ret;
@@ -156,7 +156,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(gen_instance_send_obj, gen_instance_send);
STATIC mp_obj_t gen_instance_throw(uint n_args, const mp_obj_t *args) {
mp_obj_t ret = gen_resume_and_raise(args[0], mp_const_none, n_args == 2 ? args[1] : args[2]);
- if (ret == mp_const_stop_iteration) {
+ if (ret == MP_OBJ_NULL) {
nlr_jump(mp_obj_new_exception(&mp_type_StopIteration));
} else {
return ret;