Changeset 21677

Timestamp:

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

Author:

audreyt

Message:

* Reflect data-dir changes.

Location:

src/Pugs

Files:

• Embed/Perl5.hs (modified) (2 diffs)
• Prim/Match.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++"'"

src/Pugs/Prim/Match.hs

@@ -33 +33 @@
 doMatch :: String -> VRule -> Eval VMatch
 doMatch cs rule@MkRulePGE{ rxRule = ruleStr } = do
-    pwd     <- io $ getDataFileName "blib6/pugs/perl5/lib"
+    pwd1    <- io $ getDataFileName "perl5/Pugs-Compiler-Rule/lib"
+    pwd2    <- io $ getDataFileName "third-party/Parse-Yapp/lib"
     glob    <- askGlobal
     let syms = [ (cast $ v_name var, entry)
@@ -49 +50 @@
     let ruleEngine | Just "PGE" <- rv   = evalPGE
                    | otherwise          = evalPCR
-    pge  <- io $ ruleEngine pwd cs text subrules
+    pge  <- io $ ruleEngine [pwd1, pwd2] cs text subrules
             `catchIO` (\e -> return $ show e)
     rv  <- tryIO Nothing $ fmap Just (readIO $ decodeUTF8 pge)