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

Timestamp:

02/15/06 21:26:43 (3 years ago)

Author:

gaal

svk:copy_cache_prev:

11571

Message:

* change pugs' YAML emission client code to use audreyt++'s speedupped FastString?

Files:

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

src/Pugs/Prim/Yaml.hs

@@ -13 +13 @@
 import qualified Data.IntSet as IntSet
 import qualified Data.IntMap as IntMap
+import qualified Data.FastPackedString as Str
 import Foreign.StablePtr
 import Foreign.Ptr
 import Data.Generics
+
+type Str = Str.FastString
 
 evalYaml :: Val -> Eval Val
@@ -28 +31 @@
 fromYaml :: YamlNode -> Eval Val
 fromYaml MkYamlNode{el=YamlNil}       = return VUndef
-fromYaml MkYamlNode{el=YamlStr str}   = return $ VStr (decodeUTF8 str)
+fromYaml MkYamlNode{el=YamlStr str}   = return $ VStr $ decodeUTF8 $ Str.unpack str
 fromYaml MkYamlNode{el=YamlSeq nodes} = do
     vals    <- mapM fromYaml nodes
@@ -43 +46 @@
             hv      <- liftSTM $ (newTVar (Map.fromList vals) :: STM IHash)
             return $ VRef (hashRef hv)
-        Just ('p':'u':'g':'s':'/':'o':'b':'j':'e':'c':'t':':':typ) -> do
+        Just s | Just (pre, post) <- Str.breakFirst ':' s
+               , pre == Str.pack "pugs/Object" -> do
+            let typ = Str.unpack post
             vals    <- forM nodes $ \(keyNode, valNode) -> do
                 key <- fromVal =<< fromYaml keyNode
@@ -49 +54 @@
                 return (key, val)
             return . VObject =<< createObject (mkType typ) vals
-        Just "pugs/Rule" -> do
+        Just s | s == Str.pack "pugs/Rule" -> do
             vals    <- forM nodes $ \(keyNode, valNode) -> do
                 key <- fromVal =<< fromYaml keyNode
@@ -63 +68 @@
             adverbs <- Map.lookup "adverbs" spec
             return $ VRule MkRulePGE{rxRule=rule, rxGlobal=global, rxStringify=stringify, rxAdverbs=adverbs}
-        Just x   -> error ("can't deserialize: " ++ x)
+        Just x   -> error ("can't deserialize: " ++ (Str.unpack x))
 
 dumpYaml :: Int -> Val -> Eval Val
@@ -74 +79 @@
 
 strNode :: String -> YamlNode
-strNode = mkNode . YamlStr
+strNode = mkNode . YamlStr . Str.pack
 
 addressOf :: a -> IO Int
@@ -107 +112 @@
     hash    <- fromVal v :: Eval VHash
     attrs   <- toYaml $ VRef (hashRef hash)
-    return $ tagNode (Just $ "tag:pugs:object:" ++ showType (objType obj)) attrs
+    return $ tagNode (Just $ Str.pack $ "tag:pugs:object:" ++ showType (objType obj)) attrs
 toYaml (VRule MkRulePGE{rxRule=rule, rxGlobal=global, rxStringify=stringify, rxAdverbs=adverbs}) =do
     adverbs' <- toYaml adverbs