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

Timestamp:

05/15/06 21:26:00 (3 years ago)

Author:

gaal

Message:

r10423@sike: roo | 2006-05-15 21:52:25 +0300

• parse and honor [\] metaoperator
• produce builtin
• update tests

Files:

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

src/Pugs/Prim/List.hs

@@ -156 +156 @@
             if cond then return . VBool $ cond else elemByM eq y xs
 
-op2ReduceL :: Val -> Val -> Eval Val
-op2ReduceL sub@(VCode _) list = op2ReduceL list sub
-op2ReduceL list sub = do
+op2ReduceL :: Bool -> Val -> Val -> Eval Val
+op2ReduceL keep sub@(VCode _) list = op2ReduceL keep list sub
+op2ReduceL keep list sub = do
     code <- fromVal sub
-    op2Reduce list $ VCode code{ subAssoc = "left" }
-
-op2Reduce :: Val -> Val -> Eval Val
-op2Reduce sub@(VCode _) list = op2Reduce list sub
-op2Reduce list sub = do
+    op2Reduce keep list $ VCode code{ subAssoc = "left" }
+
+op2Reduce :: Bool -> Val -> Val -> Eval Val
+op2Reduce keep sub@(VCode _) list = op2Reduce keep list sub
+op2Reduce keep list sub = do
     code <- fromVal sub
     args <- fromVal list
     -- cxt  <- asks envContext
-    let (reduceM, reduceMn) = (foldM, foldMn) -- getReduceFuncs cxt
+    let (reduceM, reduceMn) = if keep then (scanM, scanMn) else (foldM, foldMn)
     let arity = length $ subParams code
     if arity < 2 then fail "Cannot reduce() using a unary or nullary function." else do
@@ -215 +215 @@
             rest <- fromVal =<< scanM f fqx xs
             return $ VList (q:rest)
-    getReduceFuncs cxt = case cxt of
-        CxtSlurpy _ -> (scanM, scanMn)
-        _           -> (foldM, foldMn)
 
 op2Grep :: Val -> Val -> Eval Val