Changeset 186

Timestamp:

02/22/05 18:29:37 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

1041

Message:

* %ENV patch from rgs

Files:

• AUTHORS (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• src/Main.hs (modified) (3 diffs)
• src/Posix.hs (modified) (2 diffs)

AUTHORS

@@ -14 +14 @@
 Patrick R. Michaud
 Pernod
+Rafael Garcia-Suarez    (RGARCIA)
 Richard Soderberg       (RSOD)
 Larry Wall              (LWALL)

MANIFEST

@@ -72 +72 @@
 t/op/inc.t
 t/op/join.t
+t/op/magic.t
 t/op/pair.t
 t/op/pop.t

src/Main.hs

@@ -23 +23 @@
 import Help
 import Pretty
+import Posix
 
 main :: IO ()
@@ -95 +96 @@
 runProgramWith :: (Env -> Env) -> (Val -> IO ()) -> VStr -> [VStr] -> String -> IO ()
 runProgramWith fenv f name args prog = do
+    environ <- getEnvironment
     env <- emptyEnv
         [ Symbol SGlobal "@*ARGS" (Val $ VList $ map VStr args)
@@ -101 +103 @@
 --        , Symbol SGlobal "$*STDIN" (Val $ VStr str)
         , Symbol SGlobal "$*END" (Val VUndef)
+        , Symbol SGlobal "%*ENV" (Val . VHash . MkHash . listToFM $ environ)
         ]
 --    str <- return "" -- getContents

src/Posix.hs

@@ -22 +22 @@
     removeLink,
     sleep,
+    getEnvironment,
 ) where
 
 #ifdef PUGS_HAVE_POSIX
+import System.Posix.Env
 import System.Posix.Files
 import System.Posix.Process
@@ -48 +50 @@
 sleep _ = fail "'sleep' not implemented on this platform."
 
+getEnvironment :: IO [(String, String)]
+getEnvironment = []
+
 #endif