Changeset 3526

Timestamp:

05/20/05 20:10:14 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5107

Message:

* inner take shall not affect outer gather.

Location:

src/Pugs

Files:

• Eval.hs (modified) (1 diff)
• Prim.hs (modified) (2 diffs)

src/Pugs/Eval.hs

@@ -400 +400 @@
                 munge sub = updateSubPad sub symLast
             runBody elms $ munge sub
+    "gather" -> do
+        let [exp] = exps
+        sub     <- fromVal =<< evalExp exp
+        av      <- newArray []
+        symTake <- genSym "@?TAKE" (MkRef av)
+        apply (updateSubPad sub symTake) [] []
+        fmap VList $ readIVar av
     "loop" -> do
         let [pre, cond, post, body] = case exps of { [_] -> exps'; _ -> exps }

src/Pugs/Prim.hs

@@ -28 +28 @@
 import Pugs.Types
 import Pugs.Pretty
-import Pugs.Monads
 import Text.Printf
 import Pugs.External
@@ -464 +463 @@
 op1 "matches" = op1Cast (VList . matchSubPos)
 op1 "gather" = \v -> do
-    av  <- newArray []
     evl <- asks envEval
-    symTake <- genSym "@?TAKE" (MkRef av)
-    enterLex [symTake] $ evl (App (Val v) [] [])
-    fmap VList $ readIVar av
+    evl (Syn "gather" [Val v])
 op1 "Thread::yield" = const $ do
     ok <- tryIO False $ do { yield ; return True }