Changeset 7146 for src/Main.hs

Timestamp:

09/26/05 17:21:49 (3 years ago)

Author:

iblech

Message:

* PIL2JS: jspugs.pl: Accept same commandline-options as runjs.pl does (most

importantly --pugs=/path/to/pugs).

* Main: Give --pugs=$*EXECUTABLE_NAME to runjs.pl so

/path/to/my/other/pugs/version -BJS doesn't call some other pugs in $PATH.

* Main: Also repaired pugs -BJS, which should start jspugs.pl.

Files:

• src/Main.hs (modified) (2 diffs)

src/Main.hs

@@ -79 +79 @@
 run ("-c":file:_)               = readFile file >>= doCheck file
 
-run ("-C":backend:args) | map toUpper backend == "JS" =
-    doHelperRun "JS" ("--compile-only":args)
+-- -CPerl5 outputs PIL formatted as Perl 5, PIL-Run is not involved.
+-- Should we rename -CPerl5, -CJSON etc. to -CPIL.Perl5, -CPIL.JSON etc.?
+run ("-C":backend:args) | map toUpper backend == "JS" = do
+    exec <- getArg0
+    doHelperRun "JS" ("--compile-only":("--pugs="++exec):args)
 run ("-C":backend:"-e":prog:_)           = doCompileDump backend "-e" prog
 run ("-C":backend:file:_)                = slurpFile file >>= doCompileDump backend file
 
-run ("-B":backend:_) | (== map toLower backend) `any` ["js","perl5"] =
-    doHelperRun backend =<< getArgs
+run ("-B":backend:_) | (== map toLower backend) `any` ["js","perl5"] = do
+    exec <- getArg0
+    args <- getArgs
+    doHelperRun backend (("--pugs="++exec):args)
 run ("-B":backend:"-e":prog:_)           = doCompileRun backend "-e" prog
 run ("-B":backend:file:_)                = slurpFile file >>= doCompileRun backend file
@@ -215 +220 @@
 doHelperRun backend args =
     case map toLower backend of
-        "js"    -> if (args == [])
+        "js"    -> if (args' == [])
                    then (doExecuteHelper [ "perl5", "PIL2JS",  "jspugs.pl"  ] [])
                    else (doExecuteHelper [ "perl5", "PIL2JS",  "runjs.pl"   ] args)
         "perl5" ->       doExecuteHelper [ "perl5", "PIL-Run", "pugs-p5.pl" ] args
         _       ->       fail ("unknown backend: " ++ backend)
+    where
+    args' = f args
+    f [] = []
+    f (bjs:rest)      | map toUpper bjs == "-BJS"       = f rest
+    f ("-B":js:rest)  | map toUpper  js == "JS"         = f rest
+    f (pugspath:rest) | "--pugs=" `isPrefixOf` pugspath = f rest
+    f (x:xs) = x:f xs
 
 doExecuteHelper :: [FilePath] -> [String] -> IO ()