Changeset 6248 for src/Pugs/CodeGen

Timestamp:

08/14/05 17:32:14 (3 years ago)

Author:

autrijus

svk:copy_cache_prev:

8452

Message:

* -CBinary - dump PIL1 tree as opaque GhcBinary? file for fast loading.

Location:

src/Pugs/CodeGen

Files:

• Binary.hs (added)
• PIL.hs (modified) (1 diff)
• PIR.hs (modified) (3 diffs)
• Perl5.hs (modified) (1 diff)
• XML.hs (modified) (1 diff)

src/Pugs/CodeGen/PIL.hs

@@ -5 +5 @@
 import Pugs.Internals
 import Pugs.AST
+import Pugs.PIL1
 import Pugs.Compile
 
 genPIL :: Eval Val
 genPIL = do
-    glob        <- askGlobal
-    main        <- asks envBody
-    globPIL     <- compile glob :: Eval [PIL_Decl]
-    mainPIL     <- compile main :: Eval PIL_Stmts
+    penv <- compile ()
     return . VStr . unlines $
         [ "PIL_Environment"
-        , "    { pilMain = (" ++ show mainPIL ++ ")"
-        , "    , pilGlob = (" ++ show globPIL ++ ")"
+        , "    { pilMain = (" ++ show (pilMain penv) ++ ")"
+        , "    , pilGlob = (" ++ show (pilGlob penv) ++ ")"
         , "    }"
         ]

src/Pugs/CodeGen/PIR.hs

@@ -19 +19 @@
 import Pugs.Types
 import Pugs.Eval.Var
+import Pugs.PIL1
 import Emit.PIR
 import Pugs.Pretty
@@ -338 +339 @@
     local (\env -> env{ envDebug = Nothing }) $ do
         opEval style "<prelude-pir>" preludeStr
-    glob        <- askGlobal
-    main        <- asks envBody
-    globPIL     <- compile glob
-    mainPIL     <- compile main
-    globPIR     <- runCodeGenGlob tenv globPIL
-    mainPIR     <- runCodeGenMain tenv mainPIL
+    penv        <- compile ()
+    globPIR     <- runCodeGenGlob tenv (pilGlob penv)
+    mainPIR     <- runCodeGenMain tenv (pilMain penv)
     libs        <- liftIO $ getLibs
     return . VStr . unlines $
@@ -385 +383 @@
             , InsNew tempPMC PerlScalar
             , "store_global"    .- [lit "$_", tempPMC]
-            ]) ++ [ StmtRaw (text (name ++ "()")) | PSub name@('_':'_':_) _ _ _ <- globPIL] ++
+            ]) ++ [ StmtRaw (text (name ++ "()")) | PSub name@('_':'_':_) _ _ _ <- pilGlob penv ] ++
             [ StmtRaw (text "main()")
             , StmtIns $ tempPMC  <-- "find_global" $ [lit "Perl6::Internals", lit "&exit"]

src/Pugs/CodeGen/Perl5.hs

@@ -6 +6 @@
 import Pugs.AST
 import Pugs.Compile
+import Pugs.PIL1
 import DrIFT.Perl5
 
 genPerl5 :: Eval Val
 genPerl5 = do
-    glob        <- askGlobal
-    main        <- asks envBody
-    globPIL     <- compile glob :: Eval [PIL_Decl]
-    mainPIL     <- compile main :: Eval PIL_Stmts
+    penv <- compile ()
     return . VStr . unlines $
         [ "bless({"
-        , "    pilMain => " ++ showPerl5 mainPIL ++ ","
-        , "    pilGlob => " ++ showPerl5 globPIL
+        , "    pilMain => " ++ showPerl5 (pilMain penv) ++ ","
+        , "    pilGlob => " ++ showPerl5 (pilGlob penv)
         , "} => 'PIL::Environment')"
         ]

src/Pugs/CodeGen/XML.hs

@@ -11 +11 @@
 genXML :: Eval Val
 genXML = do
-    glob        <- askGlobal
-    main        <- asks envBody
-    globPIL     <- compile glob :: Eval [PIL_Decl]
-    mainPIL     <- compile main :: Eval PIL_Stmts
-    return . VStr . showXml $ PIL_Environment globPIL mainPIL
+    penv <- compile () :: Eval PIL_Environment
+    return $ VStr (showXml penv)