TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py: Don't try to optimise for+range when args are not simple expressions.

Browse Source 
Addresses issue #1693.
This commit is contained in:
Damien George
2015-12-08 21:05:14 +00:00
parent bbe2e22fcb
commit 33ac0fd09f
2 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
py/compile.c
View File

@@ -1421,6 +1421,19 @@ STATIC void compile_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
optimize = false;
}
}
// arguments must be able to be compiled as standard expressions
if (optimize && MP_PARSE_NODE_IS_STRUCT(pn_range_start)) {
int k = MP_PARSE_NODE_STRUCT_KIND((mp_parse_node_struct_t*)pn_range_start);
if (k == PN_arglist_star || k == PN_arglist_dbl_star || k == PN_argument) {
optimize = false;
}
}
if (optimize && MP_PARSE_NODE_IS_STRUCT(pn_range_end)) {
int k = MP_PARSE_NODE_STRUCT_KIND((mp_parse_node_struct_t*)pn_range_end);
if (k == PN_arglist_star || k == PN_arglist_dbl_star || k == PN_argument) {
optimize = false;
}
}
}
if (optimize) {
compile_for_stmt_optimised_range(comp, pns->nodes[0], pn_range_start, pn_range_end, pn_range_step, pns->nodes[2], pns->nodes[3]);