Skip to content

Commit 7a9d0c4

Browse files
dpgeorgedpgeorge
committed
Merge branch 'builtins' of github.com:chipaca/micropython into chipaca-builtins
Added some checks for number of arguments. Conflicts: py/mpqstrraw.h
2 parents 11507f4 + fca456b commit 7a9d0c4

10 files changed

Lines changed: 201 additions & 0 deletions

File tree

‎py/mpqstrraw.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ Q(chr)
4242
Q(complex)
4343
Q(dict)
4444
Q(divmod)
45+
Q(enumerate)
4546
Q(eval)
47+
Q(filter)
4648
Q(float)
4749
Q(hash)
4850
Q(int)
@@ -51,6 +53,7 @@ Q(issubclass)
5153
Q(iter)
5254
Q(len)
5355
Q(list)
56+
Q(map)
5457
Q(max)
5558
Q(min)
5659
Q(next)

‎py/obj.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,15 @@ void mp_obj_list_get(mp_obj_t self_in, uint *len, mp_obj_t **items);
294294
void mp_obj_list_store(mp_obj_t self_in, mp_obj_t index, mp_obj_t value);
295295
mp_obj_t mp_obj_list_sort(mp_obj_t args, struct _mp_map_t *kwargs);
296296

297+
// map (the python builtin, not the dict implementation detail)
298+
extern const mp_obj_type_t map_type;
299+
300+
// enumerate
301+
extern const mp_obj_type_t enumerate_type;
302+
303+
// filter
304+
extern const mp_obj_type_t filter_type;
305+
297306
// dict
298307
extern const mp_obj_type_t dict_type;
299308
uint mp_obj_dict_len(mp_obj_t self_in);

‎py/objenumerate.c‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#include <stdlib.h>
2+
#include <assert.h>
3+
4+
#include "misc.h"
5+
#include "mpconfig.h"
6+
#include "obj.h"
7+
#include "runtime.h"
8+
9+
typedef struct _mp_obj_enumerate_t {
10+
mp_obj_base_t base;
11+
mp_obj_t iter;
12+
machine_int_t cur;
13+
} mp_obj_enumerate_t;
14+
15+
static mp_obj_t enumerate_getiter(mp_obj_t self_in) {
16+
return self_in;
17+
}
18+
19+
static mp_obj_t enumerate_iternext(mp_obj_t self_in);
20+
21+
/* TODO: enumerate is one of the ones that can take args or kwargs.
22+
Sticking to args for now */
23+
static mp_obj_t enumerate_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
24+
/* NOTE: args are backwards */
25+
assert(n_args > 0);
26+
args += n_args - 1;
27+
mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t);
28+
o->base.type = &enumerate_type;
29+
o->iter = rt_getiter(args[0]);
30+
o->cur = n_args > 1 ? mp_obj_get_int(args[-1]) : 0;
31+
32+
return o;
33+
}
34+
35+
const mp_obj_type_t enumerate_type = {
36+
{ &mp_const_type },
37+
"enumerate",
38+
.make_new = enumerate_make_new,
39+
.iternext = enumerate_iternext,
40+
.getiter = enumerate_getiter,
41+
};
42+
43+
static mp_obj_t enumerate_iternext(mp_obj_t self_in) {
44+
assert(MP_OBJ_IS_TYPE(self_in, &enumerate_type));
45+
mp_obj_enumerate_t *self = self_in;
46+
mp_obj_t next = rt_iternext(self->iter);
47+
if (next == mp_const_stop_iteration) {
48+
return mp_const_stop_iteration;
49+
} else {
50+
mp_obj_t items[] = {MP_OBJ_NEW_SMALL_INT(self->cur++), next};
51+
return mp_obj_new_tuple(2, items);
52+
}
53+
}

‎py/objfilter.c‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#include <stdlib.h>
2+
#include <assert.h>
3+
4+
#include "nlr.h"
5+
#include "misc.h"
6+
#include "mpconfig.h"
7+
#include "mpqstr.h"
8+
#include "obj.h"
9+
#include "runtime.h"
10+
11+
typedef struct _mp_obj_filter_t {
12+
mp_obj_base_t base;
13+
mp_obj_t fun;
14+
mp_obj_t iter;
15+
} mp_obj_filter_t;
16+
17+
static mp_obj_t filter_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
18+
/* NOTE: args are backwards */
19+
if (n_args != 2) {
20+
nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "filter expected 2 arguments"));
21+
}
22+
assert(n_args == 2);
23+
mp_obj_filter_t *o = m_new_obj(mp_obj_filter_t);
24+
o->base.type = &filter_type;
25+
o->fun = args[1];
26+
o->iter = rt_getiter(args[0]);
27+
return o;
28+
}
29+
30+
static mp_obj_t filter_getiter(mp_obj_t self_in) {
31+
return self_in;
32+
}
33+
34+
static mp_obj_t filter_iternext(mp_obj_t self_in) {
35+
assert(MP_OBJ_IS_TYPE(self_in, &filter_type));
36+
mp_obj_filter_t *self = self_in;
37+
mp_obj_t next;
38+
while ((next = rt_iternext(self->iter)) != mp_const_stop_iteration) {
39+
mp_obj_t val;
40+
if (self->fun != mp_const_none) {
41+
val = rt_call_function_n(self->fun, 1, &next);
42+
} else {
43+
val = next;
44+
}
45+
if (rt_is_true(val)) {
46+
return next;
47+
}
48+
}
49+
return mp_const_stop_iteration;
50+
}
51+
52+
const mp_obj_type_t filter_type = {
53+
{ &mp_const_type },
54+
"filter",
55+
.make_new = filter_make_new,
56+
.getiter = filter_getiter,
57+
.iternext = filter_iternext,
58+
};

