Changeset 16627 for src/Pugs/CodeGen

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

Location:

src/Pugs/CodeGen

Files:

• JSON.hs (modified) (1 diff)
• PIL1.hs (modified) (1 diff)
• PIR.hs (modified) (1 diff)
• Perl5.hs (modified) (1 diff)
• YAML.hs (modified) (1 diff)

src/Pugs/CodeGen/JSON.hs

@@ -8 +8 @@
 import DrIFT.JSON
 
-genJSON :: Eval Val
-genJSON = do
+-- XXX: do something useful with the filename arg
+genJSON :: FilePath -> Eval Val
+genJSON _ = do
     penv <- compile () :: Eval PIL_Environment
     return . VStr . unlines $ [showJSON penv]

src/Pugs/CodeGen/PIL1.hs

@@ -7 +7 @@
 import Pugs.Compile
 
-genPIL1 :: Eval Val
-genPIL1 = do
+genPIL1 :: FilePath -> Eval Val
+genPIL1 _ = do
     penv <- compile ()
     return . VStr . unlines $

src/Pugs/CodeGen/PIR.hs

@@ -370 +370 @@
 varInit x       = internalError $ "Invalid name: " ++ x
 
-genPIR_YAML :: Eval Val
-genPIR_YAML = genPIRWith $ \globPIR mainPIR _ -> do
+-- XXX: do something useful with the filename arg
+genPIR_YAML :: FilePath -> Eval Val
+genPIR_YAML _ = genPIRWith $ \globPIR mainPIR _ -> do
     yaml <- io (showYaml (mainPIR, globPIR))
     return (VStr yaml)
 
 {-| Compiles the current environment to PIR code. -}
-genPIR :: Eval Val
-genPIR = genPIRWith $ \globPIR mainPIR penv -> do
+genPIR :: FilePath -> Eval Val
+genPIR file = genPIRWith $ \globPIR mainPIR penv -> do
     libs        <- io $ getLibs
     return . VStr . unlines $
         [ "#!/usr/bin/env parrot"
+        , "# " ++ file
         , renderStyle (Style PageMode 0 0) $ preludePIR $+$ vcat
         -- Namespaces have bugs in both pugs and parrot.

src/Pugs/CodeGen/Perl5.hs

@@ -8 +8 @@
 import DrIFT.Perl5
 
-genPerl5 :: Eval Val
-genPerl5 = do
+-- XXX: do something useful with the filename arg
+genPerl5 :: FilePath -> Eval Val
+genPerl5 _ = do
     penv <- compile () :: Eval PIL_Environment
     return . VStr . unlines $ [showPerl5 penv]

src/Pugs/CodeGen/YAML.hs

@@ -9 +9 @@
 import DrIFT.YAML
 
-genParseHsYAML, genParseYAML :: Eval Val
-genParseHsYAML = doGenParseYAML (fmap show . toYamlNode)
-genParseYAML   = doGenParseYAML showYamlCompressed
+genParseHsYAML, genParseYAML :: FilePath -> Eval Val
+genParseHsYAML file = doGenParseYAML file (fmap show . toYamlNode)
+genParseYAML   file = doGenParseYAML file showYamlCompressed
 
-doGenParseYAML :: (CompUnit -> IO String) -> Eval Val
-doGenParseYAML f = do
+doGenParseYAML :: FilePath -> (CompUnit -> IO String) -> Eval Val
+doGenParseYAML file f = do
     pad  <- filterPrim =<< asks envGlobal
     main <- asks envBody
-    yaml <- io $ f $ mkCompUnit "<unused>" pad main
+    yaml <- io $ f $ mkCompUnit file pad main
     return $ VStr yaml
 
-genYAML :: Eval Val
-genYAML = do
+-- XXX: do something useful with the filename arg
+genYAML :: FilePath -> Eval Val
+genYAML _ = do
     penv <- compile () :: Eval PIL_Environment
     yaml <- io (showYamlCompressed penv)