Changeset 8472 for src/Pugs.hs

Timestamp:

12/27/05 07:44:33 (3 years ago)

Author:

audreyt

Message:

* As lexical import is implemented correctly by gaal++,

we no longer need the withInlinedIncludes hack to get
"use" statements working with PIL-based compilation.
Thanks to clkao++ for prompting this fix.

Files:

• src/Pugs.hs (modified) (5 diffs)

src/Pugs.hs

@@ -36 +36 @@
 import Pugs.CodeGen
 import Pugs.Embed
-import Pugs.Prim.Eval (requireInc)
 import qualified Data.Map as Map
 import Data.IORef
@@ -82 +81 @@
     exec <- getArg0
     doHelperRun "JS" ("--compile-only":("--pugs="++exec):args)
-run ("-C":backend:"-e":prog:_)           = withInlinedIncludes prog >>= doCompileDump backend "-e"
-run ("-C":backend:file:_)                = readFile file >>= withInlinedIncludes >>= doCompileDump backend file
+run ("-C":backend:"-e":prog:_)           = doCompileDump backend "-e" prog
+run ("-C":backend:file:_)                = readFile file >>= doCompileDump backend file
 
 run ("-B":backend:_) | (== map toLower backend) `any` ["js","perl5"] = do
@@ -89 +88 @@
     args <- getArgs
     doHelperRun backend (("--pugs="++exec):args)
-run ("-B":backend:"-e":prog:_)           = withInlinedIncludes prog >>= doCompileRun backend "-e"
-run ("-B":backend:file:_)                = readFile file >>= withInlinedIncludes >>= doCompileRun backend file
+run ("-B":backend:"-e":prog:_)           = doCompileRun backend "-e" prog
+run ("-B":backend:file:_)                = readFile file >>= doCompileRun backend file
 
 run ("--external":mod:"-e":prog:_)    = doExternal mod "-e" prog
@@ -417 +416 @@
     evalParrotFile "a.pir"
 
+{-
 withInlinedIncludes :: String -> IO String
 withInlinedIncludes prog = do
@@ -444 +444 @@
         readFile pathName
     errMsg fn incs = "Can't locate " ++ fn ++ " in @*INC (@*INC contains: " ++ unwords incs ++ ")."
-
+-}