diff options
| -rw-r--r-- | 6/simp.c | 7 | ||||
| -rw-r--r-- | test/subrangefor.myr | 8 | ||||
| -rw-r--r-- | test/tests | 1 |
3 files changed, 13 insertions, 3 deletions
@@ -505,7 +505,7 @@ static void simploop(Simp *s, Node *n) static void simpiter(Simp *s, Node *n) { Node *lbody, *lstep, *lcond, *lmatch, *lend; - Node *idx, *len, *dcl, *val, *done; + Node *idx, *len, *dcl, *seq, *val, *done; Node *zero; lbody = genlbl(); @@ -517,6 +517,7 @@ static void simpiter(Simp *s, Node *n) zero = mkintlit(n->line, 0); zero->expr.type = tyintptr; + seq = rval(s, n->iterstmt.seq, NULL); idx = gentemp(s, n, tyintptr, &dcl); declarelocal(s, dcl); @@ -531,11 +532,11 @@ static void simpiter(Simp *s, Node *n) simp(s, assign(s, idx, addk(idx, 1))); /* condition */ simp(s, lcond); - len = seqlen(s, n->iterstmt.seq, tyintptr); + len = seqlen(s, seq, tyintptr); done = mkexpr(n->line, Olt, idx, len, NULL); cjmp(s, done, lmatch, lend); simp(s, lmatch); - val = load(idxaddr(s, n->iterstmt.seq, idx)); + val = load(idxaddr(s, seq, idx)); umatch(s, n->iterstmt.elt, val, val->expr.type, lbody, lstep); simp(s, lend); } diff --git a/test/subrangefor.myr b/test/subrangefor.myr new file mode 100644 index 0000000..0a3acc4 --- /dev/null +++ b/test/subrangefor.myr @@ -0,0 +1,8 @@ +use std + +const main = { + for i in [1,2,3,4][:2] + std.put("%i", i) + ;; + std.put("\n") +} @@ -56,6 +56,7 @@ B callbig E 42 B nestfn E 42 # B closure E 55 ## BUGGERED B loop E 45 +B subrangefor P 12 B patiter P 23512 B condiftrue E 7 B condiffalse E 9 |