Changeset 17058

Timestamp:

07/14/07 06:37:18 (17 months ago)

Author:

audreyt

Message:

* Pugs.Run, Pugs: Chase API change in System.FilePath? (joinFileName -> combine).

Location:

src

Files:

• Pugs.hs (modified) (4 diffs)
• Pugs/Run.hs (modified) (2 diffs)

src/Pugs.hs

@@ -39 +39 @@
 import Data.IORef
 import qualified Data.Map as Map
-import System.FilePath (joinFileName, splitFileName)
+import qualified System.FilePath as FilePath (combine, splitFileName)
 
 {-|
@@ -255 +255 @@
     case mbin of
         Just binary -> do
-            let (p, _) = splitFileName binary
+            let (p, _) = FilePath.splitFileName binary
             exitWith =<< executeFile' perl5 True (("-I" ++ p):binary:args) Nothing
-        _ -> fail ("Couldn't find helper program " ++ helper ++ " (searched in " ++ show (map (foldl1 joinFileName) searchPaths) ++ ")")
+        _ -> fail ("Couldn't find helper program " ++ helper ++ " (searched in " ++ show (map (foldl1 FilePath.combine) searchPaths) ++ ")")
     where
     suffixes =
@@ -272 +272 @@
                 `mplus` findHelper xs
         where 
-        file = foldl1 joinFileName (x ++ [helper])
+        file = foldl1 FilePath.combine (x ++ [helper])
     maybeFindFile :: FilePath -> MaybeT IO FilePath
     maybeFindFile pathname = do
@@ -279 +279 @@
         return pathname
         where
-        (path, filename) = splitFileName pathname
+        (path, filename) = FilePath.splitFileName pathname
 
 doParseWith :: (Env -> FilePath -> IO a) -> FilePath -> String -> IO a

src/Pugs/Run.hs

@@ -35 +35 @@
 --import Data.Generics.Schemes
 import System.IO
-import System.FilePath (joinFileName)
+import qualified System.FilePath as FilePath (combine)
 
 
@@ -219 +219 @@
                  , getConfig "sitearch"
                  , getConfig "sitelib"
-                 , foldl1 joinFileName [getConfig "privlib", "auto", "pugs", "perl6", "lib"]
-                 , foldl1 joinFileName [getConfig "sitelib", "auto", "pugs", "perl6", "lib"]
+                 , foldl1 FilePath.combine [getConfig "privlib", "auto", "pugs", "perl6", "lib"]
+                 , foldl1 FilePath.combine [getConfig "sitelib", "auto", "pugs", "perl6", "lib"]
                  ]
               ++ [ "." ]