Changeset 6351

Timestamp:

08/19/05 10:19:39 (3 years ago)

Author:

luqui

svk:copy_cache_prev:

8581

Message:

r200@feather: fibonaci | 2005-08-19 10:18:41 +0200
Fixed the infinite loop on sub { 1 }.pairs. I did it by removing the IScalar
case on pairsFromRef, so that might have broken something. But that case seemed
to violate the new zer deref semantics.

Files:

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

src/Pugs/Prim/Keyed.hs

@@ -14 +14 @@
 import qualified Data.Map as Map
 import qualified Data.Set as Set
+import Debug.Trace
 
 pairsFromVal :: Val -> Eval [Val]
@@ -59 +60 @@
     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