Changeset 8602

Timestamp:

01/07/06 10:14:02 (3 years ago)

Author:

audreyt

Message:

* More slight refactorings.

Files:

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

src/Pugs/Prim/Yaml.hs

@@ -43 +43 @@
     obj  <- toYaml limit v
     rv   <- liftIO (emitYaml obj)
-    case rv of
-        Left err  -> fail $ "YAML Emit Error: " ++ err
-        Right str -> return $ VStr str
+    either (fail . ("YAML Emit Error: "++))
+           (return . VStr) rv
 
 toYaml :: Int -> Val -> Eval YamlNode
@@ -67 +66 @@
     -- parens, which is, of course, wrong.
     hash    <- fromVal v :: Eval VHash
-    attrs   <- toYaml d (VRef (hashRef hash))
+    attrs   <- toYaml d $ VRef (hashRef hash)
     return $ addTag (Just $ "!pugs:object/" ++ showType (objType obj)) attrs
     where
-    addTag _ (YamlMap (Just x) _) = error ("can't add tag: already tagged with" ++ x)
-    addTag tag (YamlMap _ m) = YamlMap tag m
-toYaml _ v = return $ YamlStr $ encodeUTF8 $ pretty v
+    addTag _   (YamlMap (Just x) _) = error ("can't add tag: already tagged with" ++ x)
+    addTag tag (YamlMap _        m) = YamlMap tag m
+toYaml _ v = (return . YamlStr . encodeUTF8 . pretty) v
 
 hashToYaml :: Int -> VRef -> Eval YamlNode
@@ -78 +77 @@
     h <- hash_fetch hv
     let assocs = Map.toList h
-    yamlmap <- flip mapM assocs (\(ka, va) -> do
-        ka' <- toYaml d (VStr ka)
+    yamlmap <- flip mapM assocs $ \(ka, va) -> do
+        ka' <- toYaml d $ VStr ka
         va' <- toYaml d va
-        return (ka', va'))
+        return (ka', va')
     return $ YamlMap Nothing yamlmap
 hashToYaml _ r = error ("unexpected node: " ++ show r)