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

Timestamp:

04/28/06 14:53:19 (3 years ago)

Author:

audreyt

Message:

* Data.FastPackedString? is now gone.
* Date.ByteString? joins us at third-party/.
* Pugs is now 2x faster on startup!

Files:

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

src/Pugs/Prim/Yaml.hs

@@ -12 +12 @@
 import qualified Data.IntSet as IntSet
 import qualified Data.IntMap as IntMap
-import qualified Data.FastPackedString as Str
+import qualified Data.ByteString as Str
 import DrIFT.YAML
 
@@ -26 +26 @@
 fromYaml :: YamlNode -> Eval Val
 fromYaml MkYamlNode{el=YamlNil}       = return VUndef
-fromYaml MkYamlNode{el=YamlStr str}   = return $ VStr $ decodeUTF8 $ Str.unpack str
+fromYaml MkYamlNode{el=YamlStr str}   = return $ VStr $ decodeUTF8 $ unpackBuf str
 fromYaml MkYamlNode{el=YamlSeq nodes} = do
     vals    <- mapM fromYaml nodes
@@ -42 +42 @@
             return $ VRef (hashRef hv)
         Just s | (pre, post) <- Str.splitAt 16 s   -- 16 == length "tag:pugs:Object:"
-               , pre == Str.pack "tag:pugs:Object:" -> do
-            let typ = Str.unpack post
+               , pre == packBuf "tag:pugs:Object:" -> do
+            let typ = unpackBuf post
             vals    <- forM nodes $ \(keyNode, valNode) -> do
                 key <- fromVal =<< fromYaml keyNode
@@ -49 +49 @@
                 return (key, val)
             return . VObject =<< createObject (mkType typ) vals
-        Just s | s == Str.pack "tag:pugs:Rule" -> do
+        Just s | s == packBuf "tag:pugs:Rule" -> do
             vals    <- forM nodes $ \(keyNode, valNode) -> do
                 key <- fromVal =<< fromYaml keyNode
@@ -63 +63 @@
             adverbs <- Map.lookup "adverbs" spec
             return $ VRule MkRulePGE{rxRule=rule, rxGlobal=global, rxStringify=stringify, rxAdverbs=adverbs}
-        Just x   -> error ("can't deserialize: " ++ (Str.unpack x))
+        Just x   -> error ("can't deserialize: " ++ unpackBuf x)
 
 dumpYaml :: Val -> Eval Val
@@ -74 +74 @@
 
 strNode :: String -> YamlNode
-strNode = mkNode . YamlStr . Str.pack
+strNode = mkNode . YamlStr . packBuf
 
 {-
@@ -109 +109 @@
     hash    <- fromVal v :: Eval VHash
     attrs   <- toYaml $ VRef (hashRef hash)
-    return $ tagNode (Just $ Str.pack $ "tag:pugs:Object:" ++ showType (objType obj)) attrs
+    return $ tagNode (Just $ packBuf $ "tag:pugs:Object:" ++ showType (objType obj)) attrs
 toYaml (VRule MkRulePGE{rxRule=rule, rxGlobal=global, rxStringify=stringify, rxAdverbs=adverbs}) = do
     adverbs' <- toYaml adverbs