aboutsummaryrefslogtreecommitdiff
path: root/py/objfilter.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/objfilter.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/objfilter.c')
-rw-r--r--py/objfilter.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/py/objfilter.c b/py/objfilter.c
index 18225ac10..6ef3ef62d 100644
--- a/py/objfilter.c
+++ b/py/objfilter.c
@@ -14,16 +14,15 @@ typedef struct _mp_obj_filter_t {
mp_obj_t iter;
} mp_obj_filter_t;
-static mp_obj_t filter_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
- /* NOTE: args are backwards */
- if (n_args != 2) {
+static mp_obj_t filter_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, "filter expected 2 arguments"));
}
assert(n_args == 2);
mp_obj_filter_t *o = m_new_obj(mp_obj_filter_t);
o->base.type = &filter_type;
- o->fun = args[1];
- o->iter = rt_getiter(args[0]);
+ o->fun = args[0];
+ o->iter = rt_getiter(args[1]);
return o;
}
@@ -38,7 +37,7 @@ static mp_obj_t filter_iternext(mp_obj_t self_in) {
while ((next = rt_iternext(self->iter)) != mp_const_stop_iteration) {
mp_obj_t val;
if (self->fun != mp_const_none) {
- val = rt_call_function_n(self->fun, 1, &next);
+ val = rt_call_function_n_kw(self->fun, 1, 0, &next);
} else {
val = next;
}