Changeset 6353 for src/Pugs/Prim/Keyed.hs

Timestamp:

08/19/05 11:26:00 (3 years ago)

Author:

luqui

svk:copy_cache_prev:

8581

Message:

r204@feather: fibonaci | 2005-08-19 11:24:40 +0200
Okay, actually fixed the sub {1}.pairs bug this time... I hope.

Files:

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

src/Pugs/Prim/Keyed.hs

@@ -22 +22 @@
     elems   <- mapM (hash_fetchElem sv) keys
     return $ map (VRef . MkRef . IPair) (keys `zip` elems)
-pairsFromVal v = do
-    ref  <- fromVal v
-    vals <- pairsFromRef ref
-    return vals
+pairsFromVal (VRef ref) = pairsFromRef ref
+pairsFromVal v = retError "Not a keyed reference" v
 
 keysFromVal :: Val -> Eval Val
@@ -59 +57 @@
     keys    <- hash_fetchKeys hv
     elems   <- mapM (hash_fetchElem hv) keys
-    --return $ map (VRef . MkRef . IPair) (keys `zip` elems)
     return $ map (VRef . MkRef . IPair) (keys `zip` elems)
 pairsFromRef (MkRef (IArray av)) = do
     vals    <- array_fetch av
     return $ map castV ((map VInt [0..]) `zip` vals)
+pairsFromRef (MkRef (IScalar sv)) = do
+    refVal  <- scalar_fetch' sv
+    pairsFromVal refVal
 pairsFromRef ref = retError "Not a keyed reference" ref