Added a command line option to indicate that there is no main PROC

Main.hs

@@ -69,6 +69,7 @@ optionsNoWarnings =
   , Option [] ["run-indent"] (NoArg $ optRunIndent) "run indent on source before compilation (will full mode)"
   , Option [] ["frontend"] (ReqArg optFrontend "FRONTEND") "language frontend (options: occam, rain)"
   , Option [] ["mode"] (ReqArg optMode "MODE") "select mode (options: flowgraph, lex, html, parse, compile, post-c, full)"
+  , Option [] ["no-main"] (NoArg optNoMain) "file has no main process; do not link either"
   , Option ['o'] ["output"] (ReqArg optOutput "FILE") "output file (default \"-\")"
   , Option [] ["sanity-check"] (ReqArg optSanityCheck "SETTING") "internal sanity check (options: on, off)"
   , Option [] ["occam2-mobility"] (ReqArg optClassicOccamMobility "SETTING") "occam2 implicit mobility (EXPERIMENTAL) (options: on, off)"
@@ -132,6 +133,9 @@ optKeepTemporaries ps = return $ ps { csKeepTemporaries = True }
 optRunIndent :: OptFunc
 optRunIndent ps = return $ ps { csRunIndent = True }
 
+optNoMain :: OptFunc
+optNoMain ps = return $ ps { csHasMain = False }
+
 optStackSize :: String -> OptFunc
 optStackSize s ps = return $ ps { csUnknownStackSize = read s }
 
@@ -261,6 +265,8 @@ compileFull inputFile moutputFile
           when (csRunIndent optsPS) $
             exec $ "indent " ++ cFile
 
+          shouldLink <- lift getCompState >>* csHasMain
+
           case csBackend optsPS of
             BackendC ->
               let sFile = outputFile ++ ".s"
@@ -280,6 +286,7 @@ compileFull inputFile moutputFile
                  -- Compile this new "post" C file into an object file
                  exec $ cCommand postCFile postOFile (csCompilerFlags optsPS)
                  -- Link the object files into a binary
+                 when shouldLink $
                    exec $ cLinkCommand [oFile, postOFile] outputFile (csCompilerLinkFlags optsPS)
 
             -- For C++, just compile the source file directly into a binary

backends/GenerateC.hs

@@ -163,10 +163,6 @@ cgenTopLevel headerName s
     =  do tell ["#define occam_INT_size ", show cIntSize,"\n"]
           tell ["#include <tock_support_cif.h>\n"]
           cs <- getCompState
-          (tlpName, tlpChans) <- tlpInterface
-          chans <- sequence [csmLift $ makeNonce "tlp_channel" | _ <- tlpChans]
-          killChans <- sequence [csmLift $ makeNonce "tlp_channel_kill" | _ <- tlpChans]
-          workspaces <- sequence [csmLift $ makeNonce "tlp_channel_ws" | _ <- tlpChans]
 
           tellToHeader $ sequence_ $ map (call genForwardDeclaration)
                                        (listify (const True :: A.Specification -> Bool) s)
@@ -179,6 +175,9 @@ cgenTopLevel headerName s
                                     {A.ndName = n
                                     ,A.ndSpecType=A.Proc _ (_,A.Recursive) _ _
                                     } <- Map.elems $ csNames cs]]
+
+          when (csHasMain cs) $ do
+            (tlpName, tlpChans) <- tlpInterface
             tell ["extern int "]
             genName tlpName
             tell ["_stack_size;\n"]
@@ -189,6 +188,13 @@ cgenTopLevel headerName s
 
           call genStructured s (\m _ -> tell ["\n#error Invalid top-level item: ", show m])
 
+          when (csHasMain cs) $ do
+            (tlpName, tlpChans) <- tlpInterface
+            chans <- sequence [csmLift $ makeNonce "tlp_channel" | _ <- tlpChans]
+            killChans <- sequence [csmLift $ makeNonce "tlp_channel_kill" | _ <- tlpChans]
+            workspaces <- sequence [csmLift $ makeNonce "tlp_channel_ws" | _ <- tlpChans]
+
+
             tell ["void tock_main (Workspace wptr) {\n"]
             sequence_ [do tell ["    Channel ", c, ";\n"]
                           tell ["    ChanInit (wptr, &", c, ");\n"]

data/CompState.hs

@@ -98,6 +98,7 @@ data CompState = CompState {
     csMode :: CompMode,
     csBackend :: CompBackend,
     csFrontend :: CompFrontend,
+    csHasMain :: Bool,
     csCompilerFlags :: String,
     csCompilerLinkFlags :: String,
     csSanityCheck :: Bool,
@@ -147,6 +148,7 @@ emptyState = CompState {
     csMode = ModeFull,
     csBackend = BackendC,
     csFrontend = FrontendOccam,
+    csHasMain = True,
     csCompilerFlags = "",
     csCompilerLinkFlags = "",
     csSanityCheck = False,

frontends/PreprocessOccam.hs

@@ -191,14 +191,14 @@ handleUse m [modName]
           put $ cs { csUsedFiles = Set.insert incName (csUsedFiles cs) }
           if Set.member incName (csUsedFiles cs)
             then return return
-            else handleInclude m [incName]
+            else handleInclude m [incName ++ ".inc"]
   where
-    -- | If a module name doesn't already have a suffix, add one.
+    -- | If a module name has a suffix, strip it
     mangleModName :: String -> String
     mangleModName mod
         = if ".occ" `isSuffixOf` mod || ".inc" `isSuffixOf` mod
-            then mod
-            else mod ++ ".occ"
+            then (reverse . drop 4 . reverse) mod
+            else mod
 
 -- | Handle the @#DEFINE@ directive.
 handleDefine :: DirectiveFunc