refactoring

2 files changed, 7 insertions, 5 deletions

diff --git a/src/LambdaCube/Compiler/CGExp.hs b/src/LambdaCube/Compiler/CGExp.hs
index 21a02e8d..b2f19c9f 100644
--- a/src/LambdaCube/Compiler/CGExp.hs
+++ b/src/LambdaCube/Compiler/CGExp.hs
@@ -214,7 +214,7 @@ pattern TCon0 n = A0 n
 pattern TCon t n = Con (n, t) []
 
 pattern TUnit  <- A0 "Tuple0"
-pattern TBool  <- A0 "Bool"
+pattern TBool  = A0 "Bool"
 pattern TWord  <- A0 "Word"
 pattern TInt   <- A0 "Int"
 pattern TNat   = A0 "Nat"
@@ -270,3 +270,7 @@ getSwizzChar = \case
     A0 "Sw" -> Just 'w'
     _ -> Nothing
 
+outputType = TCon0 "Output"
+boolType = TBool
+trueExp = TCon TBool "True"
+
diff --git a/src/LambdaCube/Compiler/Driver.hs b/src/LambdaCube/Compiler/Driver.hs
index 46b25148..68ec34dd 100644
--- a/src/LambdaCube/Compiler/Driver.hs
+++ b/src/LambdaCube/Compiler/Driver.hs
@@ -11,6 +11,7 @@ module LambdaCube.Compiler.Driver
     , Infos
     , showRange
     , ErrorMsg(..)
+    , Exp
     ) where
 
 import Data.List
@@ -32,7 +33,7 @@ import Debug.Trace
 
 import LambdaCube.Compiler.Pretty hiding ((</>))
 import LambdaCube.Compiler.Infer (Info, Infos, ErrorMsg(..), showRange, PolyEnv(..), Export(..), ModuleR(..), ErrorT, throwErrorTCM, parseLC, joinPolyEnvs, inference_)
-import LambdaCube.Compiler.CGExp
+import LambdaCube.Compiler.CGExp (Exp, toExp, outputType)
 import IR
 import qualified LambdaCube.Compiler.CoreToIR as IR
 
@@ -147,9 +148,6 @@ getDef m d ty = do
       , infos pe
       )
 
-outputType :: Exp
-outputType = TCon TType "Output"
-
 parseAndToCoreMain m = either (throwErrorTCM . text) return . (\(e, i) -> flip (,) i <$> e) =<< getDef m "main" (Just outputType)
 
 compileMain_ :: MonadMask m => PolyEnv -> ModuleFetcher (MMT m) -> IR.Backend -> FilePath -> MName -> m (Err (IR.Pipeline, Infos))