aboutsummaryrefslogtreecommitdiff
path: root/py/objmap.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-01-18 14:10:48 +0000
committerDamien George <damien.p.george@gmail.com>2014-01-18 14:10:48 +0000
commit20006dbba9d2d84ead036fdfab7190e88b2337ce (patch)
treea83dc966464cbbee17a397bda96360e9d238f8cf /py/objmap.c
parent8655065f8cec8b978d075adae1f65ffdfa9b51d8 (diff)
Make VM stack grow upwards, and so no reversed args arrays.
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.
Diffstat (limited to 'py/objmap.c')
-rw-r--r--py/objmap.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/py/objmap.c b/py/objmap.c
index 365735283..0c25cfdca 100644
--- a/py/objmap.c
+++ b/py/objmap.c
@@ -15,18 +15,17 @@ typedef struct _mp_obj_map_t {
mp_obj_t iters[];
} mp_obj_map_t;
-static mp_obj_t map_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
- /* NOTE: args are backwards */
- if (n_args < 2) {
- nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "map must have at least 2 arguments"));
+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[n_args - 1];
+ o->fun = args[0];
for (int i = 0; i < n_args - 1; i++) {
- o->iters[i] = rt_getiter(args[n_args-i-2]);
+ o->iters[i] = rt_getiter(args[i + 1]);
}
return o;
}
@@ -48,7 +47,7 @@ static mp_obj_t map_iternext(mp_obj_t self_in) {
}
nextses[i] = next;
}
- return rt_call_function_n(self->fun, self->n_iters, nextses);
+ return rt_call_function_n_kw(self->fun, self->n_iters, 0, nextses);
}
const mp_obj_type_t map_type = {