commit 107c9fb235150d4f18309fb3ca61411e045ae669
author Damien George <damien.p.george@gmail.com> Sat Apr 26 10:31:15 2014 +0100
committer Damien George <damien.p.george@gmail.com> Sat Apr 26 10:31:15 2014 +0100
tree 413db9d2c8695d1ae768c9ce480713904955aef5
parent 1463c1fa82e930edfef9df9b70c6b8c12cdcb1c1

py: Make collections module configurable, enabled by default.

py/builtintables.c

diff --git a/py/builtintables.c b/py/builtintables.c
index 940647d..e6461ad 100644
--- a/py/builtintables.c
+++ b/py/builtintables.c
@@ -132,7 +132,9 @@
 #if MICROPY_ENABLE_MOD_IO
     { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io },
 #endif
+#if MICROPY_ENABLE_MOD_COLLECTIONS
     { MP_OBJ_NEW_QSTR(MP_QSTR__collections), (mp_obj_t)&mp_module_collections },
+#endif
 #if MICROPY_ENABLE_MOD_STRUCT
     { MP_OBJ_NEW_QSTR(MP_QSTR_struct), (mp_obj_t)&mp_module_struct },
 #endif

py/modcollections.c

diff --git a/py/modcollections.c b/py/modcollections.c
index 11845a0..5278a52 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -4,6 +4,8 @@
 #include "obj.h"
 #include "builtin.h"
 
+#if MICROPY_ENABLE_MOD_COLLECTIONS
+
 STATIC const mp_map_elem_t mp_module_collections_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR__collections) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_namedtuple), (mp_obj_t)&mp_namedtuple_obj },
@@ -25,3 +27,5 @@
     .name = MP_QSTR__collections,
     .globals = (mp_obj_dict_t*)&mp_module_collections_globals,
 };
+
+#endif // MICROPY_ENABLE_MOD_COLLECTIONS

py/mpconfig.h

diff --git a/py/mpconfig.h b/py/mpconfig.h
index b669128..13918e8 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -115,6 +115,11 @@
 #define MICROPY_ENABLE_FLOAT (0)
 #endif
 
+// Whether to provide "collections" module
+#ifndef MICROPY_ENABLE_MOD_COLLECTIONS
+#define MICROPY_ENABLE_MOD_COLLECTIONS (1)
+#endif
+
 // Whether to provide "math" module
 #ifndef MICROPY_ENABLE_MOD_MATH
 #define MICROPY_ENABLE_MOD_MATH (1)

py/objnamedtuple.c

diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index 10cf40c..4239983 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -7,6 +7,8 @@
 #include "obj.h"
 #include "objtuple.h"
 
+#if MICROPY_ENABLE_MOD_COLLECTIONS
+
 typedef struct _mp_obj_namedtuple_type_t {
     mp_obj_type_t base;
     const char *fields;
@@ -143,3 +145,5 @@
     return mp_obj_new_namedtuple_type(name, fields);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_namedtuple_obj, new_namedtuple_type);
+
+#endif // MICROPY_ENABLE_MOD_COLLECTIONS