Changeset 21673 for src/Pugs/Prim/Eval.hs

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

Files:

• src/Pugs/Prim/Eval.hs (modified) (3 diffs)

src/Pugs/Prim/Eval.hs

@@ -18 +18 @@
 import Pugs.Prim.Keyed
 import Pugs.Types
+import Pugs.Prelude
 import DrIFT.YAML
 import Data.Yaml.Syck
+import Data.Binary (decode)
 import qualified Data.ByteString.Char8 as Bytes
 
@@ -50 +52 @@
     let file | '.' `elem` mod = mod
              | otherwise      = (concat $ intersperse (getConfig "file_sep") $ split "::" mod) ++ ".pm"
-    pathName    <- requireInc incs file (errMsg file incs)
+    pathName    <- case mod of
+        "Test"  -> return "Test.pm"
+        _       -> requireInc incs file (errMsg file incs)
     if loaded then opEval style pathName "" else do
         -- %*INC{mod} = { relname => file, pathname => pathName }
@@ -65 +69 @@
         ends    <- fromVal =<< readRef endAV
         clearRef endAV
-        rv <- tryFastEval pathName (pathName ++ ".yml")
+        rv <- case mod of
+            "Test"  -> shortcutToTestPM
+            _       -> tryFastEval pathName (pathName ++ ".yml")
         endAV'  <- findSymRef (cast "@*END") glob
         doArray (VRef endAV') (`array_unshift` ends)
         return rv
     where
+    shortcutToTestPM = do
+        globTVar    <- asks envGlobal
+        let MkCompUnit _ _ glob ast = decode (testByteStringLazy)
+        -- Inject the global bindings
+        stm $ do
+            glob' <- readMPad globTVar
+            writeMPad globTVar (glob `unionPads` glob')
+
+        -- | PEStatic   { pe_type :: !Type, pe_proto :: !VRef, pe_flags :: !EntryFlags, pe_store :: !(TVar VRef) }
+        evl <- asks envEval
+        evl ast
     tryFastEval pathName pathNameYml = do
+        io $ print pathNameYml
         ok <- io $ doesFileExist pathNameYml
         if not ok then slowEval pathName else do