py: Add MICROPY_PY_BUILTINS_ENUMERATE, disable for minimal ports.

pfalcon · pfalcon · commit e2d44e30c773 · 2015-04-06T23:51:29.000+03:00
diff --git a/minimal/mpconfigport.h b/minimal/mpconfigport.h
@@ -21,6 +21,7 @@
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_PY_BUILTINS_BYTEARRAY (0)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
+#define MICROPY_PY_BUILTINS_ENUMERATE (0)
 #define MICROPY_PY_BUILTINS_FROZENSET (0)
 #define MICROPY_PY_BUILTINS_SET     (0)
 #define MICROPY_PY_BUILTINS_SLICE   (0)
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
@@ -594,7 +594,9 @@ STATIC const mp_map_elem_t mp_module_builtins_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_complex), (mp_obj_t)&mp_type_complex },
 #endif
     { MP_OBJ_NEW_QSTR(MP_QSTR_dict), (mp_obj_t)&mp_type_dict },
+    #if MICROPY_PY_BUILTINS_ENUMERATE
     { MP_OBJ_NEW_QSTR(MP_QSTR_enumerate), (mp_obj_t)&mp_type_enumerate },
+    #endif
     { MP_OBJ_NEW_QSTR(MP_QSTR_filter), (mp_obj_t)&mp_type_filter },
 #if MICROPY_PY_BUILTINS_FLOAT
     { MP_OBJ_NEW_QSTR(MP_QSTR_float), (mp_obj_t)&mp_type_float },
diff --git a/py/mpconfig.h b/py/mpconfig.h
@@ -459,6 +459,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_BUILTINS_COMPILE (0)
 #endif
 
+// Whether to support enumerate function(type)
+#ifndef MICROPY_PY_BUILTINS_ENUMERATE
+#define MICROPY_PY_BUILTINS_ENUMERATE (1)
+#endif
+
 // Whether to support the Python 2 execfile function
 #ifndef MICROPY_PY_BUILTINS_EXECFILE
 #define MICROPY_PY_BUILTINS_EXECFILE (0)
diff --git a/py/objenumerate.c b/py/objenumerate.c
@@ -29,6 +29,8 @@
 
 #include "py/runtime.h"
 
+#if MICROPY_PY_BUILTINS_ENUMERATE
+
 typedef struct _mp_obj_enumerate_t {
     mp_obj_base_t base;
     mp_obj_t iter;
@@ -83,3 +85,5 @@ STATIC mp_obj_t enumerate_iternext(mp_obj_t self_in) {
         return mp_obj_new_tuple(2, items);
     }
 }
+
+#endif // MICROPY_PY_BUILTINS_ENUMERATE
diff --git a/unix/mpconfigport_minimal.h b/unix/mpconfigport_minimal.h
@@ -48,6 +48,7 @@
 #define MICROPY_PY_BUILTINS_BYTEARRAY (0)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
 #define MICROPY_PY_BUILTINS_COMPILE (0)
+#define MICROPY_PY_BUILTINS_ENUMERATE (0)
 #define MICROPY_PY_BUILTINS_FROZENSET (0)
 #define MICROPY_PY_BUILTINS_SET     (0)
 #define MICROPY_PY_BUILTINS_SLICE   (0)

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`
`30`	`30`	`#include "py/runtime.h"`
`31`	`31`
	`32`	`+#if MICROPY_PY_BUILTINS_ENUMERATE`
	`33`	`+`
`32`	`34`	`typedef struct _mp_obj_enumerate_t {`
`33`	`35`	`mp_obj_base_t base;`
`34`	`36`	`mp_obj_t iter;`
`@@ -83,3 +85,5 @@ STATIC mp_obj_t enumerate_iternext(mp_obj_t self_in) {`
`83`	`85`	`return mp_obj_new_tuple(2, items);`
`84`	`86`	`}`
`85`	`87`	`}`
	`88`	`+`
	`89`	`+#endif // MICROPY_PY_BUILTINS_ENUMERATE`