Changeset 12204 for src/Pugs/Prim/Yaml.hs

Timestamp:

08/14/06 08:21:50 (2 years ago)

Author:

cmarcelo

Message:

* Integrate judy and HsJudy? on Pugs' build process. Make IArray and IHash
use HsJudy?.

Files:

• src/Pugs/Prim/Yaml.hs (modified) (3 diffs)

src/Pugs/Prim/Yaml.hs

@@ -15 +15 @@
 import DrIFT.YAML
 
+import qualified Judy.CollectionsM as C
+import qualified Judy.Hash         as H
+
 evalYaml :: Val -> Eval Val
 evalYaml cv = do
@@ -26 +29 @@
 fromYaml MkNode{n_elem=ESeq nodes} = do
     vals    <- mapM fromYaml nodes
-    av      <- liftSTM $ newTVar $
-        IntMap.fromAscList ([0..] `zip` map lazyScalar vals)
-    return $ VRef (arrayRef av)
+    s       <- liftSTM $ newTVar (0 :: Int)
+    av      <- liftIO $ (C.fromList ([0..] `zip` map lazyScalar vals) :: IO IArray')
+    return $ VRef (arrayRef (av,s))
 fromYaml MkNode{n_elem=EMap nodes, n_tag=tag} = do
     case tag of
@@ -36 +39 @@
                 val <- newScalar =<< fromYaml valNode
                 return (key, val)
-            hv      <- liftSTM $ (newTVar (Map.fromList vals) :: STM IHash)
+            hv      <- liftIO $ (C.fromList vals :: IO IHash)
             return $ VRef (hashRef hv)
         Just s | (pre, post) <- Str.splitAt 16 s   -- 16 == length "tag:pugs:Object:"