![Damien George](/assets/img/avatar_default.png)
Change state layout in VM so the stack starts at state[0] and grows upwards. Locals are at the top end of the state and number downwards. This cleans up a lot of the interface connecting the VM to C: now all functions that take an array of Micro Python objects are in order (ie no longer in reverse). Also clean up C API with keyword arguments (call_n and call_n_kw replaced with single call method that takes keyword arguments). And now make_new takes keyword arguments. emitnative.c has not yet been changed to comply with the new order of stack layout.
51 lines
1.4 KiB
C
51 lines
1.4 KiB
C
#include <stdlib.h>
|
|
#include <assert.h>
|
|
|
|
#include "misc.h"
|
|
#include "mpconfig.h"
|
|
#include "obj.h"
|
|
#include "runtime.h"
|
|
|
|
typedef struct _mp_obj_enumerate_t {
|
|
mp_obj_base_t base;
|
|
mp_obj_t iter;
|
|
machine_int_t cur;
|
|
} mp_obj_enumerate_t;
|
|
|
|
static mp_obj_t enumerate_getiter(mp_obj_t self_in) {
|
|
return self_in;
|
|
}
|
|
|
|
static mp_obj_t enumerate_iternext(mp_obj_t self_in);
|
|
|
|
/* TODO: enumerate is one of the ones that can take args or kwargs.
|
|
Sticking to args for now */
|
|
static mp_obj_t enumerate_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
|
assert(n_args > 0);
|
|
mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t);
|
|
o->base.type = &enumerate_type;
|
|
o->iter = rt_getiter(args[0]);
|
|
o->cur = n_args > 1 ? mp_obj_get_int(args[1]) : 0;
|
|
return o;
|
|
}
|
|
|
|
const mp_obj_type_t enumerate_type = {
|
|
{ &mp_const_type },
|
|
"enumerate",
|
|
.make_new = enumerate_make_new,
|
|
.iternext = enumerate_iternext,
|
|
.getiter = enumerate_getiter,
|
|
};
|
|
|
|
static mp_obj_t enumerate_iternext(mp_obj_t self_in) {
|
|
assert(MP_OBJ_IS_TYPE(self_in, &enumerate_type));
|
|
mp_obj_enumerate_t *self = self_in;
|
|
mp_obj_t next = rt_iternext(self->iter);
|
|
if (next == mp_const_stop_iteration) {
|
|
return mp_const_stop_iteration;
|
|
} else {
|
|
mp_obj_t items[] = {MP_OBJ_NEW_SMALL_INT(self->cur++), next};
|
|
return mp_obj_new_tuple(2, items);
|
|
}
|
|
}
|