Changeset 2750

Timestamp:

05/05/05 22:20:07 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4271

Message:

* pugs -BParrot examples/mandel.p6

Location:

src

Files:

• Main.hs (modified) (2 diffs)
• Pugs/Embed.hs (modified) (2 diffs)
• Pugs/Run/Args.hs (modified) (3 diffs)

src/Main.hs

@@ -65 +65 @@
 run ("-c":file:_)               = readFile file >>= doCheck file
 
-run ("-C":backend:"-e":prog:_)           = doCompile backend "-e" prog
-run ("-C":backend:file:_)                = readFile file >>= doCompile backend file
+run ("-C":backend:"-e":prog:_)           = doCompileDump backend "-e" prog
+run ("-C":backend:file:_)                = readFile file >>= doCompileDump backend file
+
+run ("-B":backend:"-e":prog:_)           = doCompileRun backend "-e" prog
+run ("-B":backend:file:_)                = readFile file >>= doCompileRun backend file
+
 run ("--external":mod:"-e":prog:_)    = doExternal mod "-e" prog
 run ("--external":mod:file:_)         = readFile file >>= doExternal mod file
@@ -130 +134 @@
     putStrLn str
 
-doCompile :: [Char] -> FilePath -> String -> IO ()
+doCompile :: [Char] -> FilePath -> String -> IO String
 doCompile backend = doParseWith $ \env _ -> do
     globRef <- liftSTM $ do
         glob <- readTVar $ envGlobal env
         newTVar $ userDefined glob
-    str     <- compile backend env{ envGlobal = globRef }
+    compile backend env{ envGlobal = globRef }
+
+doCompileDump :: [Char] -> FilePath -> String -> IO ()
+doCompileDump backend file prog = do
+    str <- doCompile backend file prog
     writeFile "dump.ast" str
+
+doCompileRun :: [Char] -> FilePath -> String -> IO ()
+doCompileRun backend file prog = do
+    str <- doCompile backend file prog
+    evalEmbedded backend str
 
 doParseWith :: (Env -> FilePath -> IO a) -> FilePath -> String -> IO a

src/Pugs/Embed.hs

@@ -14 +14 @@
     module Pugs.Embed.Haskell,
     module Pugs.Embed.Parrot,
+    evalEmbedded
     -- module Pugs.Embed.Ponie,
 ) where
@@ -21 +22 @@
 -- import Pugs.Embed.Ponie
 
+evalEmbedded "Parrot"  code = do
+    evalParrot code
+evalEmbedded "Haskell" code = do
+    evalHaskell code
+    return ()
+evalEmbedded "Perl5" code = do
+    interp <- initPerl5 ""
+    evalPerl5 code
+    freePerl5 interp
+evalEmbedded s _ = fail $ "Cannot evaluate in " ++ s

src/Pugs/Run/Args.hs

@@ -59 +59 @@
 longOptions = [("--help", "-h"), ("--version", "-v")]
 composable = "cdlnpw"
-withParam = ["e", "C", "I", "M", "V:"]
+withParam = words "e C B I M V:"
 prefixOpt opt = msum $ map (findArg opt) withParam
 findArg arg prefix = do
@@ -93 +93 @@
 argRank(Switch 'c')         = 3
 argRank(Opt "-C" _)         = 4
+argRank(Opt "-B" _)         = 4
 argRank(Opt "--external" _) = 5
 argRank(Opt "-M" _)         = 98
@@ -110 +111 @@
 gatherArgs("-M":mod:rest)         = [Opt "-M" mod] ++ gatherArgs(rest)
 gatherArgs("-C":backend:rest)     = [Opt "-C" backend] ++ gatherArgs(rest)
+gatherArgs("-B":backend:rest)     = [Opt "-B" backend] ++ gatherArgs(rest)
 gatherArgs("-V:":item:rest)       = [Opt "-V:" item] ++ gatherArgs(rest)
 gatherArgs(('-':[]):xs)           = [File "-"] ++ gatherArgs(xs)