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

Timestamp:

07/17/06 18:46:52 (2 years ago)

Author:

cjeris

Message:

Make hyperops distribute into lists, sort of: they propagate down into lists now, but references
are forcibly dereferenced, which is wrong.

Files:

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

src/Pugs/Prim/List.hs

@@ -316 +316 @@
         | VRef x' <- x
         = doHyper =<< readRef x'
+        | VList x' <- x
+        = op1HyperPrefix sub x
         | otherwise
         = enterEvalContext cxtItemAny $ App (Val $ VCode sub) Nothing [Val x]
@@ -344 +346 @@
     = fail "Hyper OP only works on lists"
     where
-    doHyper x y = enterEvalContext cxtItemAny $ App (Val $ VCode sub) Nothing [Val x, Val y]
+    doHyper x y 
+        | VRef x' <- x, VRef y' <- y
+        = join $ liftM2 doHyper (readRef x') (readRef y')
+        | VRef x' <- x
+        = (flip doHyper $ y) =<< readRef x'
+        | VRef y' <- y
+        = doHyper x =<< readRef y'
+        | VList x' <- x
+        = op2Hyper sub x y
+        | VList y' <- y
+        = op2Hyper sub x y
+        | otherwise
+        = enterEvalContext cxtItemAny $ App (Val $ VCode sub) Nothing [Val x, Val y]
     hyperLists [] [] = return []
     hyperLists xs [] = return xs