Extend usage of 'CompileMode' to also accomodate 'Interactive Mode'

Author: ssoelvsten

compiler/app/Main.hs

@@ -71,9 +71,7 @@ process :: [Flag] -> Maybe String -> String -> IO ExitCode
 process flags fname input = do
   let ast    = parseProg input
 
-  let compileMode =
-        if elem LibMode flags then Export
-        else Normal
+  let compileMode = if LibMode `elem` flags then Library else Normal
 
   let verbose = Verbose `elem` flags
       noRawOpt = NoRawOpt `elem` flags
@@ -91,18 +89,15 @@ process flags fname input = do
 
       ------------------------------------------------------
       -- TROUPE (FRONTEND) ---------------------------------
-      let prog_without_dependencies =
-            case compileMode of
-                Normal -> addAmbientMethods prog_parsed
-                Export -> prog_parsed
+      let prog_without_dependencies = case compileMode of Normal -> addAmbientMethods prog_parsed
+                                                          _      -> prog_parsed
 
       prog <- (processImports) prog_without_dependencies
 
-      exports <- case compileMode of
-        Normal -> return Nothing
-        Export -> case runExcept (extractExports prog) of
-          Right es -> return (Just (es))
-          Left s -> die s
+      exports <- case compileMode of Library -> case runExcept (extractExports prog) of
+                                                     Right es -> return (Just (es))
+                                                     Left s   -> die s
+                                     _       -> return Nothing
 
       when verbose $ do printSep "SYNTAX"
                         writeFileD "out/out.syntax" (showIndent 2 prog)
@@ -167,9 +162,9 @@ process flags fname input = do
                                             (Stack.ProgramStackUnit stack)
       writeFile outPath stackjs
 
-      case exports of
-        Nothing -> return ()
-        Just es -> writeExports outPath es
+      -- case compileMode of Library -> ...
+      case exports of Nothing -> return ()
+                      Just es -> writeExports outPath es
 
       ----- EPILOGUE --------------------------------------
       when verbose printHr

compiler/src/CaseElimination.hs

@@ -21,12 +21,12 @@ import Data.List (nub, (\\))
 type Trans = Except String
 
 trans :: CompileMode -> S.Prog -> Trans T.Prog
-trans mode (S.Prog imports atms tm) = do
-  let tm' = case mode of
-              Normal ->
-                  S.Let [ S.ValDecl (S.VarPattern "authority") (S.Var "$$authorityarg") _srcRT ]
-                        tm
-              Export -> tm
+trans compileMode (S.Prog imports atms tm) = do
+  let tm' = case compileMode of
+        CompileMode.Library -> tm
+        _                   ->
+          S.Let [ S.ValDecl (S.VarPattern "authority") (S.Var "$$authorityarg") _srcRT ]
+                tm
   atms' <- transAtoms atms
   tm'' <- transTerm tm'
   return (T.Prog imports atms' tm'')
@@ -302,4 +302,4 @@ transFields = mapM $ \case
   (f, Nothing) -> return (f, T.Var f)
   (f, Just t) -> do
     t' <- transTerm t
-    return (f, t')
+    return (f, t')

compiler/src/ClosureConv.hs

@@ -224,9 +224,10 @@ cpsToIR (CPS.Halt v) = do
     (compileMode,_ , _ , _, _ ) <- ask 
     let constructor =
           case compileMode of
-              Normal -> CCIR.Ret
               -- Compiling library, then generate export instruction
-              Export -> CCIR.LibExport
+              CompileMode.Library -> CCIR.LibExport
+              -- Otherwise, keep it as a simple return
+              _                   -> CCIR.Ret
 
     return $ CCIR.BB [] $ constructor v'
 
@@ -275,8 +276,11 @@ closureConvert compileMode (CPS.Prog (C.Atoms atms) t) =
       (bb, (fdefs, _, consts_wo_levs)) = evalRWS (cpsToIR t) initEnv initState
       (argumentName, toplevel) =
          case compileMode of
-           Normal -> ("$$authorityarg", "main") -- passing authority through the argument to main 
-           Export -> ("$$dummy", "export")
+           -- Top level function of a library is named 'export'
+           CompileMode.Library     -> ("$$dummy", "export")
+           -- Passing authority through the argument to main
+           _                       -> ("$$authorityarg", "main")
+
 
       -- obs that our 'main' may have two names depending on the compilation mode; 2018-07-02; AA
       consts = (fst.unzip) consts_wo_levs

compiler/src/CompileMode.hs

@@ -1,4 +1,10 @@
 module CompileMode
   where
 
-data CompileMode = Normal | Export
+-- | Different modes of compilation.
+data CompileMode = -- | Compilation of a single file for a Troupe program
+                   Normal
+                   -- | Compiling a libary (deprecated)
+                 | Library
+                   -- | Interactive deserialization of IR
+                 | Interactive

compiler/src/IR.hs

@@ -28,7 +28,6 @@ import           Data.Serialize            (Serialize)
 import qualified Data.Serialize            as Serialize
 import           GHC.Generics              (Generic)
 
-import           CompileMode
 import           Text.PrettyPrint.HughesPJ (hsep, nest, text, vcat, ($$), (<+>))
 import qualified Text.PrettyPrint.HughesPJ as PP
 import           TroupePositionInfo

compiler/src/Raw.hs

@@ -30,7 +30,6 @@ import           Control.Monad.Writer
 import           Data.List
 import qualified Data.ByteString           as BS
 
-import           CompileMode
 import           Text.PrettyPrint.HughesPJ (hsep, nest, text, vcat, ($$), (<+>))
 import qualified Text.PrettyPrint.HughesPJ as PP
 import           TroupePositionInfo

compiler/src/Raw2Stack.hs

@@ -34,7 +34,6 @@ import qualified Data.Text as T
 import Data.Text.Encoding
 import Data.ByteString.Lazy (ByteString)
 import Data.ByteString.Base64 (encode,decode)
-import CompileMode
 import TroupePositionInfo
 import qualified Data.Aeson as Aeson
 import GHC.Generics (Generic)

compiler/src/RawDefUse.hs

@@ -39,7 +39,6 @@ import qualified Data.Text as T
 import Data.Text.Encoding
 import Data.ByteString.Lazy (ByteString)
 import Data.ByteString.Base64 (encode,decode)
-import CompileMode
 import TroupePositionInfo
 import qualified Data.Aeson as Aeson
 import GHC.Generics (Generic)

compiler/src/Stack.hs

@@ -30,7 +30,6 @@ import           Control.Monad.Writer
 import           Data.List
 import qualified Data.ByteString           as BS
 
-import           CompileMode
 import           Text.PrettyPrint.HughesPJ (hsep, nest, text, vcat, ($$), (<+>))
 import qualified Text.PrettyPrint.HughesPJ as PP
 import           TroupePositionInfo

compiler/src/Stack2JS.hs

@@ -154,8 +154,8 @@ stack2PPDoc compileMode debugMode (ProgramStackUnit sp) =
         $$ PP.rbrace
         $$ PP.text "module.exports = Top"
 
-      ppDoc = case compileMode of CompileMode.Export     -> inner
-                                  CompileMode.Normal     -> outer
+      ppDoc = case compileMode of CompileMode.Library    -> inner
+                                  _                      -> outer
   in (ppDoc, w)
 
 stack2PPDoc _           debugMode su =