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.
58 lines
1.4 KiB
C
58 lines
1.4 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_filter_t {
|
|
mp_obj_base_t base;
|
|
mp_obj_t fun;
|
|
mp_obj_t iter;
|
|
} mp_obj_filter_t;
|
|
|
|
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[0];
|
|
o->iter = rt_getiter(args[1]);
|
|
return o;
|
|
}
|
|
|
|
static mp_obj_t filter_getiter(mp_obj_t self_in) {
|
|
return self_in;
|
|
}
|
|
|
|
static mp_obj_t filter_iternext(mp_obj_t self_in) {
|
|
assert(MP_OBJ_IS_TYPE(self_in, &filter_type));
|
|
mp_obj_filter_t *self = self_in;
|
|
mp_obj_t next;
|
|
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_kw(self->fun, 1, 0, &next);
|
|
} else {
|
|
val = next;
|
|
}
|
|
if (rt_is_true(val)) {
|
|
return next;
|
|
}
|
|
}
|
|
return mp_const_stop_iteration;
|
|
}
|
|
|
|
const mp_obj_type_t filter_type = {
|
|
{ &mp_const_type },
|
|
"filter",
|
|
.make_new = filter_make_new,
|
|
.getiter = filter_getiter,
|
|
.iternext = filter_iternext,
|
|
};
|