Changeset 8585

Timestamp:

01/05/06 18:14:10 (3 years ago)

Author:

gaal

Message:

YAML emitting

• "moose".yaml; 42.yaml; (undef).yaml work
• (123.12).yaml gives funny results (because it's delegated to pugs' pretty-printer

Tests very welcome!

Location:

src

Files:

• Data/Yaml/Syck.hsc (modified) (1 diff)
• Pugs/Prim/Yaml.hs (modified) (2 diffs)

src/Data/Yaml/Syck.hsc

@@ -87 +87 @@
     node <- thawNode vp
     case node of
+        YamlNil -> do
+            -- return syck_emit_scalar(e, "string", scalar_none, 0, 0, 0, "~", 1);
+            withCString "string" $ \string_literal ->       
+                withCString "~" $ \cs ->       
+                    syck_emit_scalar e string_literal scalarNone 0 0 0 cs 1
         (YamlStr str) -> do
             -- return syck_emit_scalar(e, "string", scalar_none, 0, 0, 0, SvPVX(sv), SvCUR(sv));

src/Pugs/Prim/Yaml.hs

@@ -7 +7 @@
 import Pugs.Internals
 import Pugs.AST
+import Pugs.Pretty
 import Data.Yaml.Syck
 import qualified Data.Map as Map
@@ -45 +46 @@
 toYaml :: Val -> Eval YamlNode
 toYaml VUndef = return YamlNil
+--toYaml (VNum num) = return $ YamlStr -- better handled by pretty
 toYaml (VStr str) = return $ YamlStr (encodeUTF8 str)
 toYaml (VList nodes) = do
     fmap YamlSeq $ mapM toYaml nodes
+toYaml x = return $ YamlStr $ encodeUTF8 $ pretty x
 --toYaml (VHash hash) = do
 --    fmap YamlMap $ Map.toList hash