Merge branch 'builtins' of github.com:chipaca/micropython into chipaca-builtins

Added some checks for number of arguments.

Conflicts:
	py/mpqstrraw.h

1 files changed, 9 insertions, 0 deletions

diff --git a/py/obj.h b/py/obj.h
index 6dcc6827e1..c2182863a1 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -294,6 +294,15 @@ void mp_obj_list_get(mp_obj_t self_in, uint *len, mp_obj_t **items);
 void mp_obj_list_store(mp_obj_t self_in, mp_obj_t index, mp_obj_t value);
 mp_obj_t mp_obj_list_sort(mp_obj_t args, struct _mp_map_t *kwargs);
 
+// map (the python builtin, not the dict implementation detail)
+extern const mp_obj_type_t map_type;
+
+// enumerate
+extern const mp_obj_type_t enumerate_type;
+
+// filter
+extern const mp_obj_type_t filter_type;
+
 // dict
 extern const mp_obj_type_t dict_type;
 uint mp_obj_dict_len(mp_obj_t self_in);