py: Add MICROPY_ENABLE_DOC_STRING, disabled by default.

dpgeorge · dpgeorge · commit 1463c1fa82e9 · 2014-04-25T23:52:57.000+01:00
Also add a few STATIC's to some compile functions that should have them. Addresses issue micropython#521.
diff --git a/py/compile.c b/py/compile.c
@@ -91,7 +91,7 @@ STATIC const mp_map_t mp_constants_map = {
     .table = (mp_map_elem_t*)mp_constants_table,
 };
 
-mp_parse_node_t fold_constants(mp_parse_node_t pn) {
+STATIC mp_parse_node_t fold_constants(mp_parse_node_t pn) {
     if (MP_PARSE_NODE_IS_STRUCT(pn)) {
         mp_parse_node_struct_t *pns = (mp_parse_node_struct_t*)pn;
         int n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
@@ -2923,7 +2923,8 @@ void compile_scope_comp_iter(compiler_t *comp, mp_parse_node_t pn_iter, mp_parse
     }
 }
 
-void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {
+STATIC void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {
+#if MICROPY_EMIT_CPYTHON || MICROPY_ENABLE_DOC_STRING
     // see http://www.python.org/dev/peps/pep-0257/
 
     // look for the first statement
@@ -2960,9 +2961,10 @@ void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {
             }
         }
     }
+#endif
 }
 
-void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
+STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
     comp->pass = pass;
     comp->scope_cur = scope;
     comp->next_label = 1;
@@ -3117,7 +3119,7 @@ void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
 }
 
 #if MICROPY_EMIT_INLINE_THUMB
-void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
+STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
     comp->pass = pass;
     comp->scope_cur = scope;
     comp->next_label = 1;
@@ -3232,7 +3234,7 @@ void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind_t pass
 }
 #endif
 
-void compile_scope_compute_things(compiler_t *comp, scope_t *scope) {
+STATIC void compile_scope_compute_things(compiler_t *comp, scope_t *scope) {
     // in functions, turn implicit globals into explicit globals
     // compute the index of each local
     scope->num_locals = 0;
diff --git a/py/mpconfig.h b/py/mpconfig.h
@@ -89,6 +89,11 @@ typedef long long mp_longint_impl_t;
 #define MICROPY_ENABLE_SOURCE_LINE (0)
 #endif
 
+// Whether to include doc strings (increases RAM usage)
+#ifndef MICROPY_ENABLE_DOC_STRING
+#define MICROPY_ENABLE_DOC_STRING (0)
+#endif
+
 // Float and complex implementation
 #define MICROPY_FLOAT_IMPL_NONE (0)
 #define MICROPY_FLOAT_IMPL_FLOAT (1)

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ STATIC const mp_map_t mp_constants_map = {`
`91`	`91`	`.table = (mp_map_elem_t*)mp_constants_table,`
`92`	`92`	`};`
`93`	`93`
`94`		`-mp_parse_node_t fold_constants(mp_parse_node_t pn) {`
	`94`	`+STATIC mp_parse_node_t fold_constants(mp_parse_node_t pn) {`
`95`	`95`	`if (MP_PARSE_NODE_IS_STRUCT(pn)) {`
`96`	`96`	`mp_parse_node_struct_t pns = (mp_parse_node_struct_t)pn;`
`97`	`97`	`int n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);`
`@@ -2923,7 +2923,8 @@ void compile_scope_comp_iter(compiler_t *comp, mp_parse_node_t pn_iter, mp_parse`
`2923`	`2923`	`}`
2924	`2924`	`}`
`2925`	`2925`
`2926`		`-void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {`
	`2926`	`+STATIC void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {`
	`2927`	`+#if MICROPY_EMIT_CPYTHON \|\| MICROPY_ENABLE_DOC_STRING`
`2927`	`2928`	`// see http://www.python.org/dev/peps/pep-0257/`
`2928`	`2929`
`2929`	`2930`	`// look for the first statement`
`@@ -2960,9 +2961,10 @@ void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {`
`2960`	`2961`	`}`
`2961`	`2962`	`}`
`2962`	`2963`	`}`
	`2964`	`+#endif`
`2963`	`2965`	`}`
`2964`	`2966`
`2965`		`-void compile_scope(compiler_t comp, scope_t scope, pass_kind_t pass) {`
	`2967`	`+STATIC void compile_scope(compiler_t comp, scope_t scope, pass_kind_t pass) {`
`2966`	`2968`	`comp->pass = pass;`
`2967`	`2969`	`comp->scope_cur = scope;`
`2968`	`2970`	`comp->next_label = 1;`
`@@ -3117,7 +3119,7 @@ void compile_scope(compiler_t comp, scope_t scope, pass_kind_t pass) {`
`3117`	`3119`	`}`
`3118`	`3120`
`3119`	`3121`	`#if MICROPY_EMIT_INLINE_THUMB`
`3120`		`-void compile_scope_inline_asm(compiler_t comp, scope_t scope, pass_kind_t pass) {`
	`3122`	`+STATIC void compile_scope_inline_asm(compiler_t comp, scope_t scope, pass_kind_t pass) {`
`3121`	`3123`	`comp->pass = pass;`
`3122`	`3124`	`comp->scope_cur = scope;`
`3123`	`3125`	`comp->next_label = 1;`
`@@ -3232,7 +3234,7 @@ void compile_scope_inline_asm(compiler_t comp, scope_t scope, pass_kind_t pass`
`3232`	`3234`	`}`
`3233`	`3235`	`#endif`
`3234`	`3236`
`3235`		`-void compile_scope_compute_things(compiler_t comp, scope_t scope) {`
	`3237`	`+STATIC void compile_scope_compute_things(compiler_t comp, scope_t scope) {`
`3236`	`3238`	`// in functions, turn implicit globals into explicit globals`
`3237`	`3239`	`// compute the index of each local`
`3238`	`3240`	`scope->num_locals = 0;`