Changeset 8687

Timestamp:

01/15/06 18:30:44 (3 years ago)

Author:

audreyt

Message:

* half-finished attempt at dumping the global bindings also.

Location:

src/Pugs

Files:

• AST/Internals.hs (modified) (2 diffs)
• AST/Internals.hs-drift (modified) (2 diffs)
• CodeGen/YAML.hs (modified) (1 diff)

src/Pugs/AST/Internals.hs

@@ -1775 +1775 @@
 instance YAML (a -> Eval b)
 instance YAML (Eval a)
-instance YAML (Map String String)
-instance YAML (Map VStr (IVar VScalar))
-instance YAML (Map Var PadEntry)
+instance YAML a => YAML (Map String a) where
+    asYAML x = asYAMLmap "Map" $ Map.toList (Map.map asYAML x)
+instance Typeable a => YAML (IVar a) where
+    asYAML x = asYAML (MkRef x)
+instance YAML VRef where
 instance YAML (Set Val)
 instance YAML (VThread Val)
@@ -1791 +1793 @@
 instance YAML VHash
 instance YAML VOpaque
-instance YAML VRef
 instance YAML VSocket
 

src/Pugs/AST/Internals.hs-drift

@@ -1807 +1807 @@
 instance YAML (a -> Eval b)
 instance YAML (Eval a)
-instance YAML (Map String String)
-instance YAML (Map VStr (IVar VScalar))
-instance YAML (Map Var PadEntry)
+instance YAML a => YAML (Map String a) where
+    asYAML x = asYAMLmap "Map" $ Map.toList (Map.map asYAML x)
+instance Typeable a => YAML (IVar a) where
+    asYAML x = asYAML (MkRef x)
+instance YAML VRef where
 instance YAML (Set Val)
 instance YAML (VThread Val)
@@ -1823 +1825 @@
 instance YAML VHash
 instance YAML VOpaque
-instance YAML VRef
 instance YAML VSocket
 

src/Pugs/CodeGen/YAML.hs

@@ -11 +11 @@
 genParseYAML :: Eval Val
 genParseYAML = do
+    -- glob    <- asks envGlobal
     main    <- asks envBody
     yaml    <- liftIO (showYaml main)