Changeset 21677 for src/Pugs/Embed/Perl5.hs

Timestamp:

08/01/08 14:20:21 (5 months ago)

Author:

audreyt

Message:

* Reflect data-dir changes.

Files:

• src/Pugs/Embed/Perl5.hs (modified) (2 diffs)

src/Pugs/Embed/Perl5.hs

@@ -15 +15 @@
 import qualified Data.ByteString.UTF8 as Str
 
-evalPCR :: FilePath -> String -> String -> [(String, String)] -> IO String
-evalPCR path match rule subrules = do
-    (inp, out, err, pid) <- initPCR path
+evalPCR :: [FilePath] -> String -> String -> [(String, String)] -> IO String
+evalPCR [path] match rule subrules = do
+    (inp, out, err, pid) <- initPCR $ head path
     (`mapM` subrules) $ \(name, rule) -> do
         let nameStr = escape name
@@ -357 +357 @@
 nullEnv = unsafePerformIO (newStablePtr (error "undefined environment"))
 
-evalPCR :: FilePath -> String -> String -> [(String, String)] -> IO String
-evalPCR path match rule subrules = do
+evalPCR :: [FilePath] -> String -> String -> [(String, String)] -> IO String
+evalPCR paths match rule subrules = do
     let bridgeMod   = "Pugs::Runtime::Match::HsBridge"
         bridgeFile  = "Pugs/Runtime/Match/HsBridge.pm";
-    inv     <- evalPerl5 (unlines
+        incs        = map (\p -> "    unshift @INC, '"++p++"';") paths
+    inv     <- evalPerl5 (unlines $
         [ "if (!$INC{'"++bridgeFile++"'}) {"
-        , "    unshift @INC, '"++path++"';"
-        , "    eval q[require '"++bridgeFile++"'] or die $@;"
+        ] ++ incs ++
+        [ "    eval q[require '"++bridgeFile++"'] or die $@;"
         , "}"
         , "'"++bridgeMod++"'"