\begin{code}
module HscMain
( newHscEnv, hscCmmFile
- , hscFileCheck
, hscParseIdentifier
+ , hscSimplify
+ , evalComp
+ , hscNormalIface, hscWriteIface, hscOneShot
+ , CompState (..)
#ifdef GHCI
, hscStmt, hscTcExpr, hscKcType
, compileExpr
, hscCompileInteractive -- :: Compiler (InteractiveStatus, ModIface, ModDetails)
, HscStatus (..)
, InteractiveStatus (..)
- , HscChecked (..)
- ) where
-#include "HsVersions.h"
+ -- The new interface
+ , parseFile
+ , typecheckModule'
+ , typecheckRenameModule
+ , deSugarModule
+ , makeSimpleIface
+ , makeSimpleDetails
+ ) where
#ifdef GHCI
-import HsSyn ( Stmt(..), LStmt, LHsType )
import CodeOutput ( outputForeignStubs )
import ByteCodeGen ( byteCodeGen, coreExprToBCOs )
import Linker ( HValue, linkExpr )
import CoreTidy ( tidyExpr )
import CorePrep ( corePrepExpr )
-import Flattening ( flattenExpr )
import Desugar ( deSugarExpr )
import SimplCore ( simplifyExpr )
import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnType )
import {- Kind parts of -} Type ( Kind )
import CoreLint ( lintUnfolding )
import DsMeta ( templateHaskellNames )
-import SrcLoc ( SrcSpan, noSrcLoc, interactiveSrcLoc, srcLocSpan )
+import SrcLoc ( SrcSpan, noSrcLoc, interactiveSrcLoc, srcLocSpan, noSrcSpan )
import VarSet
import VarEnv ( emptyTidyEnv )
#endif
-import Var ( Id )
+import Id ( Id )
import Module ( emptyModuleEnv, ModLocation(..), Module )
-import RdrName ( GlobalRdrEnv, RdrName, emptyGlobalRdrEnv )
-import HsSyn ( HsModule, LHsBinds, HsGroup, LIE, LImportDecl, HsDoc,
- HaddockModInfo )
+import RdrName
+import HsSyn
import CoreSyn
import SrcLoc ( Located(..) )
import StringBuffer
import Parser
import Lexer
import SrcLoc ( mkSrcLoc )
-import TcRnDriver ( tcRnModule, tcRnExtCore )
+import TcRnDriver ( tcRnModule )
import TcIface ( typecheckIface )
import TcRnMonad ( initIfaceCheck, TcGblEnv(..) )
import IfaceEnv ( initNameCache )
import LoadIface ( ifaceStats, initExternalPackageState )
import PrelInfo ( wiredInThings, basicKnownKeyNames )
-import MkIface ( checkOldIface, mkIface, writeIfaceFile )
+import MkIface
import Desugar ( deSugar )
import SimplCore ( core2core )
-import TidyPgm ( tidyProgram, mkBootModDetails )
+import TidyPgm
import CorePrep ( corePrepPgm )
import CoreToStg ( coreToStg )
import StgSyn
import CmmCPS
import CmmCPSZ
import CmmInfo
+import OptimizationFuel ( initOptFuelState )
import CmmCvt
import CmmTx
import CmmContFlowOpt
import HscStats ( ppSourceStats )
import HscTypes
import MkExternalCore ( emitExternalCore )
-import ParserCore
-import ParserCoreUtils
import FastString
-import UniqFM ( emptyUFM )
+import LazyUniqFM ( emptyUFM )
import UniqSupply ( initUs_ )
-import Bag ( unitBag )
+import Bag ( unitBag, emptyBag, unionBags )
+import Exception
+import MonadUtils
import Control.Monad
import System.Exit
import System.IO
import Data.IORef
\end{code}
+#include "HsVersions.h"
%************************************************************************
; us <- mkSplitUniqSupply 'r'
; nc_var <- newIORef (initNameCache us knownKeyNames)
; fc_var <- newIORef emptyUFM
- ; mlc_var <- newIORef emptyModuleEnv
+ ; mlc_var <- newIORef emptyModuleEnv
+ ; optFuel <- initOptFuelState
; return (HscEnv { hsc_dflags = dflags,
hsc_targets = [],
hsc_mod_graph = [],
- hsc_IC = emptyInteractiveContext,
- hsc_HPT = emptyHomePackageTable,
- hsc_EPS = eps_var,
- hsc_NC = nc_var,
- hsc_FC = fc_var,
- hsc_MLC = mlc_var,
+ hsc_IC = emptyInteractiveContext,
+ hsc_HPT = emptyHomePackageTable,
+ hsc_EPS = eps_var,
+ hsc_NC = nc_var,
+ hsc_FC = fc_var,
+ hsc_MLC = mlc_var,
+ hsc_OptFuel = optFuel,
+ hsc_type_env_var = Nothing,
hsc_global_rdr_env = emptyGlobalRdrEnv,
hsc_global_type_env = emptyNameEnv } ) }
\end{code}
+\begin{code}
+-- | parse a file, returning the abstract syntax
+parseFile :: GhcMonad m => HscEnv -> ModSummary -> m (Located (HsModule RdrName))
+parseFile hsc_env mod_summary = do
+ maybe_parsed <- liftIO $ myParseModule dflags hspp_file hspp_buf
+ case maybe_parsed of
+ Left err -> do throw (mkSrcErr (unitBag err))
+ Right rdr_module
+ -> return rdr_module
+ where
+ dflags = hsc_dflags hsc_env
+ hspp_file = ms_hspp_file mod_summary
+ hspp_buf = ms_hspp_buf mod_summary
+
+-- | Rename and typecheck a module
+typecheckModule' :: GhcMonad m =>
+ HscEnv -> ModSummary -> Located (HsModule RdrName)
+ -> m TcGblEnv
+typecheckModule' hsc_env mod_summary rdr_module = do
+ r <- {-# SCC "Typecheck-Rename" #-}
+ ioMsgMaybe $ tcRnModule hsc_env (ms_hsc_src mod_summary) False rdr_module
+ return r
+
+-- XXX: should this really be a Maybe X? Check under which circumstances this
+-- can become a Nothing and decide whether this should instead throw an
+-- exception/signal an error.
+type RenamedStuff =
+ (Maybe (HsGroup Name, [LImportDecl Name], Maybe [LIE Name],
+ Maybe (HsDoc Name), HaddockModInfo Name))
+
+-- | Rename and typecheck a module, additionally returning the renamed syntax
+typecheckRenameModule
+ :: GhcMonad m =>
+ HscEnv -> ModSummary -> Located (HsModule RdrName)
+ -> m (TcGblEnv, RenamedStuff)
+typecheckRenameModule hsc_env mod_summary rdr_module = do
+ tc_result
+ <- {-# SCC "Typecheck-Rename" #-}
+ ioMsgMaybe $ tcRnModule hsc_env (ms_hsc_src mod_summary) True rdr_module
+
+ let rn_info = do decl <- tcg_rn_decls tc_result
+ imports <- tcg_rn_imports tc_result
+ let exports = tcg_rn_exports tc_result
+ let doc = tcg_doc tc_result
+ let hmi = tcg_hmi tc_result
+ return (decl,imports,exports,doc,hmi)
+
+ return (tc_result, rn_info)
+
+-- | Convert a typechecked module to Core
+deSugarModule :: GhcMonad m => HscEnv -> ModSummary -> TcGblEnv -> m ModGuts
+deSugarModule hsc_env mod_summary tc_result = do
+ ioMsgMaybe $ deSugar hsc_env (ms_location mod_summary) tc_result
+
+-- | Make a 'ModIface' from the results of typechecking. Used when
+-- not optimising, and the interface doesn't need to contain any
+-- unfoldings or other cross-module optimisation info.
+-- ToDo: the old interface is only needed to get the version numbers,
+-- we should use fingerprint versions instead.
+makeSimpleIface :: HscEnv -> Maybe ModIface -> TcGblEnv -> ModDetails
+ -> IO (ModIface,Bool)
+makeSimpleIface hsc_env maybe_old_iface tc_result details = do
+ mkIfaceTc hsc_env (fmap mi_iface_hash maybe_old_iface) details tc_result
+
+-- | Make a 'ModDetails' from the results of typechecking. Used when
+-- typechecking only, as opposed to full compilation.
+makeSimpleDetails :: HscEnv -> TcGblEnv -> IO ModDetails
+makeSimpleDetails hsc_env tc_result = mkBootModDetailsTc hsc_env tc_result
+
+-- deSugarModule :: HscEnv -> TcGblEnv -> IO Core
+\end{code}
+
%************************************************************************
%* *
The main compiler pipeline
\begin{code}
-data HscChecked
- = HscChecked
- -- parsed
- (Located (HsModule RdrName))
- -- renamed
- (Maybe (HsGroup Name, [LImportDecl Name], Maybe [LIE Name],
- Maybe (HsDoc Name), HaddockModInfo Name))
- -- typechecked
- (Maybe (LHsBinds Id, GlobalRdrEnv, ModDetails))
- -- desugared
- (Maybe [CoreBind])
-
-- Status of a compilation to hard-code or nothing.
data HscStatus
= HscNoRecomp
-- I want Control.Monad.State! --Lemmih 03/07/2006
-newtype Comp a = Comp {runComp :: CompState -> IO (a, CompState)}
+newtype Comp a = Comp {runComp :: CompState -> IORef Messages -> IO (a, CompState)}
instance Monad Comp where
- g >>= fn = Comp $ \s -> runComp g s >>= \(a,s') -> runComp (fn a) s'
- return a = Comp $ \s -> return (a,s)
+ g >>= fn = Comp $ \s r -> runComp g s r >>= \(a,s') -> runComp (fn a) s' r
+ return a = Comp $ \s _ -> return (a,s)
fail = error
-evalComp :: Comp a -> CompState -> IO a
-evalComp comp st = do (val,_st') <- runComp comp st
- return val
+evalComp :: Comp a -> CompState -> IO (Messages, a)
+evalComp comp st = do r <- newIORef emptyMessages
+ (val,_st') <- runComp comp st r
+ msgs <- readIORef r
+ return (msgs, val)
+
+logMsgs :: Messages -> Comp ()
+logMsgs (warns', errs') = Comp $ \s r -> do
+ (warns, errs) <- readIORef r
+ writeIORef r $! ( warns' `unionBags` warns
+ , errs' `unionBags` errs )
+ return ((), s)
data CompState
= CompState
}
get :: Comp CompState
-get = Comp $ \s -> return (s,s)
+get = Comp $ \s _ -> return (s,s)
modify :: (CompState -> CompState) -> Comp ()
-modify f = Comp $ \s -> return ((), f s)
+modify f = Comp $ \s _ -> return ((), f s)
gets :: (CompState -> a) -> Comp a
gets getter = do st <- get
return (getter st)
-liftIO :: IO a -> Comp a
-liftIO ioA = Comp $ \s -> do a <- ioA
- return (a,s)
+instance MonadIO Comp where
+ liftIO ioA = Comp $ \s _ -> do a <- ioA; return (a,s)
type NoRecomp result = ModIface -> Comp result
-- FIXME: The old interface and module index are only using in 'batch' and
-- 'interactive' mode. They should be removed from 'oneshot' mode.
-type Compiler result = HscEnv
+type Compiler result = GhcMonad m =>
+ HscEnv
-> ModSummary
-> Bool -- True <=> source unchanged
-> Maybe ModIface -- Old interface, if available
-> Maybe (Int,Int) -- Just (i,n) <=> module i of n (for msgs)
- -> IO (Maybe result)
-
-
--- This functions checks if recompilation is necessary and
--- then combines the FrontEnd and BackEnd to a working compiler.
-hscMkCompiler :: NoRecomp result -- What to do when recompilation isn't required.
- -> (Maybe (Int,Int) -> Bool -> Comp ())
- -> Comp (Maybe ModGuts) -- Front end
- -> (ModGuts -> Comp result) -- Backend.
- -> Compiler result
-hscMkCompiler norecomp messenger frontend backend
- hsc_env mod_summary source_unchanged
- mbOldIface mbModIndex
- = flip evalComp (CompState hsc_env mod_summary mbOldIface) $
- do (recomp_reqd, mbCheckedIface)
- <- {-# SCC "checkOldIface" #-}
- liftIO $ checkOldIface hsc_env mod_summary
- source_unchanged mbOldIface
- -- save the interface that comes back from checkOldIface.
- -- In one-shot mode we don't have the old iface until this
- -- point, when checkOldIface reads it from the disk.
- modify (\s -> s{ compOldIface = mbCheckedIface })
- case mbCheckedIface of
- Just iface | not recomp_reqd
- -> do messenger mbModIndex False
- result <- norecomp iface
- return (Just result)
- _otherwise
- -> do messenger mbModIndex True
- mbCore <- frontend
- case mbCore of
- Nothing
- -> return Nothing
- Just core
- -> do result <- backend core
- return (Just result)
+ -> m result
--------------------------------------------------------------
-- Compilers
-- Compile Haskell, boot and extCore in OneShot mode.
hscCompileOneShot :: Compiler HscStatus
-hscCompileOneShot
- = hscCompiler norecompOneShot oneShotMsg backend boot_backend
+hscCompileOneShot hsc_env mod_summary src_changed mb_old_iface mb_i_of_n
+ = do
+ -- One-shot mode needs a knot-tying mutable variable for interface files.
+ -- See TcRnTypes.TcGblEnv.tcg_type_env_var.
+ type_env_var <- liftIO $ newIORef emptyNameEnv
+ let
+ mod = ms_mod mod_summary
+ hsc_env' = hsc_env{ hsc_type_env_var = Just (mod, type_env_var) }
+ ---
+ hscCompilerOneShot' hsc_env' mod_summary src_changed mb_old_iface mb_i_of_n
+
+hscCompilerOneShot' :: Compiler HscStatus
+hscCompilerOneShot'
+ = hscCompiler norecompOneShot oneShotMsg (genComp backend boot_backend)
where
backend inp = hscSimplify inp >>= hscNormalIface >>= hscWriteIface >>= hscOneShot
- boot_backend inp = hscSimpleIface inp >>= hscWriteIface >> return (HscRecomp False)
+ boot_backend inp = hscSimpleIface inp >>= hscWriteIface >> return (Just (HscRecomp False))
-- Compile Haskell, boot and extCore in batch mode.
hscCompileBatch :: Compiler (HscStatus, ModIface, ModDetails)
hscCompileBatch
- = hscCompiler norecompBatch batchMsg backend boot_backend
+ = hscCompiler norecompBatch batchMsg (genComp backend boot_backend)
where
backend inp = hscSimplify inp >>= hscNormalIface >>= hscWriteIface >>= hscBatch
boot_backend inp = hscSimpleIface inp >>= hscWriteIface >>= hscNothing
--- Type-check Haskell, boot and extCore.
--- Does it make sense to compile extCore to nothing?
-hscCompileNothing :: Compiler (HscStatus, ModIface, ModDetails)
-hscCompileNothing
- = hscCompiler norecompBatch batchMsg backend backend
- where
- backend inp = hscSimpleIface inp >>= hscIgnoreIface >>= hscNothing
-
-- Compile Haskell, extCore to bytecode.
hscCompileInteractive :: Compiler (InteractiveStatus, ModIface, ModDetails)
hscCompileInteractive
- = hscCompiler norecompInteractive batchMsg backend boot_backend
+ = hscCompiler norecompInteractive batchMsg (genComp backend boot_backend)
where
backend inp = hscSimplify inp >>= hscNormalIface >>= hscIgnoreIface >>= hscInteractive
- boot_backend = panic "hscCompileInteractive: can't do boot files here"
+ boot_backend _ = panic "hscCompileInteractive: HsBootFile"
+-- Type-check Haskell and .hs-boot only (no external core)
+hscCompileNothing :: Compiler (HscStatus, ModIface, ModDetails)
+hscCompileNothing
+ = hscCompiler norecompBatch batchMsg comp
+ where
+ backend tc = hscSimpleIface tc >>= hscIgnoreIface >>= hscNothing
+
+ comp = do -- genComp doesn't fit here, because we want to omit
+ -- desugaring and for the backend to take a TcGblEnv
+ mod_summary <- gets compModSummary
+ case ms_hsc_src mod_summary of
+ ExtCoreFile -> panic "hscCompileNothing: cannot do external core"
+ _other -> do
+ mb_tc <- hscFileFrontEnd
+ case mb_tc of
+ Nothing -> return Nothing
+ Just tc_result -> backend tc_result
+
hscCompiler
- :: NoRecomp result -- No recomp necessary
- -> (Maybe (Int,Int) -> Bool -> Comp ()) -- Message callback
- -> (ModGuts -> Comp result) -- Compile normal file
- -> (ModGuts -> Comp result) -- Compile boot file
+ :: NoRecomp result -- No recomp necessary
+ -> (Maybe (Int,Int) -> Bool -> Comp ()) -- Message callback
+ -> Comp (Maybe result)
-> Compiler result
-hscCompiler norecomp msg nonBootComp bootComp hsc_env mod_summary =
- hscMkCompiler norecomp msg frontend backend hsc_env mod_summary
- where
- (frontend,backend)
- = case ms_hsc_src mod_summary of
- ExtCoreFile -> (hscCoreFrontEnd, nonBootComp)
- HsSrcFile -> (hscFileFrontEnd, nonBootComp)
- HsBootFile -> (hscFileFrontEnd, bootComp)
+hscCompiler norecomp messenger recomp hsc_env mod_summary
+ source_unchanged mbOldIface mbModIndex
+ = ioMsgMaybe $
+ flip evalComp (CompState hsc_env mod_summary mbOldIface) $
+ do (recomp_reqd, mbCheckedIface)
+ <- {-# SCC "checkOldIface" #-}
+ liftIO $ checkOldIface hsc_env mod_summary
+ source_unchanged mbOldIface
+ -- save the interface that comes back from checkOldIface.
+ -- In one-shot mode we don't have the old iface until this
+ -- point, when checkOldIface reads it from the disk.
+ modify (\s -> s{ compOldIface = mbCheckedIface })
+ case mbCheckedIface of
+ Just iface | not recomp_reqd
+ -> do messenger mbModIndex False
+ result <- norecomp iface
+ return (Just result)
+ _otherwise
+ -> do messenger mbModIndex True
+ recomp
+
+-- the usual way to build the Comp (Maybe result) to pass to hscCompiler
+genComp :: (ModGuts -> Comp (Maybe a))
+ -> (TcGblEnv -> Comp (Maybe a))
+ -> Comp (Maybe a)
+genComp backend boot_backend = do
+ mod_summary <- gets compModSummary
+ case ms_hsc_src mod_summary of
+ ExtCoreFile -> do
+ panic "GHC does not currently support reading External Core files"
+ _not_core -> do
+ mb_tc <- hscFileFrontEnd
+ case mb_tc of
+ Nothing -> return Nothing
+ Just tc_result ->
+ case ms_hsc_src mod_summary of
+ HsBootFile -> boot_backend tc_result
+ _other -> do
+ mb_guts <- hscDesugar tc_result
+ case mb_guts of
+ Nothing -> return Nothing
+ Just guts -> backend guts
--------------------------------------------------------------
-- NoRecomp handlers
norecompWorker :: a -> Bool -> NoRecomp (a, ModIface, ModDetails)
norecompWorker a _isInterp old_iface
= do hsc_env <- gets compHscEnv
- _mod_summary <- gets compModSummary
liftIO $ do
new_details <- {-# SCC "tcRnIface" #-}
initIfaceCheck hsc_env $
--------------------------------------------------------------
-- FrontEnds
--------------------------------------------------------------
-
-hscCoreFrontEnd :: Comp (Maybe ModGuts)
-hscCoreFrontEnd =
- do hsc_env <- gets compHscEnv
- mod_summary <- gets compModSummary
- liftIO $ do
- -------------------
- -- PARSE
- -------------------
- inp <- readFile (ms_hspp_file mod_summary)
- case parseCore inp 1 of
- FailP s
- -> do errorMsg (hsc_dflags hsc_env) (text s{-ToDo: wrong-})
- return Nothing
- OkP rdr_module
- -------------------
- -- RENAME and TYPECHECK
- -------------------
- -> do (tc_msgs, maybe_tc_result) <- {-# SCC "TypeCheck" #-}
- tcRnExtCore hsc_env rdr_module
- printErrorsAndWarnings (hsc_dflags hsc_env) tc_msgs
- case maybe_tc_result of
- Nothing -> return Nothing
- Just mod_guts -> return (Just mod_guts) -- No desugaring to do!
-
-
-hscFileFrontEnd :: Comp (Maybe ModGuts)
+hscFileFrontEnd :: Comp (Maybe TcGblEnv)
hscFileFrontEnd =
do hsc_env <- gets compHscEnv
mod_summary <- gets compModSummary
- liftIO $ do
+
-------------------
-- PARSE
-------------------
let dflags = hsc_dflags hsc_env
hspp_file = ms_hspp_file mod_summary
hspp_buf = ms_hspp_buf mod_summary
- maybe_parsed <- myParseModule dflags hspp_file hspp_buf
+ maybe_parsed <- liftIO $ myParseModule dflags hspp_file hspp_buf
case maybe_parsed of
Left err
- -> do printBagOfErrors dflags (unitBag err)
+ -> do logMsgs (emptyBag, unitBag err)
return Nothing
Right rdr_module
-------------------
-------------------
-> do (tc_msgs, maybe_tc_result)
<- {-# SCC "Typecheck-Rename" #-}
- tcRnModule hsc_env (ms_hsc_src mod_summary) False rdr_module
- printErrorsAndWarnings dflags tc_msgs
- case maybe_tc_result of
- Nothing
- -> return Nothing
- Just tc_result
- -------------------
- -- DESUGAR
- -------------------
- -> {-# SCC "DeSugar" #-} deSugar hsc_env (ms_location mod_summary) tc_result
+ liftIO $ tcRnModule hsc_env (ms_hsc_src mod_summary)
+ False rdr_module
+ logMsgs tc_msgs
+ return maybe_tc_result
+
+--------------------------------------------------------------
+-- Desugaring
+--------------------------------------------------------------
+
+hscDesugar :: TcGblEnv -> Comp (Maybe ModGuts)
+hscDesugar tc_result
+ = do mod_summary <- gets compModSummary
+ hsc_env <- gets compHscEnv
+
+ -------------------
+ -- DESUGAR
+ -------------------
+ (msgs, ds_result)
+ <- {-# SCC "DeSugar" #-}
+ liftIO $ deSugar hsc_env (ms_location mod_summary) tc_result
+ logMsgs msgs
+ return ds_result
--------------------------------------------------------------
-- Simplifiers
-- HACK: we return ModGuts even though we know it's not gonna be used.
-- We do this because the type signature needs to be identical
-- in structure to the type of 'hscNormalIface'.
-hscSimpleIface :: ModGuts -> Comp (ModIface, Bool, ModDetails, ModGuts)
-hscSimpleIface ds_result
+hscSimpleIface :: TcGblEnv -> Comp (ModIface, Bool, ModDetails, TcGblEnv)
+hscSimpleIface tc_result
= do hsc_env <- gets compHscEnv
- _mod_summary <- gets compModSummary
maybe_old_iface <- gets compOldIface
liftIO $ do
- details <- mkBootModDetails hsc_env ds_result
- (new_iface, no_change)
+ details <- mkBootModDetailsTc hsc_env tc_result
+ (new_iface, no_change)
<- {-# SCC "MkFinalIface" #-}
- mkIface hsc_env maybe_old_iface ds_result details
+ mkIfaceTc hsc_env (fmap mi_iface_hash maybe_old_iface) details tc_result
-- And the answer is ...
dumpIfaceStats hsc_env
- return (new_iface, no_change, details, ds_result)
+ return (new_iface, no_change, details, tc_result)
hscNormalIface :: ModGuts -> Comp (ModIface, Bool, ModDetails, CgGuts)
hscNormalIface simpl_result
-- until after code output
(new_iface, no_change)
<- {-# SCC "MkFinalIface" #-}
- mkIface hsc_env maybe_old_iface simpl_result details
+ mkIface hsc_env (fmap mi_iface_hash maybe_old_iface)
+ details simpl_result
-- Emit external core
- emitExternalCore (hsc_dflags hsc_env) (availsToNameSet (mg_exports simpl_result)) cg_guts -- Move this? --Lemmih 03/07/2006
+ -- This should definitely be here and not after CorePrep,
+ -- because CorePrep produces unqualified constructor wrapper declarations,
+ -- so its output isn't valid External Core (without some preprocessing).
+ emitExternalCore (hsc_dflags hsc_env) cg_guts
dumpIfaceStats hsc_env
-------------------
= return (iface, details, a)
-- Don't output any code.
-hscNothing :: (ModIface, ModDetails, a) -> Comp (HscStatus, ModIface, ModDetails)
+hscNothing :: (ModIface, ModDetails, a) -> Comp (Maybe (HscStatus, ModIface, ModDetails))
hscNothing (iface, details, _)
- = return (HscRecomp False, iface, details)
+ = return (Just (HscRecomp False, iface, details))
-- Generate code and return both the new ModIface and the ModDetails.
-hscBatch :: (ModIface, ModDetails, CgGuts) -> Comp (HscStatus, ModIface, ModDetails)
+hscBatch :: (ModIface, ModDetails, CgGuts) -> Comp (Maybe (HscStatus, ModIface, ModDetails))
hscBatch (iface, details, cgguts)
= do hasStub <- hscCompile cgguts
- return (HscRecomp hasStub, iface, details)
+ return (Just (HscRecomp hasStub, iface, details))
-- Here we don't need the ModIface and ModDetails anymore.
-hscOneShot :: (ModIface, ModDetails, CgGuts) -> Comp HscStatus
+hscOneShot :: (ModIface, ModDetails, CgGuts) -> Comp (Maybe HscStatus)
hscOneShot (_, _, cgguts)
= do hasStub <- hscCompile cgguts
- return (HscRecomp hasStub)
+ return (Just (HscRecomp hasStub))
-- Compile to hard-code.
hscCompile :: CgGuts -> Comp Bool
dir_imps cost_centre_info
stg_binds hpc_info
--- Optionally run experimental Cmm transformations ---
- cmms <- optionallyConvertAndOrCPS dflags cmms
- -- ^ unless certain dflags are on, the identity function
+ cmms <- optionallyConvertAndOrCPS hsc_env cmms
+ -- unless certain dflags are on, the identity function
------------------ Code output -----------------------
rawcmms <- cmmToRawCmm cmms
(_stub_h_exists, stub_c_exists)
return stub_c_exists
hscInteractive :: (ModIface, ModDetails, CgGuts)
- -> Comp (InteractiveStatus, ModIface, ModDetails)
+ -> Comp (Maybe (InteractiveStatus, ModIface, ModDetails))
#ifdef GHCI
hscInteractive (iface, details, cgguts)
= do hsc_env <- gets compHscEnv
------------------ Create f-x-dynamic C-side stuff ---
(_istub_h_exists, istub_c_exists)
<- outputForeignStubs dflags this_mod location foreign_stubs
- return (InteractiveRecomp istub_c_exists comp_bc mod_breaks, iface, details)
+ return (Just (InteractiveRecomp istub_c_exists comp_bc mod_breaks, iface, details))
#else
hscInteractive _ = panic "GHC not compiled with interpreter"
#endif
------------------------------
-hscFileCheck :: HscEnv -> ModSummary -> Bool -> IO (Maybe HscChecked)
-hscFileCheck hsc_env mod_summary compileToCore = do {
- -------------------
- -- PARSE
- -------------------
- ; let dflags = hsc_dflags hsc_env
- hspp_file = ms_hspp_file mod_summary
- hspp_buf = ms_hspp_buf mod_summary
-
- ; maybe_parsed <- myParseModule dflags hspp_file hspp_buf
-
- ; case maybe_parsed of {
- Left err -> do { printBagOfErrors dflags (unitBag err)
- ; return Nothing } ;
- Right rdr_module -> do {
-
- -------------------
- -- RENAME and TYPECHECK
- -------------------
- (tc_msgs, maybe_tc_result)
- <- {-# SCC "Typecheck-Rename" #-}
- tcRnModule hsc_env (ms_hsc_src mod_summary)
- True{-save renamed syntax-}
- rdr_module
-
- ; printErrorsAndWarnings dflags tc_msgs
- ; case maybe_tc_result of {
- Nothing -> return (Just (HscChecked rdr_module Nothing Nothing Nothing));
- Just tc_result -> do
- let type_env = tcg_type_env tc_result
- md = ModDetails {
- md_types = type_env,
- md_exports = tcg_exports tc_result,
- md_insts = tcg_insts tc_result,
- md_fam_insts = tcg_fam_insts tc_result,
- md_rules = [panic "no rules"],
- -- Rules are CoreRules, not the
- -- RuleDecls we get out of the typechecker
- md_vect_info = noVectInfo
- -- VectInfo is added by the Core
- -- vectorisation pass
- }
- rnInfo = do decl <- tcg_rn_decls tc_result
- imports <- tcg_rn_imports tc_result
- let exports = tcg_rn_exports tc_result
- let doc = tcg_doc tc_result
- hmi = tcg_hmi tc_result
- return (decl,imports,exports,doc,hmi)
- maybeModGuts <-
- if compileToCore then
- deSugar hsc_env (ms_location mod_summary) tc_result
- else
- return Nothing
- return (Just (HscChecked rdr_module
- rnInfo
- (Just (tcg_binds tc_result,
- tcg_rdr_env tc_result,
- md))
- (fmap mg_binds maybeModGuts)))
- }}}}
-
-
-hscCmmFile :: DynFlags -> FilePath -> IO Bool
-hscCmmFile dflags filename = do
- maybe_cmm <- parseCmmFile dflags filename
- case maybe_cmm of
- Nothing -> return False
- Just cmm -> do
- cmms <- optionallyConvertAndOrCPS dflags [cmm]
- rawCmms <- cmmToRawCmm cmms
- codeOutput dflags no_mod no_loc NoStubs [] rawCmms
- return True
+hscCmmFile :: GhcMonad m => HscEnv -> FilePath -> m ()
+hscCmmFile hsc_env filename = do
+ dflags <- return $ hsc_dflags hsc_env
+ cmm <- ioMsgMaybe $
+ parseCmmFile dflags filename
+ cmms <- liftIO $ optionallyConvertAndOrCPS hsc_env [cmm]
+ rawCmms <- liftIO $ cmmToRawCmm cmms
+ liftIO $ codeOutput dflags no_mod no_loc NoStubs [] rawCmms
+ return ()
where
no_mod = panic "hscCmmFile: no_mod"
no_loc = ModLocation{ ml_hs_file = Just filename,
ml_hi_file = panic "hscCmmFile: no hi file",
ml_obj_file = panic "hscCmmFile: no obj file" }
-optionallyConvertAndOrCPS :: DynFlags -> [Cmm] -> IO [Cmm]
-optionallyConvertAndOrCPS dflags cmms =
- do -------- Optionally convert to and from zipper ------
+optionallyConvertAndOrCPS :: HscEnv -> [Cmm] -> IO [Cmm]
+optionallyConvertAndOrCPS hsc_env cmms =
+ do let dflags = hsc_dflags hsc_env
+ -------- Optionally convert to and from zipper ------
cmms <- if dopt Opt_ConvertToZipCfgAndBack dflags
- then mapM (testCmmConversion dflags) cmms
+ then mapM (testCmmConversion hsc_env) cmms
else return cmms
--------- Optionally convert to CPS (MDA) -----------
cmms <- if not (dopt Opt_ConvertToZipCfgAndBack dflags) &&
return cmms
-testCmmConversion :: DynFlags -> Cmm -> IO Cmm
-testCmmConversion dflags cmm =
- do showPass dflags "CmmToCmm"
+testCmmConversion :: HscEnv -> Cmm -> IO Cmm
+testCmmConversion hsc_env cmm =
+ do let dflags = hsc_dflags hsc_env
+ showPass dflags "CmmToCmm"
dumpIfSet_dyn dflags Opt_D_dump_cvt_cmm "C-- pre-conversion" (ppr cmm)
--continuationC <- cmmCPS dflags abstractC >>= cmmToRawCmm
us <- mkSplitUniqSupply 'C'
let cvtm = do g <- cmmToZgraph cmm
return $ cfopts g
let zgraph = initUs_ us cvtm
- cps_zgraph <- protoCmmCPSZ dflags zgraph
+ cps_zgraph <- protoCmmCPSZ hsc_env zgraph
let chosen_graph = if dopt Opt_RunCPSZ dflags then cps_zgraph else zgraph
dumpIfSet_dyn dflags Opt_D_dump_cmmz "C-- Zipper Graph" (ppr chosen_graph)
showPass dflags "Convert from Z back to Cmm"
POk pst rdr_module -> do {
let {ms = getMessages pst};
- printErrorsAndWarnings dflags ms;
+ printErrorsAndWarnings dflags ms; -- XXX
when (errorsFound dflags ms) $ exitWith (ExitFailure 1);
dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_module) ;
\begin{code}
#ifdef GHCI
hscStmt -- Compile a stmt all the way to an HValue, but don't run it
- :: HscEnv
+ :: GhcMonad m =>
+ HscEnv
-> String -- The statement
- -> IO (Maybe ([Id], HValue))
-
-hscStmt hsc_env stmt
- = do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) stmt
- ; case maybe_stmt of {
- Nothing -> return Nothing ; -- Parse error
- Just Nothing -> return Nothing ; -- Empty line
- Just (Just parsed_stmt) -> do { -- The real stuff
-
- -- Rename and typecheck it
- let icontext = hsc_IC hsc_env
- ; maybe_tc_result <- tcRnStmt hsc_env icontext parsed_stmt
-
- ; case maybe_tc_result of {
- Nothing -> return Nothing ;
- Just (ids, tc_expr) -> do {
-
- -- Desugar it
- ; let rdr_env = ic_rn_gbl_env icontext
- type_env = mkTypeEnv (map AnId (ic_tmp_ids icontext))
- ; mb_ds_expr <- deSugarExpr hsc_env iNTERACTIVE rdr_env type_env tc_expr
-
- ; case mb_ds_expr of {
- Nothing -> return Nothing ;
- Just ds_expr -> do {
-
- -- Then desugar, code gen, and link it
- ; let src_span = srcLocSpan interactiveSrcLoc
- ; hval <- compileExpr hsc_env src_span ds_expr
-
- ; return (Just (ids, hval))
- }}}}}}}
+ -> m (Maybe ([Id], HValue))
+ -- ^ 'Nothing' <==> empty statement (or comment only), but no parse error
+hscStmt hsc_env stmt = do
+ maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) stmt
+ case maybe_stmt of
+ Nothing -> return Nothing
+ Just parsed_stmt -> do -- The real stuff
+
+ -- Rename and typecheck it
+ let icontext = hsc_IC hsc_env
+ (ids, tc_expr) <- ioMsgMaybe $ tcRnStmt hsc_env icontext parsed_stmt
+ -- Desugar it
+ let rdr_env = ic_rn_gbl_env icontext
+ type_env = mkTypeEnv (map AnId (ic_tmp_ids icontext))
+ ds_expr <- ioMsgMaybe $
+ deSugarExpr hsc_env iNTERACTIVE rdr_env type_env tc_expr
+
+ -- Then desugar, code gen, and link it
+ let src_span = srcLocSpan interactiveSrcLoc
+ hval <- liftIO $ compileExpr hsc_env src_span ds_expr
+
+ return $ Just (ids, hval)
+
hscTcExpr -- Typecheck an expression (but don't run it)
- :: HscEnv
+ :: GhcMonad m =>
+ HscEnv
-> String -- The expression
- -> IO (Maybe Type)
-
-hscTcExpr hsc_env expr
- = do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) expr
- ; let icontext = hsc_IC hsc_env
- ; case maybe_stmt of {
- Nothing -> return Nothing ; -- Parse error
- Just (Just (L _ (ExprStmt expr _ _)))
- -> tcRnExpr hsc_env icontext expr ;
- Just _ -> do { errorMsg (hsc_dflags hsc_env) (text "not an expression:" <+> quotes (text expr)) ;
- return Nothing } ;
- } }
-
-hscKcType -- Find the kind of a type
- :: HscEnv
- -> String -- The type
- -> IO (Maybe Kind)
-
-hscKcType hsc_env str
- = do { maybe_type <- hscParseType (hsc_dflags hsc_env) str
- ; let icontext = hsc_IC hsc_env
- ; case maybe_type of {
- Just ty -> tcRnType hsc_env icontext ty ;
- Nothing -> return Nothing } }
+ -> m Type
+
+hscTcExpr hsc_env expr = do
+ maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) expr
+ let icontext = hsc_IC hsc_env
+ case maybe_stmt of
+ Just (L _ (ExprStmt expr _ _)) -> do
+ ty <- ioMsgMaybe $ tcRnExpr hsc_env icontext expr
+ return ty
+ _ -> do throw $ mkSrcErr $ unitBag $ mkPlainErrMsg
+ noSrcSpan
+ (text "not an expression:" <+> quotes (text expr))
+
+-- | Find the kind of a type
+hscKcType
+ :: GhcMonad m =>
+ HscEnv
+ -> String -- ^ The type
+ -> m Kind
+
+hscKcType hsc_env str = do
+ ty <- hscParseType (hsc_dflags hsc_env) str
+ let icontext = hsc_IC hsc_env
+ ioMsgMaybe $ tcRnType hsc_env icontext ty
+
#endif
\end{code}
\begin{code}
#ifdef GHCI
-hscParseStmt :: DynFlags -> String -> IO (Maybe (Maybe (LStmt RdrName)))
+hscParseStmt :: GhcMonad m => DynFlags -> String -> m (Maybe (LStmt RdrName))
hscParseStmt = hscParseThing parseStmt
-hscParseType :: DynFlags -> String -> IO (Maybe (LHsType RdrName))
+hscParseType :: GhcMonad m => DynFlags -> String -> m (LHsType RdrName)
hscParseType = hscParseThing parseType
#endif
-hscParseIdentifier :: DynFlags -> String -> IO (Maybe (Located RdrName))
+hscParseIdentifier :: GhcMonad m => DynFlags -> String -> m (Located RdrName)
hscParseIdentifier = hscParseThing parseIdentifier
-hscParseThing :: Outputable thing
+hscParseThing :: (Outputable thing, GhcMonad m)
=> Lexer.P thing
-> DynFlags -> String
- -> IO (Maybe thing)
+ -> m thing
-- Nothing => Parse error (message already printed)
-- Just x => success
hscParseThing parser dflags str
- = showPass dflags "Parser" >>
+ = (liftIO $ showPass dflags "Parser") >>
{-# SCC "Parser" #-} do
- buf <- stringToStringBuffer str
+ buf <- liftIO $ stringToStringBuffer str
- let loc = mkSrcLoc FSLIT("<interactive>") 1 0
+ let loc = mkSrcLoc (fsLit "<interactive>") 1 0
- case unP parser (mkPState buf loc dflags) of {
+ case unP parser (mkPState buf loc dflags) of
- PFailed span err -> do { printError span err;
- return Nothing };
+ PFailed span err -> do
+ let msg = mkPlainErrMsg span err
+ throw (mkSrcErr (unitBag msg))
- POk pst thing -> do {
+ POk pst thing -> do
- let {ms = getMessages pst};
- printErrorsAndWarnings dflags ms;
- when (errorsFound dflags ms) $ exitWith (ExitFailure 1);
+ let ms@(warns, errs) = getMessages pst
+ logWarnings warns
+ when (errorsFound dflags ms) $ -- handle -Werror
+ throw (mkSrcErr errs)
- --ToDo: can't free the string buffer until we've finished this
- -- compilation sweep and all the identifiers have gone away.
- dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr thing);
- return (Just thing)
- }}
+ --ToDo: can't free the string buffer until we've finished this
+ -- compilation sweep and all the identifiers have gone away.
+ liftIO $ dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr thing)
+ return thing
\end{code}
%************************************************************************
= do { let { dflags = hsc_dflags hsc_env ;
lint_on = dopt Opt_DoCoreLinting dflags }
- -- Flatten it
- ; flat_expr <- flattenExpr hsc_env ds_expr
-
-- Simplify it
- ; simpl_expr <- simplifyExpr dflags flat_expr
+ ; simpl_expr <- simplifyExpr dflags ds_expr
-- Tidy it (temporary, until coreSat does cloning)
; let tidy_expr = tidyExpr emptyTidyEnv simpl_expr