Changeset 16627 for src/Pugs/CodeGen.hs

Timestamp:

06/04/07 10:08:30 (18 months ago)

Author:

gaal

Message:

* reintroduce the description field in CompUnit?, and chase codeGens

to use the filename where possible.
You may need to "rm blib6/lib/*yml" with this revision.
TODO: think about adding a parser revision number to the compunit

Files:

• src/Pugs/CodeGen.hs (modified) (3 diffs)

src/Pugs/CodeGen.hs

@@ -25 +25 @@
 import qualified Data.Map as Map
 
-type Generator = Eval Val
+type Generator = FilePath -> Eval Val
 
 generators :: Map String Generator
@@ -43 +43 @@
     , ("Parse-YAML",  genParseYAML)
     , ("Parse-HsYAML",genParseHsYAML)
-    , ("Parse-Pretty",fmap (VStr . (++"\n") . pretty) (asks envBody))
+    , ("Parse-Pretty",const $ fmap (VStr . (++"\n") . pretty) (asks envBody))
 --  , ("XML",         genXML)
     ]
@@ -85 +85 @@
         key -> Map.lookup key generators
 
-codeGen :: String -> Env -> IO String
-codeGen s env = do
+codeGen :: String -> FilePath -> Env -> IO String
+codeGen s file env = do
     gen <- catchIO (doLookup s) . const $ do
-        fail $ "Cannot generate code for " ++ s
-    rv <- runEvalIO env gen
+        fail $ "Cannot generate code for " ++ s ++ ": " ++ file
+    rv <- runEvalIO env (gen file)
     case rv of
         VStr str    -> return str