1 files changed, 12 insertions, 1 deletions
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index c93204bc..e529d56f 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -345,10 +345,21 @@ removeLeave! x == walkWith!(x,function f) where
     x is ['%leave,.,y] and y is ['%return,:.] => resetTo(x,y)
     x
 
+freeIteratorFirstValues iters ==
+  [u for it in iters | u := f it] where
+    f it ==
+      it is ['STEP,['%free,:id],lo,:.] => ['%LET,id,lo]
+      it is ['ON,['%free,:id],l] => ['%LET,id,l]
+      nil
+
 cleanLoop! x == prefixWalk!(x,function f) where
   f x ==
     x is ['%scope,tag,['%repeat,:itl,body,val]] =>
-      resetTo(x,f ['%repeat,:itl,g(body,tag),g(val,tag)])
+      body := g(body,tag)
+      val := g(val,tag)
+      firstVals := freeIteratorFirstValues itl =>
+        resetTo(x,mkSeq [:firstVals,f ['%repeat,:itl,body,val]])
+      resetTo(x,f ['%repeat,:itl,body,val])
     x
   g(x,tag) ==
     atomic? x => x