X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=953791a07f821346ab044202ee68f934a96ce316;hp=23f00c9dac5eb46cd0db9d8996034a861e2f216b;hb=2ac652a9bcd7a224f5680cd28848211b9c385088;hpb=536087b8565252f54a7c1b33d1ba85a76aef7249 diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 23f00c9..953791a 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -6,9 +6,12 @@ \begin{code} module HscMain ( - HscResult(..), hscMain, initPersistentCompilerState + HscResult(..), + hscMain, newHscEnv, hscCmmFile, + hscBufferCheck, hscFileCheck, #ifdef GHCI - , hscStmt, hscTcExpr, hscThing, + , hscStmt, hscTcExpr, hscKcType + , hscGetInfo, GetInfoResult , compileExpr #endif ) where @@ -16,102 +19,144 @@ module HscMain ( #include "HsVersions.h" #ifdef GHCI -import TcHsSyn ( TypecheckedHsExpr ) +import HsSyn ( Stmt(..), LStmt, LHsExpr, LHsType ) +import IfaceSyn ( IfaceDecl, IfaceInst ) import CodeOutput ( outputForeignStubs ) import ByteCodeGen ( byteCodeGen, coreExprToBCOs ) import Linker ( HValue, linkExpr ) import TidyPgm ( tidyCoreExpr ) import CorePrep ( corePrepExpr ) import Flattening ( flattenExpr ) -import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnThing ) -import RdrHsSyn ( RdrNameStmt ) +import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnGetInfo, tcRnType ) +import RdrName ( rdrNameOcc ) +import OccName ( occNameUserString ) import Type ( Type ) import PrelNames ( iNTERACTIVE ) import StringBuffer ( stringToStringBuffer ) -import SrcLoc ( noSrcLoc ) -import Name ( Name ) +import Kind ( Kind ) +import Var ( Id ) import CoreLint ( lintUnfolding ) +import DsMeta ( templateHaskellNames ) +import BasicTypes ( Fixity ) +import SrcLoc ( SrcLoc, noSrcLoc ) #endif -import HsSyn - -import RdrName ( nameRdrName ) -import StringBuffer ( hGetStringBuffer, freeStringBuffer ) +import RdrName ( RdrName ) +import HsSyn ( HsModule ) +import SrcLoc ( Located(..) ) +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 PrelInfo ( wiredInThingEnv, knownKeyNames ) -import PrelRules ( builtinRules ) -import MkIface ( mkIface ) +import TcRnDriver ( tcRnModule, tcRnExtCore ) +import TcRnTypes ( TcGblEnv ) +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 CmmParse ( parseCmmFile ) import CodeOutput ( codeOutput ) -import Module ( emptyModuleEnv ) import CmdLineOpts -import DriverPhases ( isExtCore_file ) -import ErrUtils ( dumpIfSet_dyn, showPass ) +import DriverPhases ( isExtCoreFilename ) +import ErrUtils 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 ) -import NameEnv ( emptyNameEnv ) -import NameSet ( emptyNameSet ) import Module ( Module, ModLocation(..), showModMsg ) import FastString import Maybes ( expectJust ) +import StringBuffer ( StringBuffer ) +import Bag ( unitBag, emptyBag ) 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 + + -- In IDE mode: we just do the static/dynamic checks + | HscChecked (Located (HsModule RdrName)) (Maybe TcGblEnv) + + -- 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) + +-- What to do when we have compiler error or warning messages +type MessageAction = Messages -> IO () + -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves hscMain :: HscEnv - -> PersistentCompilerState -- IN: persistent compiler state + -> MessageAction -- what to do with errors/warnings -> Module -> ModLocation -- location info -> Bool -- True <=> source unchanged @@ -119,74 +164,71 @@ hscMain -> Maybe ModIface -- old interface, if available -> IO HscResult -hscMain hsc_env pcs mod location +hscMain hsc_env msg_act 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 msg_act 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 msg_act have_object mod location (Just old_iface) - | hsc_mode hsc_env == OneShot + | isOneShot (hsc_mode hsc_env) = do { - when (verbosity (hsc_dflags hsc_env) > 0) $ - hPutStrLn stderr "compilation IS NOT required"; + compilationProgressMsg (hsc_dflags hsc_env) $ + "compilation IS NOT required"; + dumpIfaceStats hsc_env ; + let { bomb = panic "hscNoRecomp:OneShot" }; - return (HscNoRecomp pcs_ch bomb bomb) + return (HscNoRecomp bomb bomb) } | otherwise = do { - when (verbosity (hsc_dflags hsc_env) >= 1) $ - hPutStrLn stderr ("Skipping " ++ - showModMsg have_object mod location); - - -- Typecheck - (pcs_tc, maybe_tc_result) <- tcRnIface hsc_env pcs_ch old_iface ; + compilationProgressMsg (hsc_dflags hsc_env) $ + ("Skipping " ++ showModMsg have_object mod location); - case maybe_tc_result of { - Nothing -> return (HscFail pcs_tc); - Just new_details -> + new_details <- _scc_ "tcRnIface" + typecheckIface hsc_env old_iface ; + dumpIfaceStats hsc_env ; - return (HscNoRecomp pcs_tc new_details old_iface) - }} + return (HscNoRecomp new_details old_iface) + } -hscRecomp hsc_env pcs_ch have_object +hscRecomp hsc_env msg_act have_object mod location maybe_checked_iface = do { -- what target are we shooting for? - ; let one_shot = hsc_mode hsc_env == OneShot + ; let one_shot = isOneShot (hsc_mode hsc_env) ; 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); + ; when (not one_shot) $ + compilationProgressMsg dflags $ + ("Compiling " ++ showModMsg (not toInterp) mod location); + ; let hspp_file = expectJust "hscFrontEnd:hspp" (ml_hspp_file location) ; front_res <- if toCore then - hscCoreFrontEnd hsc_env pcs_ch location + hscCoreFrontEnd hsc_env msg_act hspp_file else - hscFrontEnd hsc_env pcs_ch location + hscFileFrontEnd hsc_env msg_act hspp_file ; case front_res of Left flure -> return flure; - Right (pcs_tc, ds_result) -> do { + Right ds_result -> do { -- OMITTED: @@ -196,11 +238,15 @@ hscRecomp hsc_env pcs_ch have_object -- FLATTENING ------------------- ; flat_result <- _scc_ "Flattening" - flatten hsc_env pcs_tc ds_result + 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 ; let -- Rule-base accumulated from imported packages - pkg_rule_base = eps_rule_base (pcs_EPS pcs_tc) + 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 @@ -211,6 +257,7 @@ hscRecomp hsc_env pcs_ch have_object | otherwise = pcs_tc ; pkg_rule_base `seq` pcs_middle `seq` return () +-} -- alive at this point: -- pcs_middle @@ -220,21 +267,16 @@ hscRecomp hsc_env pcs_ch have_object ------------------- -- SIMPLIFY ------------------- - ; simpl_result <- _scc_ "Core2Core" - core2core hsc_env pkg_rule_base flat_result + ; simpl_result <- _scc_ "Core2Core" + core2core hsc_env flat_result ------------------- -- TIDY ------------------- - ; (pcs_simpl, tidy_result) - <- _scc_ "CoreTidy" - tidyCorePgm dflags pcs_middle simpl_result - - -- ZAP the persistent compiler state altogether now if we're - -- in one-shot mode, to save space. - ; pcs_final <- if one_shot then return (error "pcs_final missing") - else return pcs_simpl + ; tidy_result <- _scc_ "CoreTidy" + tidyCorePgm hsc_env simpl_result + -- Emit external core ; emitExternalCore dflags tidy_result -- Alive at this point: @@ -258,6 +300,9 @@ hscRecomp hsc_env pcs_ch have_object ; 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). @@ -273,64 +318,111 @@ hscRecomp hsc_env pcs_ch have_object ; (stub_h_exists, stub_c_exists, maybe_bcos) <- hscBackEnd dflags tidy_result - -- and the answer is ... - ; return (HscRecomp pcs_final - final_details + -- 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 msg_act hspp_file = do { ------------------- -- PARSE ------------------- - ; inp <- readFile (expectJust "hscCoreFrontEnd:hspp" (ml_hspp_file location)) + ; inp <- readFile hspp_file ; case parseCore inp 1 of - FailP s -> hPutStrLn stderr s >> return (Left (HscFail pcs_ch)); + FailP s -> putMsg s{-ToDo: wrong-} >> return (Left HscFail) OkP rdr_module -> do { ------------------- -- RENAME and TYPECHECK ------------------- - ; (pcs_tc, maybe_tc_result) <- _scc_ "TypeCheck" - tcRnExtCore hsc_env pcs_ch rdr_module + ; (tc_msgs, maybe_tc_result) <- _scc_ "TypeCheck" + tcRnExtCore hsc_env rdr_module + ; msg_act tc_msgs ; 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 { +hscFileFrontEnd hsc_env msg_act hspp_file = do { ------------------- -- PARSE ------------------- - ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) - (expectJust "hscFrontEnd:hspp" (ml_hspp_file location)) + ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) hspp_file ; case maybe_parsed of { - Nothing -> return (Left (HscFail pcs_ch)); - Just rdr_module -> do { - + Left err -> do { msg_act (unitBag err, emptyBag) ; + ; return (Left HscFail) ; + }; + Right rdr_module -> do { + ------------------- -- RENAME and TYPECHECK ------------------- - ; (pcs_tc, maybe_tc_result) <- _scc_ "Typecheck-Rename" - tcRnModule hsc_env pcs_ch rdr_module + ; (tc_msgs, maybe_tc_result) <- _scc_ "Typecheck-Rename" + tcRnModule hsc_env rdr_module + ; msg_act tc_msgs ; 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)) + ; (warns, maybe_ds_result) <- _scc_ "DeSugar" + deSugar hsc_env tc_result + ; msg_act (warns, emptyBag) + ; case maybe_ds_result of + Nothing -> return (Left HscFail); + Just ds_result -> return (Right ds_result); }}}}} +hscFileCheck hsc_env msg_act hspp_file = do { + ------------------- + -- PARSE + ------------------- + ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) hspp_file + + ; case maybe_parsed of { + Left err -> do { msg_act (unitBag err, emptyBag) ; + ; return HscFail ; + }; + Right rdr_module -> hscBufferTypecheck hsc_env rdr_module msg_act + }} + + +-- Perform static/dynamic checks on the source code in a StringBuffer +-- This is a temporary solution: it'll read in interface files lazily, whereas +-- we probably want to use the compilation manager to load in all the modules +-- in a project. +hscBufferCheck :: HscEnv -> StringBuffer -> MessageAction -> IO HscResult +hscBufferCheck hsc_env buffer msg_act = do + let loc = mkSrcLoc (mkFastString "*edit*") 1 0 + showPass (hsc_dflags hsc_env) "Parser" + case unP parseModule (mkPState buffer loc (hsc_dflags hsc_env)) of + PFailed span err -> do + msg_act (emptyBag, unitBag (mkPlainErrMsg span err)) + return HscFail + POk _ rdr_module -> do + hscBufferTypecheck hsc_env rdr_module msg_act + +hscBufferTypecheck hsc_env rdr_module msg_act = do + (tc_msgs, maybe_tc_result) <- _scc_ "Typecheck-Rename" + tcRnModule hsc_env rdr_module + msg_act tc_msgs + case maybe_tc_result of + Nothing -> return (HscChecked rdr_module Nothing) + -- space leak on rdr_module! + Just r -> return (HscChecked rdr_module (Just r)) + + hscBackEnd dflags ModGuts{ -- This is the last use of the ModGuts in a compilation. -- From now on, we just use the bits we need. @@ -384,23 +476,29 @@ hscBackEnd dflags } +hscCmmFile :: DynFlags -> FilePath -> IO Bool +hscCmmFile dflags filename = do + maybe_cmm <- parseCmmFile dflags filename + case maybe_cmm of + Nothing -> return False + Just cmm -> do + codeOutput dflags no_mod NoStubs noDependencies [cmm] + return True + where + no_mod = panic "hscCmmFile: no_mod" + + myParseModule dflags src_filename = do -------------------------- Parser ---------------- showPass dflags "Parser" _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 -> return (Left (mkPlainErrMsg span err)); POk _ rdr_module -> do { @@ -409,7 +507,7 @@ myParseModule dflags src_filename dumpIfSet_dyn dflags Opt_D_source_stats "Source Statistics" (ppSourceStats False rdr_module) ; - return (Just rdr_module) + return (Right rdr_module) -- ToDo: free the string buffer later. }} @@ -462,82 +560,100 @@ A naked expression returns a singleton Name [it]. #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) ; - Just parsed_stmt -> do { + Nothing -> return Nothing ; -- Parse error + Just Nothing -> return Nothing ; -- Empty line + Just (Just parsed_stmt) -> do { -- The real stuff -- 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 + ; 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 other -> do { hPutStrLn stderr ("not an expression: `" ++ expr ++ "'") ; - return (pcs, Nothing) } ; - Nothing -> return (pcs, Nothing) } } + Nothing -> return Nothing ; -- Parse error + Just (Just (L _ (ExprStmt expr _))) + -> tcRnExpr hsc_env icontext expr ; + Just other -> do { errorMsg ("not an expression: `" ++ expr ++ "'") ; + return Nothing } ; + } } + +hscKcType -- Find the kind of a type + :: HscEnv + -> InteractiveContext -- Context for compiling + -> String -- The type + -> IO (Maybe Kind) + +hscKcType hsc_env icontext str + = do { maybe_type <- hscParseType (hsc_dflags hsc_env) str + ; case maybe_type of { + Just ty -> tcRnType hsc_env icontext ty ; + Just other -> do { errorMsg ("not an type: `" ++ str ++ "'") ; + return Nothing } ; + Nothing -> return Nothing } } \end{code} \begin{code} -hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) -hscParseStmt dflags str +hscParseStmt :: DynFlags -> String -> IO (Maybe (Maybe (LStmt RdrName))) +hscParseStmt = hscParseThing parseStmt + +hscParseType :: DynFlags -> String -> IO (Maybe (LHsType RdrName)) +hscParseType = hscParseThing parseType + +hscParseIdentifier :: DynFlags -> String -> IO (Maybe (Located RdrName)) +hscParseIdentifier = hscParseThing parseIdentifier + +hscParseThing :: Outputable thing + => Lexer.P thing + -> DynFlags -> String + -> IO (Maybe thing) + -- Nothing => Parse error (message already printed) + -- Just x => success +hscParseThing parser 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("") 1 - - case parseStmt buf (mkPState loc exts) of { + let loc = mkSrcLoc FSLIT("") 1 0 - PFailed err -> do { hPutStrLn stderr (showSDoc err); --- Not yet implemented in <4.11 freeStringBuffer buf; - return Nothing }; + case unP parser (mkPState buf loc dflags) of { - -- no stmt: the line consisted of just space or comments - POk _ Nothing -> return Nothing; + PFailed span err -> do { printError span err; + return Nothing }; - POk _ (Just rdr_stmt) -> do { + POk _ thing -> do { --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) + dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr thing); + return (Just thing) }} #endif \end{code} @@ -550,47 +666,30 @@ hscParseStmt dflags str \begin{code} #ifdef GHCI -hscThing -- like hscStmt, but deals with a single identifier +type GetInfoResult = (String, (IfaceDecl, Fixity, SrcLoc, [(IfaceInst,SrcLoc)])) + +hscGetInfo -- like hscStmt, but deals with a single identifier :: HscEnv - -> PersistentCompilerState -- IN: persistent compiler state -> InteractiveContext -- Context for compiling -> String -- The identifier - -> IO ( PersistentCompilerState, - [TyThing] ) + -> IO [GetInfoResult] -hscThing hsc_env pcs0 ic str - = do let dflags = hsc_dflags hsc_env - - maybe_rdr_name <- myParseIdentifier dflags str +hscGetInfo hsc_env ic str + = do maybe_rdr_name <- hscParseIdentifier (hsc_dflags hsc_env) str case maybe_rdr_name of { - Nothing -> return (pcs0, []); - Just rdr_name -> do + Nothing -> return []; + Just (L _ rdr_name) -> do + + maybe_tc_result <- tcRnGetInfo hsc_env ic rdr_name - (pcs1, maybe_tc_result) <- - tcRnThing hsc_env pcs0 ic rdr_name + let -- str' is the the naked occurrence name + -- after stripping off qualification and parens (+) + str' = occNameUserString (rdrNameOcc rdr_name) case maybe_tc_result of { - Nothing -> return (pcs1, []) ; - Just things -> return (pcs1, things) + Nothing -> return [] ; + Just things -> return [(str', t) | t <- 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("") 1 - - case parseIdentifier buf (mkPState loc exts) of - - 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) } #endif \end{code} @@ -603,20 +702,19 @@ myParseIdentifier dflags str \begin{code} #ifdef GHCI compileExpr :: HscEnv - -> PersistentCompilerState -> Module -> GlobalRdrEnv -> TypeEnv - -> TypecheckedHsExpr + -> LHsExpr Id -> IO HValue -compileExpr hsc_env pcs this_mod rdr_env type_env tc_expr +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 rdr_env type_env 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 @@ -640,7 +738,7 @@ compileExpr hsc_env pcs this_mod rdr_env type_env tc_expr ; bcos <- coreExprToBCOs dflags prepd_expr -- link it - ; hval <- linkExpr hsc_env pcs bcos + ; hval <- linkExpr hsc_env bcos ; return hval } @@ -650,40 +748,19 @@ compileExpr hsc_env pcs this_mod rdr_env type_env tc_expr %************************************************************************ %* * -\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 - = emptyExternalPackageState { - eps_rules = foldr add_rule (emptyBag, 0) builtinRules, - eps_PTE = wiredInThingEnv, - } +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 - 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 -- Seems a bit of a hack to go back - -- to the RdrName - gate_fn vis_fn = vis_fn name -- Load the rule whenever name is visible - -initOrigNames :: OrigNameCache -initOrigNames = foldl extendOrigNameCache emptyModuleEnv knownKeyNames + 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}