Changeset 16384 for src/Pugs/Prim/List.hs

Timestamp:

05/17/07 23:45:31 (18 months ago)

Author:

audreyt

Message:

* &map into a nullary block should still consume the list.

Files:

• src/Pugs/Prim/List.hs (modified) (2 diffs)

src/Pugs/Prim/List.hs

@@ -335 +335 @@
     args  <- fromVal list
     arity <- fmap (length . subParams) (fromVal sub)
-    evl  <- asks envEval
-    vals <- mapMn args arity $ \x -> do
+    evl   <- asks envEval
+    vals  <- mapMn args arity $ \x -> do
         rv  <- local (\e -> e{ envContext = cxtSlurpyAny }) $ do
             evl (App (Val sub) Nothing (map Val x))
@@ -344 +344 @@
     -- Takes a list, an arity, and a function.
     mapMn           :: [Val] -> Int -> ([Val] -> Eval [Val]) -> Eval [Val]
+    mapMn list 0 f   = fmap concat (mapM (const $ f []) list)
     mapMn list n f   = mapMn' (list2LoL n list) f
     -- Takes a LoL and a function and applies the function to the inputlist.