Changeset 21673 for src/Pugs/CodeGen

Timestamp:

08/01/08 13:56:05 (4 months ago)

Author:

audreyt

Message:

* Import Pugs 6.2.13.11 from Hackage into our source tree.
* Highlights:

• Much faster startup time
• Slightly faster compilation time (mostly due to refactored Pugs.AST.Internals)
• Portable-to-Win32 readline thanks to Haskeline

Location:

src/Pugs/CodeGen

Files:

• Binary.hs (modified) (1 diff)
• PIR.hs (modified) (3 diffs)

src/Pugs/CodeGen/Binary.hs

@@ -1 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
+{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-}
 
-module Pugs.CodeGen.Binary (genBinary) where
+module Pugs.CodeGen.Binary (genParseBinary) where
 import Pugs.Internals
 import Pugs.AST
-import Pugs.Compile
-import Pugs.PIL1
-import DrIFT.Binary
-import System.IO
-import System.Directory
+import Data.Binary
+import qualified Data.ByteString.Lazy.Char8 as L
 
-genBinary :: Eval Val
-genBinary = do
-    penv <- compile () :: Eval PIL_Environment
-    io $ do
-        tmp         <- getTemporaryDirectory
-        (file, fh)  <- openBinaryTempFile tmp "pugs.bin"
-        bh          <- openBinIO fh
-        put_ bh penv
-        hClose fh
-        return $ VStr (unlines [file])
+genParseBinary :: FilePath -> Eval Val
+genParseBinary file = doGenParseBinary file
+
+doGenParseBinary :: FilePath -> Eval Val
+doGenParseBinary file = do
+    pad  <- filterPrim =<< asks envGlobal
+    main <- asks envBody
+    return $ VStr (L.unpack $! encode (mkCompUnit file pad main))

src/Pugs/CodeGen/PIR.hs

@@ -18 +18 @@
 import Pugs.Types
 import Pugs.PIL1
-import Emit.PIR.Instances ()
-import Emit.PIR
+import Language.PIR
 import Pugs.Pretty
 import Text.PrettyPrint
@@ -27 +26 @@
 import Pugs.Run (getLibs)
 import DrIFT.YAML
-import qualified UTF8 as Str
+import qualified Data.ByteString.UTF8 as Str
 
 type CodeGen a = WriterT [Stmt] (ReaderT TEnv IO) a
@@ -250 +249 @@
     trans x = transError x
 
-instance LiteralClass Var Expression where
+instance LiteralClass Var where
     lit = ExpLit . LitStr . cast
 
-instance LiteralClass ByteString Expression where
+instance LiteralClass ByteString where
     lit = ExpLit . LitStr . cast