Fix recursive gather/take

sorear · Aug 10, 2010 · 6773107 · 6773107
1 parent c11c833
commit 6773107
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Kernel.cs b/Kernel.cs
@@ -424,19 +424,18 @@ public class Kernel {
             }
         }
 
-        public static Frame TakeReturnFrame;
+        public static Stack<Frame> TakeReturnStack = new Stack<Frame>();
 
         public static Frame Take(Frame th, Variable payload) {
-            Frame r = TakeReturnFrame;
-            TakeReturnFrame = null;
+            Frame r = TakeReturnStack.Pop();
             r.lex["$nextframe"] = NewROScalar(th);
             r.resultSlot = payload;
             th.resultSlot = payload;
             return r;
         }
 
         public static Frame CoTake(Frame th, Frame from) {
-            TakeReturnFrame = th;
+            TakeReturnStack.Push(th);
             return from;
         }