Changeset 7117

Timestamp:

09/23/05 16:02:54 (3 years ago)

Author:

gaal

Message:

-B backend can now be handled by the main pugs executable again.
next step is to remove the perl5 wrapper.

Files:

• README (modified) (1 diff)
• src/Main.hs (modified) (3 diffs)
• src/System (added)
• src/System/FilePath.hs (added)
• src/System/LICENSE (added)

README

@@ -19 +19 @@
 The "PCRE" subsystem is derived from PCRE 5.0 by Philip Hazel,
 under a BSD-style license.  See src/pcre/LICENCE.
+
+The "FilePath" subsystem is derived from FilePath 0.1.0 by Isaac Jones,
+under a BSD-style license.  See src/System/LICENSE.
 
 The "Syck" subsystem is derived from Syck 0.55 by "why the lucky stiff",

src/Main.hs

@@ -32 +32 @@
 import qualified Data.Map as Map
 import Data.IORef
+import System.FilePath
 
 {-|
@@ -81 +82 @@
 run ("-C":backend:file:_)                = slurpFile file >>= doCompileDump backend file
 
-run ("-B":backend:"-e":prog:_)           = doCompileRun backend "-e" prog
-run ("-B":backend:file:_)                = slurpFile file >>= doCompileRun backend file
+run ("-B":backend:args)                  = doHelperRun backend args
 
 run ("--external":mod:"-e":prog:_)    = doExternal mod "-e" prog
@@ -206 +206 @@
     capitalizeWord []     = []
     capitalizeWord (c:cs) = toUpper c:(map toLower cs)
+
+doHelperRun :: String -> [String] -> IO ()
+doHelperRun backend args =
+    case map toLower backend of
+        "js"    -> if (args == [])
+                   then (doExecuteHelper [ "perl5", "PIL2JS",  "jspugs.pl"     ] [])
+                   else (doExecuteHelper [ "perl5", "PIL2JS",  "runjs.pl"      ] args)
+        "perl5" ->       doExecuteHelper [ "perl5", "PIL-Run", "crude_repl.pl" ] args
+        _       ->       fail ("unknown backend: " ++ backend)
+
+doExecuteHelper :: [FilePath] -> [String] -> IO ()
+doExecuteHelper helper args = do
+    mbin <- findHelper [["."], ["..", ".."]]
+    case mbin of
+        Just binary -> do
+            exitWith =<< executeFile' perl5 True (binary:args) Nothing
+        _ -> fail ("Couldn't find helper program" ++ (foldl1 joinFileName helper))
+    where
+    perl5 = getConfig "perl5path"
+    findHelper :: [[FilePath]] -> IO (Maybe FilePath)
+    findHelper []     = return Nothing
+    {- interesting riddle: how to do the following monadically?
+    findHelper (x:xs)
+        | fileExists $ file  x = Just $ file  x
+        | fileExists $ file' x = Just $ file' x
+        | otherwise            = findHelper xs
+    -}
+    findHelper (x:xs) = do -- not lazy, but that's not really important here
+        filex  <- fileExists (file  x)
+        filex' <- fileExists (file' x)
+        case () of
+            _
+                | filex     -> return $ Just $ file  x
+                | filex'    -> return $ Just $ file' x
+                | otherwise -> findHelper xs
+    file  x = foldl1 joinFileName (x ++ helper)
+    file' x = (file x) ++ (getConfig "exe_ext")
+    fileExists path = do
+        let (p,f) = splitFileName path
+        dir <- getDirectoryContents p
+        return $ f `elem` dir
 
 doParseWith :: (Env -> FilePath -> IO a) -> FilePath -> String -> IO a