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

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.

Files:

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

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"
-                 ]
-              ++ [ "." ]
-