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

CompState.hs

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

Main.hs

@@ -56,7 +56,7 @@ options :: [OptDescr OptFunc]
 options =
   [ Option [] ["mode"] (ReqArg optMode "MODE") "select mode (options: parse, compile, post-c)"
   , 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 ['o'] ["output"] (ReqArg optOutput "FILE") "output file (default \"-\")"
   ]
@@ -81,7 +81,7 @@ optBackend s ps
 optFrontend :: String -> OptFunc
 optFrontend s ps 
     =  do frontend <- case s of
-            "occam21" -> return FrontendOccam21
+            "occam" -> return FrontendOccam
             "rain" -> return FrontendRain
             _ -> dieIO $ "Unknown frontend: " ++ s
           return $ ps { csFrontend = frontend }
@@ -148,7 +148,7 @@ compile fn
         debug "{{{ Parse"
         progress "Parse"
         ast1 <- case csFrontend optsPS of
-          FrontendOccam21 -> parseProgram fn
+          FrontendOccam -> parseProgram fn
           FrontendRain -> parseRainProgram fn
         debugAST ast1
         debug "}}}"
@@ -161,7 +161,7 @@ compile fn
             ModeCompile ->
               do progress "Passes:"
                  ast2 <- case csFrontend optsPS of                   
-                   FrontendOccam21 -> (runPasses passes) ast1
+                   FrontendOccam -> (runPasses passes) ast1
                    --Run the rain passes, then all the normal occam passes too:
                    FrontendRain -> ((runPasses rainPasses) ast1) >>= (runPasses passes)