Skip to content

Commit 50912e7

Browse files
dpgeorgedpgeorge
committed
py, unix, stmhal: Allow to compile with -Wshadow.
See issue adafruit#699.
1 parent 640e0b2 commit 50912e7

File tree

13 files changed

+139
-137
lines changed

13 files changed

+139
-137
lines changed

‎py/argcheck.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ void mp_arg_parse_all(mp_uint_t n_pos, const mp_obj_t *pos, mp_map_t *kws, mp_ui
8484
pos_found++;
8585
given_arg = pos[i];
8686
} else {
87-
mp_map_elem_t *kw = mp_map_lookup(kws, MP_OBJ_NEW_QSTR(allowed[i].qstr), MP_MAP_LOOKUP);
87+
mp_map_elem_t *kw = mp_map_lookup(kws, MP_OBJ_NEW_QSTR(allowed[i].qst), MP_MAP_LOOKUP);
8888
if (kw == NULL) {
8989
if (allowed[i].flags & MP_ARG_REQUIRED) {
9090
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
9191
mp_arg_error_terse_mismatch();
9292
} else {
9393
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
9494
"'%s' argument required",
95-
qstr_str(allowed[i].qstr)));
95+
qstr_str(allowed[i].qst)));
9696
}
9797
}
9898
out_vals[i] = allowed[i].defval;

