commit 33ac0fd09f15377f571c3d2455802cf7a8ac09a8
author Damien George <damien.p.george@gmail.com> Tue Dec 08 21:05:14 2015 +0000
committer Damien George <damien.p.george@gmail.com> Tue Dec 08 21:05:14 2015 +0000
tree 48ed1a0c11a2fdc8c2256b5f42a6b38eede9301b
parent bbe2e22fcb3bf83b03ad25856e29995987e1fc40

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

Addresses issue #1693.

py/compile.c

diff --git a/py/compile.c b/py/compile.c
index 5c2fce6..841b8f9 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1421,6 +1421,19 @@
                         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]);