commit e37dcaafb43c1246ab55d79ebb8889a61f280533
author Damien George <damien.p.george@gmail.com> Sat Dec 27 17:07:16 2014 +0000
committer Damien George <damien.p.george@gmail.com> Sat Dec 27 17:33:30 2014 +0000
tree 79b86304793ac4d2396c7bc8a24209459e3eaf1a
parent 3b74c91684e6dfc785bf33ba03e520470f59059e

py: Allow to properly disable builtin "set" object.

This patch makes MICROPY_PY_BUILTINS_SET compile-time option fully
disable the builtin set object (when set to 0).  This includes removing
set constructor/comprehension from the grammar, the compiler and the
emitters.  Now, enabling set costs 8168 bytes on unix x64, and 3576
bytes on stmhal.

py/compile.c

diff --git a/py/compile.c b/py/compile.c
index 7cecf27..25bf64e 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2761,7 +2761,7 @@
 
                 // first element sets whether it's a dict or set
                 bool is_dict;
-                if (MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[0], PN_dictorsetmaker_item)) {
+                if (!MICROPY_PY_BUILTINS_SET || MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[0], PN_dictorsetmaker_item)) {
                     // a dictionary
                     EMIT_ARG(build_map, 1 + n);
                     compile_node(comp, pns->nodes[0]);
@@ -2792,13 +2792,15 @@
                     }
                 }
 
+                #if MICROPY_PY_BUILTINS_SET
                 // if it's a set, build it
                 if (!is_dict) {
                     EMIT_ARG(build_set, 1 + n);
                 }
+                #endif
             } else if (MP_PARSE_NODE_STRUCT_KIND(pns1) == PN_comp_for) {
                 // dict/set comprehension
-                if (MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[0], PN_dictorsetmaker_item)) {
+                if (!MICROPY_PY_BUILTINS_SET || MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[0], PN_dictorsetmaker_item)) {
                     // a dictionary comprehension
                     compile_comprehension(comp, pns, SCOPE_DICT_COMP);
                 } else {
@@ -2816,8 +2818,12 @@
     } else {
         // set with one element
         set_with_one_element:
+        #if MICROPY_PY_BUILTINS_SET
         compile_node(comp, pn);
         EMIT_ARG(build_set, 1);
+        #else
+        assert(0);
+        #endif
     }
 }
 
@@ -3111,8 +3117,10 @@
             EMIT_ARG(list_append, for_depth + 2);
         } else if (comp->scope_cur->kind == SCOPE_DICT_COMP) {
             EMIT_ARG(map_add, for_depth + 2);
+        #if MICROPY_PY_BUILTINS_SET
         } else if (comp->scope_cur->kind == SCOPE_SET_COMP) {
             EMIT_ARG(set_add, for_depth + 2);
+        #endif
         } else {
             EMIT(yield_value);
             EMIT(pop_top);
@@ -3305,8 +3313,10 @@
             EMIT_ARG(build_list, 0);
         } else if (scope->kind == SCOPE_DICT_COMP) {
             EMIT_ARG(build_map, 0);
+        #if MICROPY_PY_BUILTINS_SET
         } else if (scope->kind == SCOPE_SET_COMP) {
             EMIT_ARG(build_set, 0);
+        #endif
         }
 
         uint l_end = comp_next_label(comp);