\begin{code}
module HscMain (
- HscResult(..), hscMain, initPersistentCompilerState
+ HscResult(..), hscMain, newHscEnv
#ifdef GHCI
, hscStmt, hscTcExpr, hscThing,
, compileExpr
#include "HsVersions.h"
#ifdef GHCI
-import TcHsSyn ( TypecheckedHsExpr )
+import HsSyn ( Stmt(..), LStmt, LHsExpr )
+import IfaceSyn ( IfaceDecl )
import CodeOutput ( outputForeignStubs )
import ByteCodeGen ( byteCodeGen, coreExprToBCOs )
import Linker ( HValue, linkExpr )
import CorePrep ( corePrepExpr )
import Flattening ( flattenExpr )
import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnThing )
-import RdrHsSyn ( RdrNameStmt )
+import RdrName ( RdrName, GlobalRdrEnv )
import Type ( Type )
import PrelNames ( iNTERACTIVE )
import StringBuffer ( stringToStringBuffer )
+import SrcLoc ( noSrcLoc, Located(..) )
+import Var ( Id )
import Name ( Name )
+import CoreLint ( lintUnfolding )
+import DsMeta ( templateHaskellNames )
+import BasicTypes ( Fixity )
#endif
-import HsSyn
-
-import RdrName ( nameRdrName )
-import Id ( idName )
-import IdInfo ( CafInfo(..), CgInfoEnv, CgInfo(..) )
-import StringBuffer ( hGetStringBuffer, freeStringBuffer )
+import StringBuffer ( hGetStringBuffer )
import Parser
-import Lex ( ParseResult(..), ExtFlags(..), mkPState )
+import Lexer ( P(..), ParseResult(..), mkPState )
import SrcLoc ( mkSrcLoc )
-import TcRnDriver ( checkOldIface, tcRnModule, tcRnExtCore, tcRnIface )
-import RnEnv ( extendOrigNameCache )
-import Rules ( emptyRuleBase )
-import PrelInfo ( wiredInThingEnv, wiredInThings, knownKeyNames )
-import PrelRules ( builtinRules )
-import MkIface ( mkIface )
-import InstEnv ( emptyInstEnv )
+import TcRnDriver ( tcRnModule, tcRnExtCore )
+import TcIface ( typecheckIface )
+import IfaceEnv ( initNameCache )
+import LoadIface ( ifaceStats, initExternalPackageState )
+import PrelInfo ( wiredInThings, basicKnownKeyNames )
+import RdrName ( GlobalRdrEnv )
+import MkIface ( checkOldIface, mkIface )
import Desugar
import Flattening ( flatten )
import SimplCore
-import CoreUtils ( coreBindsSize )
import TidyPgm ( tidyCorePgm )
import CorePrep ( corePrepPgm )
-import StgSyn
import CoreToStg ( coreToStg )
+import Name ( Name, NamedThing(..) )
import SimplStg ( stg2stg )
import CodeGen ( codeGen )
import CodeOutput ( codeOutput )
-import Module ( emptyModuleEnv )
import CmdLineOpts
-import DriverPhases ( isExtCore_file )
-import ErrUtils ( dumpIfSet_dyn, showPass, printError )
+import DriverPhases ( isExtCoreFilename )
+import ErrUtils ( dumpIfSet, dumpIfSet_dyn, showPass, printError )
import UniqSupply ( mkSplitUniqSupply )
-import Bag ( consBag, emptyBag )
import Outputable
import HscStats ( ppSourceStats )
import HscTypes
import MkExternalCore ( emitExternalCore )
import ParserCore
import ParserCoreUtils
-import FiniteMap ( emptyFM )
-import Name ( nameModule, getName )
-import NameEnv ( emptyNameEnv, mkNameEnv )
-import NameSet ( emptyNameSet )
import Module ( Module, ModLocation(..), showModMsg )
import FastString
import Maybes ( expectJust )
-import DATA_IOREF ( newIORef, readIORef, writeIORef )
-import UNSAFE_IO ( unsafePerformIO )
-
import Monad ( when )
import Maybe ( isJust, fromJust )
import IO
+import DATA_IOREF ( newIORef, readIORef )
\end{code}
%************************************************************************
%* *
-\subsection{The main compiler pipeline}
+ Initialisation
+%* *
+%************************************************************************
+
+\begin{code}
+newHscEnv :: GhciMode -> DynFlags -> IO HscEnv
+newHscEnv ghci_mode dflags
+ = do { eps_var <- newIORef initExternalPackageState
+ ; us <- mkSplitUniqSupply 'r'
+ ; nc_var <- newIORef (initNameCache us knownKeyNames)
+ ; return (HscEnv { hsc_mode = ghci_mode,
+ hsc_dflags = dflags,
+ hsc_HPT = emptyHomePackageTable,
+ hsc_EPS = eps_var,
+ hsc_NC = nc_var } ) }
+
+
+knownKeyNames :: [Name] -- Put here to avoid loops involving DsMeta,
+ -- where templateHaskellNames are defined
+knownKeyNames = map getName wiredInThings
+ ++ basicKnownKeyNames
+#ifdef GHCI
+ ++ templateHaskellNames
+#endif
+\end{code}
+
+
+%************************************************************************
+%* *
+ The main compiler pipeline
%* *
%************************************************************************
\begin{code}
data HscResult
- -- compilation failed
- = HscFail PersistentCompilerState -- updated PCS
- -- concluded that it wasn't necessary
- | HscNoRecomp PersistentCompilerState -- updated PCS
- ModDetails -- new details (HomeSymbolTable additions)
+ -- Compilation failed
+ = HscFail
+
+ -- Concluded that it wasn't necessary
+ | HscNoRecomp ModDetails -- new details (HomeSymbolTable additions)
ModIface -- new iface (if any compilation was done)
- -- did recompilation
- | HscRecomp PersistentCompilerState -- updated PCS
- ModDetails -- new details (HomeSymbolTable additions)
- ModIface -- new iface (if any compilation was done)
+
+ -- Did recompilation
+ | HscRecomp ModDetails -- new details (HomeSymbolTable additions)
+ (Maybe GlobalRdrEnv)
+ ModIface -- new iface (if any compilation was done)
Bool -- stub_h exists
Bool -- stub_c exists
(Maybe CompiledByteCode)
hscMain
:: HscEnv
- -> PersistentCompilerState -- IN: persistent compiler state
-> Module
-> ModLocation -- location info
-> Bool -- True <=> source unchanged
-> Maybe ModIface -- old interface, if available
-> IO HscResult
-hscMain hsc_env pcs mod location
+hscMain hsc_env mod location
source_unchanged have_object maybe_old_iface
= do {
- (pcs_ch, maybe_chk_result) <- _scc_ "checkOldIface"
- checkOldIface hsc_env pcs mod
- (ml_hi_file location)
- source_unchanged maybe_old_iface;
- case maybe_chk_result of {
- Nothing -> return (HscFail pcs_ch) ;
- Just (recomp_reqd, maybe_checked_iface) -> do {
+ (recomp_reqd, maybe_checked_iface) <-
+ _scc_ "checkOldIface"
+ checkOldIface hsc_env mod
+ (ml_hi_file location)
+ source_unchanged maybe_old_iface;
let no_old_iface = not (isJust maybe_checked_iface)
what_next | recomp_reqd || no_old_iface = hscRecomp
| otherwise = hscNoRecomp
- ; what_next hsc_env pcs_ch have_object
+ ; what_next hsc_env have_object
mod location maybe_checked_iface
- }}}
+ }
-- hscNoRecomp definitely expects to have the old interface available
-hscNoRecomp hsc_env pcs_ch have_object
+hscNoRecomp hsc_env have_object
mod location (Just old_iface)
| hsc_mode hsc_env == OneShot
= do {
when (verbosity (hsc_dflags hsc_env) > 0) $
hPutStrLn stderr "compilation IS NOT required";
+ dumpIfaceStats hsc_env ;
+
let { bomb = panic "hscNoRecomp:OneShot" };
- return (HscNoRecomp pcs_ch bomb bomb)
+ return (HscNoRecomp bomb bomb)
}
| otherwise
= do {
hPutStrLn stderr ("Skipping " ++
showModMsg have_object mod location);
- -- Typecheck
- (pcs_tc, maybe_tc_result) <- tcRnIface hsc_env pcs_ch old_iface ;
+ new_details <- _scc_ "tcRnIface"
+ typecheckIface hsc_env old_iface ;
+ dumpIfaceStats hsc_env ;
- case maybe_tc_result of {
- Nothing -> return (HscFail pcs_tc);
- Just new_details ->
-
- return (HscNoRecomp pcs_tc new_details old_iface)
- }}
+ return (HscNoRecomp new_details old_iface)
+ }
-hscRecomp hsc_env pcs_ch have_object
+hscRecomp hsc_env have_object
mod location maybe_checked_iface
= do {
-- what target are we shooting for?
; let dflags = hsc_dflags hsc_env
; let toInterp = dopt_HscLang dflags == HscInterpreted
; let toCore = isJust (ml_hs_file location) &&
- isExtCore_file (fromJust (ml_hs_file location))
+ isExtCoreFilename (fromJust (ml_hs_file location))
; when (not one_shot && verbosity dflags >= 1) $
hPutStrLn stderr ("Compiling " ++
showModMsg (not toInterp) mod location);
; front_res <- if toCore then
- hscCoreFrontEnd hsc_env pcs_ch location
+ hscCoreFrontEnd hsc_env location
else
- hscFrontEnd hsc_env pcs_ch location
+ hscFrontEnd hsc_env location
; case front_res of
Left flure -> return flure;
- Right (pcs_tc, ds_result) -> do {
+ Right ds_result -> do {
-- OMITTED:
-- FLATTENING
-------------------
; flat_result <- _scc_ "Flattening"
- flatten hsc_env pcs_tc ds_result
-
- ; let pcs_middle = pcs_tc
-
-{- Again, omit this because it loses the usage info
- which is needed in mkIface. Maybe we should compute
- usage info earlier.
-
- ; pcs_middle
- <- _scc_ "pcs_middle"
- if one_shot then
- do init_pcs <- initPersistentCompilerState
- init_prs <- initPersistentRenamerState
- let
- rules = pcs_rules pcs_tc
- orig_tc = prsOrig (pcs_PRS pcs_tc)
- new_prs = init_prs{ prsOrig=orig_tc }
-
- orig_tc `seq` rules `seq` new_prs `seq`
- return init_pcs{ pcs_PRS = new_prs,
- pcs_rules = rules }
- else return pcs_tc
--}
+ flatten hsc_env ds_result
+
+
+{- TEMP: need to review space-leak fixing here
+ NB: even the code generator can force one of the
+ thunks for constructor arguments, for newtypes in particular
--- Should we remove bits of flat_result at this point?
--- ; flat_result <- case flat_result of
--- ModResult { md_binds = binds } ->
--- return ModDetails { md_binds = binds,
--- md_rules = [],
--- md_types = emptyTypeEnv,
--- md_insts = [] }
+ ; let -- Rule-base accumulated from imported packages
+ pkg_rule_base = eps_rule_base (hsc_EPS hsc_env)
+
+ -- In one-shot mode, ZAP the external package state at
+ -- this point, because we aren't going to need it from
+ -- now on. We keep the name cache, however, because
+ -- tidyCore needs it.
+ pcs_middle
+ | one_shot = pcs_tc{ pcs_EPS = error "pcs_EPS missing" }
+ | otherwise = pcs_tc
+
+ ; pkg_rule_base `seq` pcs_middle `seq` return ()
+-}
-- alive at this point:
-- pcs_middle
-- flat_result
+ -- pkg_rule_base
-------------------
-- SIMPLIFY
-------------------
- ; simpl_result <- _scc_ "Core2Core"
- core2core hsc_env pcs_middle flat_result
+ ; simpl_result <- _scc_ "Core2Core"
+ core2core hsc_env flat_result
-------------------
-- TIDY
-------------------
- ; cg_info_ref <- newIORef Nothing ;
- ; let cg_info :: CgInfoEnv
- cg_info = unsafePerformIO $ do {
- maybe_cg_env <- readIORef cg_info_ref ;
- case maybe_cg_env of
- Just env -> return env
- Nothing -> do { printError "Urk! Looked at CgInfo too early!";
- return emptyNameEnv } }
- -- cg_info_ref will be filled in just after restOfCodeGeneration
- -- Meanwhile, tidyCorePgm is careful not to look at cg_info!
-
- ; (pcs_simpl, tidy_result)
- <- _scc_ "CoreTidy"
- tidyCorePgm dflags pcs_middle cg_info simpl_result
-
--- Space-saving ploy doesn't work so well now
--- because mkIface needs the populated PIT to
--- generate usage info. Maybe we should re-visit this.
--- ; pcs_final <- if one_shot then initPersistentCompilerState
--- else return pcs_simpl
- ; let pcs_final = pcs_simpl
+ ; tidy_result <- _scc_ "CoreTidy"
+ tidyCorePgm hsc_env simpl_result
+
+ -- Emit external core
+ ; emitExternalCore dflags tidy_result
-- Alive at this point:
-- tidy_result, pcs_final
-
- -------------------
- -- PREPARE FOR CODE GENERATION
- -- Do saturation and convert to A-normal form
- ; prepd_result <- _scc_ "CorePrep"
- corePrepPgm dflags tidy_result
-
- -------------------
- -- CONVERT TO STG and COMPLETE CODE GENERATION
- ; (stub_h_exists, stub_c_exists, maybe_bcos)
- <- hscBackEnd dflags cg_info_ref prepd_result
+ -- hsc_env
-------------------
-- BUILD THE NEW ModIface and ModDetails
-- This has to happen *after* code gen so that the back-end
-- info has been set. Not yet clear if it matters waiting
-- until after code output
- ; final_iface <- _scc_ "MkFinalIface"
+ ; new_iface <- _scc_ "MkFinalIface"
mkIface hsc_env location
maybe_checked_iface tidy_result
- ; let final_details = ModDetails { md_types = mg_types tidy_result,
+
+
+ -- Space leak reduction: throw away the new interface if
+ -- we're in one-shot mode; we won't be needing it any
+ -- more.
+ ; final_iface <-
+ if one_shot then return (error "no final iface")
+ else return new_iface
+ ; let { final_globals | one_shot = Nothing
+ | otherwise = Just $! (mg_rdr_env tidy_result) }
+ ; final_globals `seq` return ()
+
+ -- Build the final ModDetails (except in one-shot mode, where
+ -- we won't need this information after compilation).
+ ; final_details <-
+ if one_shot then return (error "no final details")
+ else return $! ModDetails {
+ md_types = mg_types tidy_result,
md_insts = mg_insts tidy_result,
md_rules = mg_rules tidy_result }
- ; emitExternalCore dflags tidy_result
- -- and the answer is ...
- ; return (HscRecomp pcs_final
- final_details
+ -------------------
+ -- CONVERT TO STG and COMPLETE CODE GENERATION
+ ; (stub_h_exists, stub_c_exists, maybe_bcos)
+ <- hscBackEnd dflags tidy_result
+
+ -- And the answer is ...
+ ; dumpIfaceStats hsc_env
+
+ ; return (HscRecomp final_details
+ final_globals
final_iface
stub_h_exists stub_c_exists
maybe_bcos)
}}
-hscCoreFrontEnd hsc_env pcs_ch location = do {
+hscCoreFrontEnd hsc_env location = do {
-------------------
-- PARSE
-------------------
; inp <- readFile (expectJust "hscCoreFrontEnd:hspp" (ml_hspp_file location))
; case parseCore inp 1 of
- FailP s -> hPutStrLn stderr s >> return (Left (HscFail pcs_ch));
+ FailP s -> hPutStrLn stderr s >> return (Left HscFail);
OkP rdr_module -> do {
-------------------
-- RENAME and TYPECHECK
-------------------
- ; (pcs_tc, maybe_tc_result) <- _scc_ "TypeCheck"
- tcRnExtCore hsc_env pcs_ch rdr_module
+ ; maybe_tc_result <- _scc_ "TypeCheck"
+ tcRnExtCore hsc_env rdr_module
; case maybe_tc_result of {
- Nothing -> return (Left (HscFail pcs_tc));
- Just mod_guts -> return (Right (pcs_tc, mod_guts))
+ Nothing -> return (Left HscFail);
+ Just mod_guts -> return (Right mod_guts)
-- No desugaring to do!
}}}
-hscFrontEnd hsc_env pcs_ch location = do {
+hscFrontEnd hsc_env location = do {
-------------------
-- PARSE
-------------------
; maybe_parsed <- myParseModule (hsc_dflags hsc_env)
- (expectJust "hscRecomp:hspp" (ml_hspp_file location))
+ (expectJust "hscFrontEnd:hspp" (ml_hspp_file location))
; case maybe_parsed of {
- Nothing -> return (Left (HscFail pcs_ch));
+ Nothing -> return (Left HscFail);
Just rdr_module -> do {
-------------------
-- RENAME and TYPECHECK
-------------------
- ; (pcs_tc, maybe_tc_result) <- _scc_ "Typecheck and Rename"
- tcRnModule hsc_env pcs_ch rdr_module
+ ; maybe_tc_result <- _scc_ "Typecheck-Rename"
+ tcRnModule hsc_env rdr_module
; case maybe_tc_result of {
- Nothing -> return (Left (HscFail pcs_ch));
+ Nothing -> return (Left HscFail);
Just tc_result -> do {
-
+
-------------------
-- DESUGAR
-------------------
- ; ds_result <- _scc_ "DeSugar"
- deSugar hsc_env pcs_tc tc_result
- ; return (Right (pcs_tc, ds_result))
+ ; maybe_ds_result <- _scc_ "DeSugar"
+ deSugar hsc_env tc_result
+ ; case maybe_ds_result of
+ Nothing -> return (Left HscFail);
+ Just ds_result -> return (Right ds_result);
}}}}}
-hscBackEnd dflags cg_info_ref prepd_result
- = case dopt_HscLang dflags of
+hscBackEnd dflags
+ ModGuts{ -- This is the last use of the ModGuts in a compilation.
+ -- From now on, we just use the bits we need.
+ mg_module = this_mod,
+ mg_binds = core_binds,
+ mg_types = type_env,
+ mg_dir_imps = dir_imps,
+ mg_foreign = foreign_stubs,
+ mg_deps = dependencies } = do {
+
+ -------------------
+ -- PREPARE FOR CODE GENERATION
+ -- Do saturation and convert to A-normal form
+ prepd_binds <- _scc_ "CorePrep"
+ corePrepPgm dflags core_binds type_env;
+
+ case dopt_HscLang dflags of
HscNothing -> return (False, False, Nothing)
HscInterpreted ->
#ifdef GHCI
do ----------------- Generate byte code ------------------
- comp_bc <- byteCodeGen dflags prepd_result
+ comp_bc <- byteCodeGen dflags prepd_binds type_env
- -- Fill in the code-gen info
- writeIORef cg_info_ref (Just emptyNameEnv)
-
------------------ Create f-x-dynamic C-side stuff ---
(istub_h_exists, istub_c_exists)
- <- outputForeignStubs dflags (mg_foreign prepd_result)
+ <- outputForeignStubs dflags foreign_stubs
- return ( istub_h_exists, istub_c_exists,
- Just comp_bc )
+ return ( istub_h_exists, istub_c_exists, Just comp_bc )
#else
panic "GHC not compiled with interpreter"
#endif
other ->
do
----------------- Convert to STG ------------------
- (stg_binds, cost_centre_info, stg_back_end_info)
- <- _scc_ "CoreToStg"
- myCoreToStg dflags prepd_result
-
- -- Fill in the code-gen info for the earlier tidyCorePgm
- writeIORef cg_info_ref (Just stg_back_end_info)
+ (stg_binds, cost_centre_info) <- _scc_ "CoreToStg"
+ myCoreToStg dflags this_mod prepd_binds
------------------ Code generation ------------------
abstractC <- _scc_ "CodeGen"
- codeGen dflags prepd_result
- cost_centre_info stg_binds
-
+ codeGen dflags this_mod type_env foreign_stubs
+ dir_imps cost_centre_info stg_binds
+
------------------ Code output -----------------------
(stub_h_exists, stub_c_exists)
- <- codeOutput dflags prepd_result
- stg_binds abstractC
-
+ <- codeOutput dflags this_mod foreign_stubs
+ dependencies abstractC
+
return (stub_h_exists, stub_c_exists, Nothing)
+ }
myParseModule dflags src_filename
_scc_ "Parser" do
buf <- hGetStringBuffer src_filename
- let exts = ExtFlags {glasgowExtsEF = dopt Opt_GlasgowExts dflags,
- ffiEF = dopt Opt_FFI dflags,
- withEF = dopt Opt_With dflags,
- parrEF = dopt Opt_PArr dflags}
- loc = mkSrcLoc (mkFastString src_filename) 1
+ let loc = mkSrcLoc (mkFastString src_filename) 1 0
- case parseModule buf (mkPState loc exts) of {
+ case unP parseModule (mkPState buf loc dflags) of {
- PFailed err -> do { hPutStrLn stderr (showSDoc err);
- freeStringBuffer buf;
- return Nothing };
+ PFailed span err -> do { printError span err ;
+ return Nothing };
POk _ rdr_module -> do {
}}
-myCoreToStg dflags (ModGuts {mg_module = this_mod, mg_binds = tidy_binds})
+myCoreToStg dflags this_mod prepd_binds
= do
- () <- coreBindsSize tidy_binds `seq` return ()
- -- TEMP: the above call zaps some space usage allocated by the
- -- simplifier, which for reasons I don't understand, persists
- -- thoroughout code generation -- JRS
- --
- -- This is still necessary. -- SDM (10 Dec 2001)
-
stg_binds <- _scc_ "Core2Stg"
- coreToStg dflags tidy_binds
+ coreToStg dflags prepd_binds
(stg_binds2, cost_centre_info) <- _scc_ "Core2Stg"
stg2stg dflags this_mod stg_binds
- let env_rhs :: CgInfoEnv
- env_rhs = mkNameEnv [ caf_info `seq` (idName bndr, CgInfo caf_info)
- | (bind,_) <- stg_binds2,
- let caf_info
- | stgBindHasCafRefs bind = MayHaveCafRefs
- | otherwise = NoCafRefs,
- bndr <- stgBinders bind ]
-
- return (stg_binds2, cost_centre_info, env_rhs)
+ return (stg_binds2, cost_centre_info)
\end{code}
#ifdef GHCI
hscStmt -- Compile a stmt all the way to an HValue, but don't run it
:: HscEnv
- -> PersistentCompilerState -- IN: persistent compiler state
-> InteractiveContext -- Context for compiling
-> String -- The statement
- -> IO ( PersistentCompilerState,
- Maybe (InteractiveContext, [Name], HValue) )
+ -> IO (Maybe (InteractiveContext, [Name], HValue))
-hscStmt hsc_env pcs icontext stmt
+hscStmt hsc_env icontext stmt
= do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) stmt
; case maybe_stmt of {
- Nothing -> return (pcs, Nothing) ;
+ Nothing -> return Nothing ;
Just parsed_stmt -> do {
-- Rename and typecheck it
- (pcs1, maybe_tc_result)
- <- tcRnStmt hsc_env pcs icontext parsed_stmt
+ maybe_tc_result
+ <- tcRnStmt hsc_env icontext parsed_stmt
; case maybe_tc_result of {
- Nothing -> return (pcs1, Nothing) ;
+ Nothing -> return Nothing ;
Just (new_ic, bound_names, tc_expr) -> do {
-- Then desugar, code gen, and link it
- ; hval <- compileExpr hsc_env pcs1 iNTERACTIVE
- (icPrintUnqual new_ic) tc_expr
+ ; hval <- compileExpr hsc_env iNTERACTIVE
+ (ic_rn_gbl_env new_ic)
+ (ic_type_env new_ic)
+ tc_expr
- ; return (pcs1, Just (new_ic, bound_names, hval))
+ ; return (Just (new_ic, bound_names, hval))
}}}}}
hscTcExpr -- Typecheck an expression (but don't run it)
:: HscEnv
- -> PersistentCompilerState -- IN: persistent compiler state
-> InteractiveContext -- Context for compiling
-> String -- The expression
- -> IO (PersistentCompilerState, Maybe Type)
+ -> IO (Maybe Type)
-hscTcExpr hsc_env pcs icontext expr
+hscTcExpr hsc_env icontext expr
= do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) expr
; case maybe_stmt of {
- Just (ExprStmt expr _ _)
- -> tcRnExpr hsc_env pcs icontext expr ;
+ Just (L _ (ExprStmt expr _))
+ -> tcRnExpr hsc_env icontext expr ;
Just other -> do { hPutStrLn stderr ("not an expression: `" ++ expr ++ "'") ;
- return (pcs, Nothing) } ;
- Nothing -> return (pcs, Nothing) } }
+ return Nothing } ;
+ Nothing -> return Nothing } }
\end{code}
\begin{code}
-hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt)
+hscParseStmt :: DynFlags -> String -> IO (Maybe (LStmt RdrName))
hscParseStmt dflags str
= do showPass dflags "Parser"
_scc_ "Parser" do
buf <- stringToStringBuffer str
- let exts = ExtFlags {glasgowExtsEF = dopt Opt_GlasgowExts dflags,
- ffiEF = dopt Opt_FFI dflags,
- withEF = dopt Opt_With dflags,
- parrEF = dopt Opt_PArr dflags}
- loc = mkSrcLoc FSLIT("<interactive>") 1
+ let loc = mkSrcLoc FSLIT("<interactive>") 1 0
- case parseStmt buf (mkPState loc exts) of {
+ case unP parseStmt (mkPState buf loc dflags) of {
- PFailed err -> do { hPutStrLn stderr (showSDoc err);
--- Not yet implemented in <4.11 freeStringBuffer buf;
- return Nothing };
+ PFailed span err -> do { printError span err;
+ return Nothing };
-- no stmt: the line consisted of just space or comments
POk _ Nothing -> return Nothing;
--ToDo: can't free the string buffer until we've finished this
-- compilation sweep and all the identifiers have gone away.
- --freeStringBuffer buf;
dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_stmt);
return (Just rdr_stmt)
}}
#ifdef GHCI
hscThing -- like hscStmt, but deals with a single identifier
:: HscEnv
- -> PersistentCompilerState -- IN: persistent compiler state
-> InteractiveContext -- Context for compiling
-> String -- The identifier
- -> IO ( PersistentCompilerState,
- [TyThing] )
-
-hscThing hsc_env pcs0 ic str
- = do let dflags = hsc_dflags hsc_env
+ -> IO [(IfaceDecl, Fixity)]
- maybe_rdr_name <- myParseIdentifier dflags str
+hscThing hsc_env ic str
+ = do maybe_rdr_name <- myParseIdentifier (hsc_dflags hsc_env) str
case maybe_rdr_name of {
- Nothing -> return (pcs0, []);
- Just rdr_name -> do
+ Nothing -> return [];
+ Just (L _ rdr_name) -> do
- (pcs1, maybe_tc_result) <-
- tcRnThing hsc_env pcs0 ic rdr_name
+ maybe_tc_result <- tcRnThing hsc_env ic rdr_name
case maybe_tc_result of {
- Nothing -> return (pcs1, []) ;
- Just things -> return (pcs1, things)
+ Nothing -> return [] ;
+ Just things -> return things
}}
myParseIdentifier dflags str
= do buf <- stringToStringBuffer str
- let exts = ExtFlags {glasgowExtsEF = dopt Opt_GlasgowExts dflags,
- ffiEF = dopt Opt_FFI dflags,
- withEF = dopt Opt_With dflags,
- parrEF = dopt Opt_PArr dflags}
- loc = mkSrcLoc FSLIT("<interactive>") 1
+ let loc = mkSrcLoc FSLIT("<interactive>") 1 0
+ case unP parseIdentifier (mkPState buf loc dflags) of
- case parseIdentifier buf (mkPState loc exts) of
+ PFailed span err -> do { printError span err;
+ return Nothing }
- PFailed err -> do { hPutStrLn stderr (showSDoc err);
- freeStringBuffer buf;
- return Nothing }
-
- POk _ rdr_name -> do { --should, but can't: freeStringBuffer buf;
- return (Just rdr_name) }
+ POk _ rdr_name -> return (Just rdr_name)
#endif
\end{code}
\begin{code}
#ifdef GHCI
compileExpr :: HscEnv
- -> PersistentCompilerState
- -> Module -> PrintUnqualified
- -> TypecheckedHsExpr
+ -> Module -> GlobalRdrEnv -> TypeEnv
+ -> LHsExpr Id
-> IO HValue
-compileExpr hsc_env pcs this_mod print_unqual tc_expr
- = do { let dflags = hsc_dflags hsc_env
-
+compileExpr hsc_env this_mod rdr_env type_env tc_expr
+ = do { let { dflags = hsc_dflags hsc_env ;
+ lint_on = dopt Opt_DoCoreLinting dflags }
+
-- Desugar it
- ; ds_expr <- deSugarExpr hsc_env pcs this_mod print_unqual tc_expr
+ ; ds_expr <- deSugarExpr hsc_env this_mod rdr_env type_env tc_expr
-- Flatten it
- ; flat_expr <- flattenExpr hsc_env pcs ds_expr
+ ; flat_expr <- flattenExpr hsc_env ds_expr
-- Simplify it
; simpl_expr <- simplifyExpr dflags flat_expr
-- Prepare for codegen
; prepd_expr <- corePrepExpr dflags tidy_expr
+ -- Lint if necessary
+ -- ToDo: improve SrcLoc
+ ; if lint_on then
+ case lintUnfolding noSrcLoc [] prepd_expr of
+ Just err -> pprPanic "compileExpr" err
+ Nothing -> return ()
+ else
+ return ()
+
-- Convert to BCOs
; bcos <- coreExprToBCOs dflags prepd_expr
-- link it
- ; hval <- linkExpr hsc_env pcs bcos
+ ; hval <- linkExpr hsc_env bcos
; return hval
}
%************************************************************************
%* *
-\subsection{Initial persistent state}
+ Statistics on reading interfaces
%* *
%************************************************************************
\begin{code}
-initPersistentCompilerState :: IO PersistentCompilerState
-initPersistentCompilerState
- = do nc <- initNameCache
- return (
- PCS { pcs_EPS = initExternalPackageState,
- pcs_nc = nc })
-
-initNameCache :: IO NameCache
- = do us <- mkSplitUniqSupply 'r'
- return (NameCache { nsUniqs = us,
- nsNames = initOrigNames,
- nsIPs = emptyFM })
-
-initExternalPackageState :: ExternalPackageState
-initExternalPackageState
- = EPS {
- eps_decls = (emptyNameEnv, 0),
- eps_insts = (emptyBag, 0),
- eps_inst_gates = emptyNameSet,
- eps_rules = foldr add_rule (emptyBag, 0) builtinRules,
-
- eps_PIT = emptyPackageIfaceTable,
- eps_PTE = wiredInThingEnv,
- eps_inst_env = emptyInstEnv,
- eps_rule_base = emptyRuleBase }
-
- where
- add_rule (name,rule) (rules, n_slurped)
- = (gated_decl `consBag` rules, n_slurped)
- where
- gated_decl = (gate_fn, (mod, IfaceRuleOut rdr_name rule))
- mod = nameModule name
- rdr_name = nameRdrName name
- gate_fn vis_fn = vis_fn name -- Load the rule whenever name is visible
-
-initOrigNames :: OrigNameCache
-initOrigNames
- = insert knownKeyNames $
- insert (map getName wiredInThings) $
- emptyModuleEnv
+dumpIfaceStats :: HscEnv -> IO ()
+dumpIfaceStats hsc_env
+ = do { eps <- readIORef (hsc_EPS hsc_env)
+ ; dumpIfSet (dump_if_trace || dump_rn_stats)
+ "Interface statistics"
+ (ifaceStats eps) }
where
- insert names env = foldl extendOrigNameCache env names
+ dflags = hsc_dflags hsc_env
+ dump_rn_stats = dopt Opt_D_dump_rn_stats dflags
+ dump_if_trace = dopt Opt_D_dump_if_trace dflags
\end{code}