Changeset 2433 for src/Pugs/Types/Hash.hs

Timestamp:

04/28/05 13:59:35 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

3914

Message:

* STMification: All our IORefs are now TVars.

Files:

• src/Pugs/Types/Hash.hs (modified) (3 diffs)

src/Pugs/Types/Hash.hs

@@ -6 +6 @@
 import Pugs.Internals
 import Pugs.Types
+import qualified Data.Map as Map
 
 type Index = VStr
@@ -16 +17 @@
         keys <- fetchKeys hv
         vals <- mapM (fetchVal hv) keys
-        return $ keys `zip` vals
+        return . Map.fromList $ keys `zip` vals
     store       :: a -> VHash -> Eval ()
     store hv vals = do
         clear hv
-        forM_ vals $ \(key, val) -> do
+        forM_ (Map.assocs vals) $ \(key, val) -> do
             storeVal hv key val
     fetchElem   :: a -> Index -> Eval (IVar VScalar) -- autovivify
@@ -40 +41 @@
     fetchKeys   :: a -> Eval [Index]
     fetchKeys hv = do
-        pairs <- fetch hv
-        return $ map fst pairs
+        vals <- fetch hv
+        return $ Map.keys vals
     deleteElem  :: a -> Index -> Eval ()
     existsElem  :: a -> Index -> Eval VBool