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

Timestamp:

10/06/06 06:20:13 (2 years ago)

Author:

audreyt

Message:

* Fix t/xx-uncategorized/pair_in_array.t - A single pair

in slurpy context does _not_ flatten into a Seq of two
elements after all.

Files:

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

src/Pugs/Prim/List.hs

@@ -290 +290 @@
 op2Grep :: Val -> Val -> Eval Val
 op2Grep sub@(VCode _) list = op2Grep list sub
-op2Grep (VList [v@(VRef _)]) sub = op2Grep v sub
+-- op2Grep (VList [v@(VRef (MkRef IArray{}))]) sub = op2Grep v sub
+-- op2Grep (VList [v@(VRef (MkRef IHash{}))]) sub = op2Grep v sub
 op2Grep list sub = do
     args <- fromVal list
@@ -302 +303 @@
 op2Map :: Val -> Val -> Eval Val
 op2Map sub@(VCode _) list = op2Map list sub
-op2Map (VList [v@(VRef _)]) sub = op2Map v sub
+-- op2Map (VList [v@(VRef (MkRef IArray{}))]) sub = op2Map v sub
+-- op2Map (VList [v@(VRef (MkRef IHash{}))]) sub = op2Map v sub
 op2Map list sub = do
     args  <- fromVal list
-    arity <- fmap length $ (fromVal sub >>= return . subParams)
+    arity <- fmap (length . subParams) (fromVal sub)
     evl  <- asks envEval
     vals <- mapMn args arity $ \x -> do
@@ -342 +344 @@
 
 op2Join :: Val -> Val -> Eval Val
-op2Join (VList [x@(VRef _)]) y = op2Join x y
+-- op2Join (VList [x@(VRef _)]) y = op2Join x y
 op2Join x y = do
     (strVal, listVal) <- ifValTypeIsa x "Scalar"