20006dbba9
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.
60 lines
1.6 KiB
C
60 lines
1.6 KiB
C
#include <stdlib.h>
|
|
#include <assert.h>
|
|
|
|
#include "nlr.h"
|
|
#include "misc.h"
|
|
#include "mpconfig.h"
|
|
#include "mpqstr.h"
|
|
#include "obj.h"
|
|
#include "runtime.h"
|
|
|
|
typedef struct _mp_obj_map_t {
|
|
mp_obj_base_t base;
|
|
machine_uint_t n_iters;
|
|
mp_obj_t fun;
|
|
mp_obj_t iters[];
|
|
} mp_obj_map_t;
|
|
|
|
static mp_obj_t map_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
|
if (n_args < 2 || n_kw != 0) {
|
|
nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "map must have at least 2 arguments and no keyword arguments"));
|
|
}
|
|
assert(n_args >= 2);
|
|
mp_obj_map_t *o = m_new_obj_var(mp_obj_map_t, mp_obj_t, n_args - 1);
|
|
o->base.type = &map_type;
|
|
o->n_iters = n_args - 1;
|
|
o->fun = args[0];
|
|
for (int i = 0; i < n_args - 1; i++) {
|
|
o->iters[i] = rt_getiter(args[i + 1]);
|
|
}
|
|
return o;
|
|
}
|
|
|
|
static mp_obj_t map_getiter(mp_obj_t self_in) {
|
|
return self_in;
|
|
}
|
|
|
|
static mp_obj_t map_iternext(mp_obj_t self_in) {
|
|
assert(MP_OBJ_IS_TYPE(self_in, &map_type));
|
|
mp_obj_map_t *self = self_in;
|
|
mp_obj_t *nextses = m_new(mp_obj_t, self->n_iters);
|
|
|
|
for (int i = 0; i < self->n_iters; i++) {
|
|
mp_obj_t next = rt_iternext(self->iters[i]);
|
|
if (next == mp_const_stop_iteration) {
|
|
m_del(mp_obj_t, nextses, self->n_iters);
|
|
return mp_const_stop_iteration;
|
|
}
|
|
nextses[i] = next;
|
|
}
|
|
return rt_call_function_n_kw(self->fun, self->n_iters, 0, nextses);
|
|
}
|
|
|
|
const mp_obj_type_t map_type = {
|
|
{ &mp_const_type },
|
|
"map",
|
|
.make_new = map_make_new,
|
|
.getiter = map_getiter,
|
|
.iternext = map_iternext,
|
|
};
|