diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-09 19:53:31 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-09 19:53:31 +0100 |
| commit | d99944acddbce627e96326551e47dbf5b3ef5800 (patch) | |
| tree | b6ab718b27feeb5f0a3481be3b7af5f6b4918c37 /py/objgenerator.c | |
| parent | a157e4caba25e61dba2cda9bac37920887e5ec02 (diff) | |
| download | micropython-d99944acddbce627e96326551e47dbf5b3ef5800.tar.gz micropython-d99944acddbce627e96326551e47dbf5b3ef5800.zip | |
py: Clear state to MP_OBJ_NULL before executing byte code.
Diffstat (limited to 'py/objgenerator.c')
| -rw-r--r-- | py/objgenerator.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/py/objgenerator.c b/py/objgenerator.c index 3a7f9f9d40..6468aa20db 100644 --- a/py/objgenerator.c +++ b/py/objgenerator.c @@ -252,14 +252,15 @@ mp_obj_t mp_obj_new_gen_instance(const byte *bytecode, uint n_args, const mp_obj o->state[n_state - 1 - n_args - i] = args2[i]; } + // set rest of state to MP_OBJ_NULL + for (uint i = 0; i < n_state - n_args - n_args2; i++) { + o->state[i] = MP_OBJ_NULL; + } + // bytecode prelude: initialise closed over variables for (uint n_local = *bytecode++; n_local > 0; n_local--) { uint local_num = *bytecode++; - if (local_num < n_args + n_args2) { - o->state[n_state - 1 - local_num] = mp_obj_new_cell(o->state[n_state - 1 - local_num]); - } else { - o->state[n_state - 1 - local_num] = mp_obj_new_cell(MP_OBJ_NULL); - } + o->state[n_state - 1 - local_num] = mp_obj_new_cell(o->state[n_state - 1 - local_num]); } // set ip to start of actual byte code |