‎py/compile.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,9 +1229,9 @@ STATIC void compile_decorated(compiler_t *comp, mp_parse_node_struct_t *pns) {
12291229

12301230
// compile the decorator function
12311231
compile_node(comp, name_nodes[0]);
1232-
for (int i = 1; i < name_len; i++) {
1233-
assert(MP_PARSE_NODE_IS_ID(name_nodes[i])); // should be
1234-
EMIT_ARG(load_attr, MP_PARSE_NODE_LEAF_ARG(name_nodes[i]));
1232+
for (int j = 1; j < name_len; j++) {
1233+
assert(MP_PARSE_NODE_IS_ID(name_nodes[j])); // should be
1234+
EMIT_ARG(load_attr, MP_PARSE_NODE_LEAF_ARG(name_nodes[j]));
12351235
}
12361236

12371237
// nodes[1] contains arguments to the decorator function, if any
@@ -2778,9 +2778,9 @@ STATIC void compile_atom_brace(compiler_t *comp, mp_parse_node_struct_t *pns) {
27782778

27792779
// process rest of elements
27802780
for (int i = 0; i < n; i++) {
2781-
mp_parse_node_t pn = nodes[i];
2782-
bool is_key_value = MP_PARSE_NODE_IS_STRUCT_KIND(pn, PN_dictorsetmaker_item);
2783-
compile_node(comp, pn);
2781+
mp_parse_node_t pn_i = nodes[i];
2782+
bool is_key_value = MP_PARSE_NODE_IS_STRUCT_KIND(pn_i, PN_dictorsetmaker_item);
2783+
compile_node(comp, pn_i);
27842784
if (is_dict) {
27852785
if (!is_key_value) {
27862786
compile_syntax_error(comp, (mp_parse_node_t)pns, "expecting key:value for dictionary");
@@ -3489,12 +3489,12 @@ STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind
34893489
}
34903490
if (pass > MP_PASS_SCOPE) {
34913491
mp_int_t bytesize = MP_PARSE_NODE_LEAF_SMALL_INT(pn_arg[0]);
3492-
for (uint i = 1; i < n_args; i++) {
3493-
if (!MP_PARSE_NODE_IS_SMALL_INT(pn_arg[i])) {
3492+
for (uint j = 1; j < n_args; j++) {
3493+
if (!MP_PARSE_NODE_IS_SMALL_INT(pn_arg[j])) {
34943494
compile_syntax_error(comp, nodes[i], "inline assembler 'data' requires integer arguments");
34953495
return;
34963496
}
3497-
EMIT_INLINE_ASM_ARG(data, bytesize, MP_PARSE_NODE_LEAF_SMALL_INT(pn_arg[i]));
3497+
EMIT_INLINE_ASM_ARG(data, bytesize, MP_PARSE_NODE_LEAF_SMALL_INT(pn_arg[j]));
34983498
}
34993499
}
35003500
} else {

‎py/objmodule.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,6 @@ mp_obj_t mp_module_get(qstr module_name) {
215215
return el->value;
216216
}
217217

218-
void mp_module_register(qstr qstr, mp_obj_t module) {
219-
mp_map_lookup(&MP_STATE_VM(mp_loaded_modules_map), MP_OBJ_NEW_QSTR(qstr), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
218+
void mp_module_register(qstr qst, mp_obj_t module) {
219+
mp_map_lookup(&MP_STATE_VM(mp_loaded_modules_map), MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
220220
}

‎py/objstr.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,15 +1243,15 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwa
12431243
break;
12441244

12451245
case 's': {
1246-
mp_uint_t len;
1247-
const char *s = mp_obj_str_get_data(arg, &len);
1246+
mp_uint_t slen;
1247+
const char *s = mp_obj_str_get_data(arg, &slen);
12481248
if (precision < 0) {
1249-
precision = len;
1249+
precision = slen;
12501250
}
1251-
if (len > (mp_uint_t)precision) {
1252-
len = precision;
1251+
if (slen > (mp_uint_t)precision) {
1252+
slen = precision;
12531253
}
1254-
pfenv_print_strn(&pfenv_vstr, s, len, flags, fill, width);
1254+
pfenv_print_strn(&pfenv_vstr, s, slen, flags, fill, width);
12551255
break;
12561256
}
12571257

@@ -1379,9 +1379,9 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, mp_uint_t n_args, const mp_o
13791379
switch (*str) {
13801380
case 'c':
13811381
if (MP_OBJ_IS_STR(arg)) {
1382-
mp_uint_t len;
1383-
const char *s = mp_obj_str_get_data(arg, &len);
1384-
if (len != 1) {
1382+
mp_uint_t slen;
1383+
const char *s = mp_obj_str_get_data(arg, &slen);
1384+
if (slen != 1) {
13851385
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
13861386
"%%c requires int or char"));
13871387
}
@@ -1425,14 +1425,14 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, mp_uint_t n_args, const mp_o
14251425
vstr_t *arg_vstr = vstr_new();
14261426
mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf,
14271427
arg_vstr, arg, *str == 'r' ? PRINT_REPR : PRINT_STR);
1428-
uint len = vstr_len(arg_vstr);
1428+
uint vlen = vstr_len(arg_vstr);
14291429
if (prec < 0) {
1430-
prec = len;
1430+
prec = vlen;
14311431
}
1432-
if (len > (uint)prec) {
1433-
len = prec;
1432+
if (vlen > (uint)prec) {
1433+
vlen = prec;
14341434
}
1435-
pfenv_print_strn(&pfenv_vstr, vstr_str(arg_vstr), len, flags, ' ', width);
1435+
pfenv_print_strn(&pfenv_vstr, vstr_str(arg_vstr), vlen, flags, ' ', width);
14361436
vstr_free(arg_vstr);
14371437
break;
14381438
}

‎py/parse.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,12 @@ STATIC void push_result_node(parser_t *parser, mp_parse_node_t pn) {
273273
return;
274274
}
275275
if (parser->result_stack_top >= parser->result_stack_alloc) {
276-
mp_parse_node_t *pn = m_renew_maybe(mp_parse_node_t, parser->result_stack, parser->result_stack_alloc, parser->result_stack_alloc + MICROPY_ALLOC_PARSE_RESULT_INC);
277-
if (pn == NULL) {
276+
mp_parse_node_t *stack = m_renew_maybe(mp_parse_node_t, parser->result_stack, parser->result_stack_alloc, parser->result_stack_alloc + MICROPY_ALLOC_PARSE_RESULT_INC);
277+
if (stack == NULL) {
278278
memory_error(parser);
279279
return;
280280
}
281-
parser->result_stack = pn;
281+
parser->result_stack = stack;
282282
parser->result_stack_alloc += MICROPY_ALLOC_PARSE_RESULT_INC;
283283
}
284284
parser->result_stack[parser->result_stack_top++] = pn;

‎py/runtime.c‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -104,67 +104,67 @@ void mp_deinit(void) {
104104
#endif
105105
}
106106

107-
mp_obj_t mp_load_const_int(qstr qstr) {
108-
DEBUG_OP_printf("load '%s'\n", qstr_str(qstr));
107+
mp_obj_t mp_load_const_int(qstr qst) {
108+
DEBUG_OP_printf("load '%s'\n", qstr_str(qst));
109109
mp_uint_t len;
110-
const byte* data = qstr_data(qstr, &len);
110+
const byte* data = qstr_data(qst, &len);
111111
return mp_parse_num_integer((const char*)data, len, 0);
112112
}
113113

114-
mp_obj_t mp_load_const_dec(qstr qstr) {
115-
DEBUG_OP_printf("load '%s'\n", qstr_str(qstr));
114+
mp_obj_t mp_load_const_dec(qstr qst) {
115+
DEBUG_OP_printf("load '%s'\n", qstr_str(qst));
116116
mp_uint_t len;
117-
const byte* data = qstr_data(qstr, &len);
117+
const byte* data = qstr_data(qst, &len);
118118
return mp_parse_num_decimal((const char*)data, len, true, false);
119119
}
120120

121-
mp_obj_t mp_load_const_str(qstr qstr) {
122-
DEBUG_OP_printf("load '%s'\n", qstr_str(qstr));
123-
return MP_OBJ_NEW_QSTR(qstr);
121+
mp_obj_t mp_load_const_str(qstr qst) {
122+
DEBUG_OP_printf("load '%s'\n", qstr_str(qst));
123+
return MP_OBJ_NEW_QSTR(qst);
124124
}
125125

126-
mp_obj_t mp_load_const_bytes(qstr qstr) {
127-
DEBUG_OP_printf("load b'%s'\n", qstr_str(qstr));
126+
mp_obj_t mp_load_const_bytes(qstr qst) {
127+
DEBUG_OP_printf("load b'%s'\n", qstr_str(qst));
128128
mp_uint_t len;
129-
const byte *data = qstr_data(qstr, &len);
129+
const byte *data = qstr_data(qst, &len);
130130
return mp_obj_new_bytes(data, len);
131131
}
132132

133-
mp_obj_t mp_load_name(qstr qstr) {
133+
mp_obj_t mp_load_name(qstr qst) {
134134
// logic: search locals, globals, builtins
135-
DEBUG_OP_printf("load name %s\n", qstr_str(qstr));
135+
DEBUG_OP_printf("load name %s\n", qstr_str(qst));
136136
// If we're at the outer scope (locals == globals), dispatch to load_global right away
137137
if (MP_STATE_CTX(dict_locals) != MP_STATE_CTX(dict_globals)) {
138-
mp_map_elem_t *elem = mp_map_lookup(&MP_STATE_CTX(dict_locals)->map, MP_OBJ_NEW_QSTR(qstr), MP_MAP_LOOKUP);
138+
mp_map_elem_t *elem = mp_map_lookup(&MP_STATE_CTX(dict_locals)->map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
139139
if (elem != NULL) {
140140
return elem->value;
141141
}
142142
}
143-
return mp_load_global(qstr);
143+
return mp_load_global(qst);
144144
}
145145

146-
mp_obj_t mp_load_global(qstr qstr) {
146+
mp_obj_t mp_load_global(qstr qst) {
147147
// logic: search globals, builtins
148-
DEBUG_OP_printf("load global %s\n", qstr_str(qstr));
149-
mp_map_elem_t *elem = mp_map_lookup(&MP_STATE_CTX(dict_globals)->map, MP_OBJ_NEW_QSTR(qstr), MP_MAP_LOOKUP);
148+
DEBUG_OP_printf("load global %s\n", qstr_str(qst));
149+
mp_map_elem_t *elem = mp_map_lookup(&MP_STATE_CTX(dict_globals)->map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
150150
if (elem == NULL) {
151151
#if MICROPY_CAN_OVERRIDE_BUILTINS
152152
if (MP_STATE_VM(mp_module_builtins_override_dict) != NULL) {
153153
// lookup in additional dynamic table of builtins first
154-
elem = mp_map_lookup(&MP_STATE_VM(mp_module_builtins_override_dict)->map, MP_OBJ_NEW_QSTR(qstr), MP_MAP_LOOKUP);
154+
elem = mp_map_lookup(&MP_STATE_VM(mp_module_builtins_override_dict)->map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
155155
if (elem != NULL) {
156156
return elem->value;
157157
}
158158
}
159159
#endif
160-
elem = mp_map_lookup((mp_map_t*)&mp_module_builtins_globals.map, MP_OBJ_NEW_QSTR(qstr), MP_MAP_LOOKUP);
160+
elem = mp_map_lookup((mp_map_t*)&mp_module_builtins_globals.map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
161161
if (elem == NULL) {
162162
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
163163
nlr_raise(mp_obj_new_exception_msg(&mp_type_NameError,
164164
"name not defined"));
165165
} else {
166166
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_NameError,
167-
"name '%s' is not defined", qstr_str(qstr)));
167+
"name '%s' is not defined", qstr_str(qst)));
168168
}
169169
}
170170
}
@@ -185,26 +185,26 @@ mp_obj_t mp_load_build_class(void) {
185185
return (mp_obj_t)&mp_builtin___build_class___obj;
186186
}
187187

188-
void mp_store_name(qstr qstr, mp_obj_t obj) {
189-
DEBUG_OP_printf("store name %s <- %p\n", qstr_str(qstr), obj);
190-
mp_obj_dict_store(MP_STATE_CTX(dict_locals), MP_OBJ_NEW_QSTR(qstr), obj);
188+
void mp_store_name(qstr qst, mp_obj_t obj) {
189+
DEBUG_OP_printf("store name %s <- %p\n", qstr_str(qst), obj);
190+
mp_obj_dict_store(MP_STATE_CTX(dict_locals), MP_OBJ_NEW_QSTR(qst), obj);
191191
}
192192

193-
void mp_delete_name(qstr qstr) {
194-
DEBUG_OP_printf("delete name %s\n", qstr_str(qstr));
195-
// TODO convert KeyError to NameError if qstr not found
196-
mp_obj_dict_delete(MP_STATE_CTX(dict_locals), MP_OBJ_NEW_QSTR(qstr));
193+
void mp_delete_name(qstr qst) {
194+
DEBUG_OP_printf("delete name %s\n", qstr_str(qst));
195+
// TODO convert KeyError to NameError if qst not found
196+
mp_obj_dict_delete(MP_STATE_CTX(dict_locals), MP_OBJ_NEW_QSTR(qst));
197197
}
198198

199-
void mp_store_global(qstr qstr, mp_obj_t obj) {
200-
DEBUG_OP_printf("store global %s <- %p\n", qstr_str(qstr), obj);
201-
mp_obj_dict_store(MP_STATE_CTX(dict_globals), MP_OBJ_NEW_QSTR(qstr), obj);
199+
void mp_store_global(qstr qst, mp_obj_t obj) {
200+
DEBUG_OP_printf("store global %s <- %p\n", qstr_str(qst), obj);
201+
mp_obj_dict_store(MP_STATE_CTX(dict_globals), MP_OBJ_NEW_QSTR(qst), obj);
202202
}
203203

204-
void mp_delete_global(qstr qstr) {
205-
DEBUG_OP_printf("delete global %s\n", qstr_str(qstr));
206-
// TODO convert KeyError to NameError if qstr not found
207-
mp_obj_dict_delete(MP_STATE_CTX(dict_globals), MP_OBJ_NEW_QSTR(qstr));
204+
void mp_delete_global(qstr qst) {
205+
DEBUG_OP_printf("delete global %s\n", qstr_str(qst));
206+
// TODO convert KeyError to NameError if qst not found
207+
mp_obj_dict_delete(MP_STATE_CTX(dict_globals), MP_OBJ_NEW_QSTR(qst));
208208
}
209209

210210
mp_obj_t mp_unary_op(mp_uint_t op, mp_obj_t arg) {

‎py/runtime.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ typedef union _mp_arg_val_t {
5151
} mp_arg_val_t;
5252

5353
typedef struct _mp_arg_t {
54-
qstr qstr;
54+
qstr qst;
5555
mp_uint_t flags;
5656
mp_arg_val_t defval;
5757
} mp_arg_t;
@@ -70,21 +70,21 @@ static inline void mp_locals_set(mp_obj_dict_t *d) { MP_STATE_CTX(dict_locals) =
7070
static inline mp_obj_dict_t *mp_globals_get(void) { return MP_STATE_CTX(dict_globals); }
7171
static inline void mp_globals_set(mp_obj_dict_t *d) { MP_STATE_CTX(dict_globals) = d; }
7272

73-
mp_obj_t mp_load_name(qstr qstr);
74-
mp_obj_t mp_load_global(qstr qstr);
73+
mp_obj_t mp_load_name(qstr qst);
74+
mp_obj_t mp_load_global(qstr qst);
7575
mp_obj_t mp_load_build_class(void);
76-
void mp_store_name(qstr qstr, mp_obj_t obj);
77-
void mp_store_global(qstr qstr, mp_obj_t obj);
78-
void mp_delete_name(qstr qstr);
79-
void mp_delete_global(qstr qstr);
76+
void mp_store_name(qstr qst, mp_obj_t obj);
77+
void mp_store_global(qstr qst, mp_obj_t obj);
78+
void mp_delete_name(qstr qst);
79+
void mp_delete_global(qstr qst);
8080

8181
mp_obj_t mp_unary_op(mp_uint_t op, mp_obj_t arg);
8282
mp_obj_t mp_binary_op(mp_uint_t op, mp_obj_t lhs, mp_obj_t rhs);
8383

84-
mp_obj_t mp_load_const_int(qstr qstr);
85-
mp_obj_t mp_load_const_dec(qstr qstr);
86-
mp_obj_t mp_load_const_str(qstr qstr);
87-
mp_obj_t mp_load_const_bytes(qstr qstr);
84+
mp_obj_t mp_load_const_int(qstr qst);
85+
mp_obj_t mp_load_const_dec(qstr qst);
86+
mp_obj_t mp_load_const_str(qstr qst);
87+
mp_obj_t mp_load_const_bytes(qstr qst);
8888

8989
mp_obj_t mp_call_function_0(mp_obj_t fun);
9090
mp_obj_t mp_call_function_1(mp_obj_t fun, mp_obj_t arg);

0 commit comments

Comments
 (0)