Changeset 5891

Timestamp:

07/29/05 18:25:38 (3 years ago)

Author:

bsmith

svk:copy_cache_prev:

7758

Message:

Moved getLibs from Pugs.Prim.Eval to Pugs.Run.
Removed some extra references to Pugs.AST.Internals where Pugs.AST is already
imported.

Location:

src/Pugs

Files:

• AST/SIO.hs (modified) (1 diff)
• CodeGen/PIL.hs (modified) (1 diff)
• CodeGen/PIR.hs (modified) (2 diffs)
• Eval.hs (modified) (1 diff)
• Frontend/P5AST.hs (modified) (1 diff)
• Prim/Eval.hs (modified) (3 diffs)
• Run.hs (modified) (2 diffs)

src/Pugs/AST/SIO.hs

@@ -7 +7 @@
     runSTM, runIO,
     liftSTM, liftIO,
+
+    module Control.Concurrent.STM
 ) where
-import Pugs.Internals
+import Control.Concurrent.STM
+import Control.Monad.RWS
 
 data SIO a = MkSTM !(STM a) | MkIO !(IO a) | MkSIO !a
-    deriving (Typeable)
 
 runSTM :: SIO a -> STM a

src/Pugs/CodeGen/PIL.hs

@@ -4 +4 @@
 module Pugs.CodeGen.PIL (genPIL) where
 import Pugs.Internals
-import Pugs.AST.Internals
+import Pugs.AST
 import Emit.PIR
 import Pugs.Compile

src/Pugs/CodeGen/PIR.hs

@@ -17 +17 @@
 import Pugs.Internals
 import Pugs.AST
-import Pugs.AST.Internals
 import Pugs.Types
 import Pugs.Eval.Var
@@ -26 +25 @@
 import Pugs.Prim.Eval
 import Pugs.Compile
+import Pugs.Run (getLibs)
 
 type CodeGen a = WriterT [Stmt] (ReaderT TEnv IO) a

src/Pugs/Eval.hs

@@ -30 +30 @@
 
 import Pugs.AST
-import Pugs.AST.Internals
 import Pugs.Junc
 import Pugs.Bind

src/Pugs/Frontend/P5AST.hs

@@ -67 +67 @@
 {-
 import Pugs.Run
-import Pugs.AST.Internals
+import Pugs.AST
 import Data.Map
 

src/Pugs/Prim/Eval.hs

@@ -6 +6 @@
     EvalError(..), EvalResult(..), EvalStyle(..),
     -- used by Pugs.Eval -- needs factored somewhere bettwen
-    retEvalResult, getLibs,
+    retEvalResult,
 ) where
 import Pugs.AST
@@ -14 +14 @@
 import Pugs.Internals
 import Pugs.Pretty
-import Pugs.Config
-import Pugs.Run.Args
 import Pugs.Prim.Keyed
 
@@ -110 +108 @@
             return val
 
-{-|
-Combine @%*ENV\<PERL6LIB\>@, -I, 'Pugs.Config.config' values and \".\" into the
-@\@*INC@ list for 'Main.printConfigInfo'. If @%*ENV\<PERL6LIB\>@ is not set,
-@%*ENV\<PERLLIB\>@ is used instead.
--}
-getLibs :: IO [String]
-getLibs = do
-    args    <- getArgs
-    p6lib   <- (getEnv "PERL6LIB") >>= (return . (fromMaybe ""))
-    plib    <- (getEnv "PERLLIB")  >>= (return . (fromMaybe ""))
-    let lib = if (p6lib == "") then plib else p6lib
-    return $ filter (not . null) (libs lib $ canonicalArgs args)
-    where
-    -- broken, need real parser
-    inclibs ("-I":dir:rest) = [dir] ++ inclibs(rest)
-    inclibs (_:rest)        = inclibs(rest)
-    inclibs ([])            = []
-    libs p6lib args = (inclibs args)
-              ++ (split (getConfig "path_sep") p6lib)
-              ++ [ getConfig "archlib"
-                 , getConfig "privlib"
-                 , getConfig "sitearch"
-                 , getConfig "sitelib"
-                 ]
-              ++ [ "." ]
-

src/Pugs/Run.hs

@@ -27 +27 @@
 import Pugs.Eval
 import Pugs.Prim
-import Pugs.Prim.Eval
 import Pugs.Embed
 import Data.IORef
@@ -172 +171 @@
     return (sym:concat rest)
 
+{-|
+Combine @%*ENV\<PERL6LIB\>@, -I, 'Pugs.Config.config' values and \".\" into the
+@\@*INC@ list for 'Main.printConfigInfo'. If @%*ENV\<PERL6LIB\>@ is not set,
+@%*ENV\<PERLLIB\>@ is used instead.
+-}
+getLibs :: IO [String]
+getLibs = do
+    args    <- getArgs
+    p6lib   <- (getEnv "PERL6LIB") >>= (return . (fromMaybe ""))
+    plib    <- (getEnv "PERLLIB")  >>= (return . (fromMaybe ""))
+    let lib = if (p6lib == "") then plib else p6lib
+    return $ filter (not . null) (libs lib $ canonicalArgs args)
+    where
+    -- broken, need real parser
+    inclibs ("-I":dir:rest) = [dir] ++ inclibs(rest)
+    inclibs (_:rest)        = inclibs(rest)
+    inclibs ([])            = []
+    libs p6lib args = (inclibs args)
+              ++ (split (getConfig "path_sep") p6lib)
+              ++ [ getConfig "archlib"
+                 , getConfig "privlib"
+                 , getConfig "sitearch"
+                 , getConfig "sitelib"
+                 ]
+              ++ [ "." ]