suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On Adam's suggestion, renamed the occam 2.1 frontend to simply occam

Browse Source
This commit is contained in:
Neil Brown 2007-08-20 22:37:21 +00:00
parent bd0af91813
commit 30816b60ac
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CompState.hs
View File

@ -37,7 +37,7 @@ data CompBackend = BackendC | BackendCPPCSP
deriving (Show, Data, Typeable) deriving (Show, Data, Typeable)
-- | Frontends that Tock can use. -- | Frontends that Tock can use.
data CompFrontend = FrontendOccam21 | FrontendRain data CompFrontend = FrontendOccam | FrontendRain
deriving (Show, Data, Typeable) deriving (Show, Data, Typeable)
-- | State necessary for compilation. -- | State necessary for compilation.
@ -81,7 +81,7 @@ emptyState :: CompState
emptyState = CompState { emptyState = CompState {
csMode = ModeCompile, csMode = ModeCompile,
csBackend = BackendC, csBackend = BackendC,
csFrontend = FrontendOccam21, csFrontend = FrontendOccam,
csVerboseLevel = 0, csVerboseLevel = 0,
csOutputFile = "-", csOutputFile = "-",

8
Main.hs
View File

@ -56,7 +56,7 @@ options :: [OptDescr OptFunc]
options = options =
[ Option [] ["mode"] (ReqArg optMode "MODE") "select mode (options: parse, compile, post-c)" [ Option [] ["mode"] (ReqArg optMode "MODE") "select mode (options: parse, compile, post-c)"
, Option [] ["backend"] (ReqArg optBackend "BACKEND") "code-generating backend (options: c, cppcsp)" , Option [] ["backend"] (ReqArg optBackend "BACKEND") "code-generating backend (options: c, cppcsp)"
, Option [] ["frontend"] (ReqArg optFrontend "FRONTEND") "language frontend (options: occam21, rain)" , Option [] ["frontend"] (ReqArg optFrontend "FRONTEND") "language frontend (options: occam, rain)"
, Option ['v'] ["verbose"] (NoArg $ optVerbose) "be more verbose (use multiple times for more detail)" , Option ['v'] ["verbose"] (NoArg $ optVerbose) "be more verbose (use multiple times for more detail)"
, Option ['o'] ["output"] (ReqArg optOutput "FILE") "output file (default \"-\")" , Option ['o'] ["output"] (ReqArg optOutput "FILE") "output file (default \"-\")"
] ]
@ -81,7 +81,7 @@ optBackend s ps
optFrontend :: String -> OptFunc optFrontend :: String -> OptFunc
optFrontend s ps optFrontend s ps
= do frontend <- case s of = do frontend <- case s of
"occam21" -> return FrontendOccam21 "occam" -> return FrontendOccam
"rain" -> return FrontendRain "rain" -> return FrontendRain
_ -> dieIO $ "Unknown frontend: " ++ s _ -> dieIO $ "Unknown frontend: " ++ s
return $ ps { csFrontend = frontend } return $ ps { csFrontend = frontend }
@ -148,7 +148,7 @@ compile fn
debug "{{{ Parse" debug "{{{ Parse"
progress "Parse" progress "Parse"
ast1 <- case csFrontend optsPS of ast1 <- case csFrontend optsPS of
FrontendOccam21 -> parseProgram fn FrontendOccam -> parseProgram fn
FrontendRain -> parseRainProgram fn FrontendRain -> parseRainProgram fn
debugAST ast1 debugAST ast1
debug "}}}" debug "}}}"
@ -161,7 +161,7 @@ compile fn
ModeCompile -> ModeCompile ->
do progress "Passes:" do progress "Passes:"
ast2 <- case csFrontend optsPS of ast2 <- case csFrontend optsPS of
FrontendOccam21 -> (runPasses passes) ast1 FrontendOccam -> (runPasses passes) ast1
--Run the rain passes, then all the normal occam passes too: --Run the rain passes, then all the normal occam passes too:
FrontendRain -> ((runPasses rainPasses) ast1) >>= (runPasses passes) FrontendRain -> ((runPasses rainPasses) ast1) >>= (runPasses passes)