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

Timestamp:

03/18/06 16:40:38 (3 years ago)

Author:

gaal

svk:copy_cache_prev:

12197

Message:

* unbreak YAML object serialization. You may need to make clean

after applying this patch. Rule serialization is still broken.

Files:

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

src/Pugs/Prim/Yaml.hs

@@ -42 +42 @@
             hv      <- liftSTM $ (newTVar (Map.fromList vals) :: STM IHash)
             return $ VRef (hashRef hv)
-        Just s | Just (pre, post) <- Str.breakFirst ':' s
-               , pre == Str.pack "pugs/Object" -> do
+        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
             vals    <- forM nodes $ \(keyNode, valNode) -> do
@@ -50 +50 @@
                 return (key, val)
             return . VObject =<< createObject (mkType typ) vals
-        Just s | s == Str.pack "pugs/Rule" -> do
+        Just s | s == Str.pack "tag:pugs:Rule" -> do
             vals    <- forM nodes $ \(keyNode, valNode) -> do
                 key <- fromVal =<< fromYaml keyNode
@@ -110 +110 @@
     hash    <- fromVal v :: Eval VHash
     attrs   <- toYaml $ VRef (hashRef hash)
-    return $ tagNode (Just $ Str.pack $ "tag:pugs:object:" ++ showType (objType obj)) attrs
-toYaml (VRule MkRulePGE{rxRule=rule, rxGlobal=global, rxStringify=stringify, rxAdverbs=adverbs}) =do
+    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
     return . mkTagNode "tag:pugs:Rule" $ YamlMap