‎py/objmap.c‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#include <stdlib.h>
2+
#include <assert.h>
3+
4+
#include "nlr.h"
5+
#include "misc.h"
6+
#include "mpconfig.h"
7+
#include "mpqstr.h"
8+
#include "obj.h"
9+
#include "runtime.h"
10+
11+
typedef struct _mp_obj_map_t {
12+
mp_obj_base_t base;
13+
machine_uint_t n_iters;
14+
mp_obj_t fun;
15+
mp_obj_t iters[];
16+
} mp_obj_map_t;
17+
18+
static mp_obj_t map_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
19+
/* NOTE: args are backwards */
20+
if (n_args < 2) {
21+
nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "map must have at least 2 arguments"));
22+
}
23+
assert(n_args >= 2);
24+
mp_obj_map_t *o = m_new_obj_var(mp_obj_map_t, mp_obj_t, n_args - 1);
25+
o->base.type = &map_type;
26+
o->n_iters = n_args - 1;
27+
o->fun = args[n_args - 1];
28+
for (int i = 0; i < n_args - 1; i++) {
29+
o->iters[i] = rt_getiter(args[n_args-i-2]);
30+
}
31+
return o;
32+
}
33+
34+
static mp_obj_t map_getiter(mp_obj_t self_in) {
35+
return self_in;
36+
}
37+
38+
static mp_obj_t map_iternext(mp_obj_t self_in) {
39+
assert(MP_OBJ_IS_TYPE(self_in, &map_type));
40+
mp_obj_map_t *self = self_in;
41+
mp_obj_t *nextses = m_new(mp_obj_t, self->n_iters);
42+
43+
for (int i = 0; i < self->n_iters; i++) {
44+
mp_obj_t next = rt_iternext(self->iters[i]);
45+
if (next == mp_const_stop_iteration) {
46+
m_del(mp_obj_t, nextses, self->n_iters);
47+
return mp_const_stop_iteration;
48+
}
49+
nextses[i] = next;
50+
}
51+
return rt_call_function_n(self->fun, self->n_iters, nextses);
52+
}
53+
54+
const mp_obj_type_t map_type = {
55+
{ &mp_const_type },
56+
"map",
57+
.make_new = map_make_new,
58+
.getiter = map_getiter,
59+
.iternext = map_iternext,
60+
};

‎py/py.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,15 @@ PY_O_BASENAME = \
7777
objclosure.o \
7878
objcomplex.o \
7979
objdict.o \
80+
objenumerate.o \
8081
objexcept.o \
82+
objfilter.o \
8183
objfloat.o \
8284
objfun.o \
8385
objgenerator.o \
8486
objint.o \
8587
objlist.o \
88+
objmap.o \
8689
objmodule.o \
8790
objnone.o \
8891
objrange.o \

‎py/runtime.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,14 @@ void rt_init(void) {
105105
mp_map_add_qstr(&map_builtins, MP_QSTR_complex, (mp_obj_t)&complex_type);
106106
#endif
107107
mp_map_add_qstr(&map_builtins, MP_QSTR_dict, (mp_obj_t)&dict_type);
108+
mp_map_add_qstr(&map_builtins, MP_QSTR_enumerate, (mp_obj_t)&enumerate_type);
109+
mp_map_add_qstr(&map_builtins, MP_QSTR_filter, (mp_obj_t)&filter_type);
108110
#if MICROPY_ENABLE_FLOAT
109111
mp_map_add_qstr(&map_builtins, MP_QSTR_float, (mp_obj_t)&float_type);
110112
#endif
111113
mp_map_add_qstr(&map_builtins, MP_QSTR_int, (mp_obj_t)&int_type);
112114
mp_map_add_qstr(&map_builtins, MP_QSTR_list, (mp_obj_t)&list_type);
115+
mp_map_add_qstr(&map_builtins, MP_QSTR_map, (mp_obj_t)&map_type);
113116
mp_map_add_qstr(&map_builtins, MP_QSTR_set, (mp_obj_t)&set_type);
114117
mp_map_add_qstr(&map_builtins, MP_QSTR_tuple, (mp_obj_t)&tuple_type);
115118
mp_map_add_qstr(&map_builtins, MP_QSTR_type, (mp_obj_t)&mp_const_type);

‎tests/basics/tests/enumerate.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
print(list(enumerate([])))
2+
print(list(enumerate([1, 2, 3])))
3+
print(list(enumerate([1, 2, 3], 5)))
4+
print(list(enumerate([1, 2, 3], -5)))
5+
print(list(enumerate(range(10000))))
6+

‎tests/basics/tests/filter.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
print(list(filter(lambda x: x & 1, range(-3, 4))))
2+
print(list(filter(None, range(-3, 4))))

‎tests/basics/tests/map.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
print(list(map(lambda x: x & 1, range(-3, 4))))
2+
print(list(map(abs, range(-3, 4))))
3+
print(list(map(set, [[i] for i in range(-3, 4)])))
4+
print(list(map(pow, range(4), range(4))))

0 commit comments

Comments
 (0)