Changeset 2907

Timestamp:

05/09/05 23:48:13 (4 years ago)

Author:

bsmith

svk:copy_cache_prev:

4437

Message:

Fixed the build: compensated for getEnv's new Maybe signature through the use
of fmaps, >>=s and fromMaybe's.

Location:

src/Pugs

Files:

• Run.hs (modified) (1 diff)
• Types/Hash.hs (modified) (1 diff)

src/Pugs/Run.hs

@@ -118 +118 @@
 getLibs = do
     args    <- getArgs
-    p6lib   <- tryIO "" (getEnv "PERL6LIB")
+    p6lib   <- (getEnv "PERL6LIB") >>= (return . (fromMaybe ""))
     return $ filter (not . null) (libs p6lib $ canonicalArgs args)
     where

src/Pugs/Types/Hash.hs

@@ -81 +81 @@
     hash_fetchVal _ key = tryIO undef $ do
         str <- getEnv key
-        return $ VStr str
+        return $ fromMaybe VUndef (fmap VStr str)
     hash_storeVal _ key val = do
         str <- fromVal val