X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=2b9ae6c09f28d0fc7f382afd330c1b8f05999647;hb=ac10f8408520a30e8437496d320b8b86afda2e8f;hp=9ce0bb75c6dc9e389ab2a4de8923e50b1f70c709;hpb=1c9f0be145ee4153d9dc88ad8afd784912a6b271;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 9ce0bb7..2b9ae6c 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -6,63 +6,69 @@ \begin{code} module HscMain ( - HscResult(..), hscMain, newHscEnv + HscResult(..), + hscMain, newHscEnv, hscCmmFile, + hscFileCheck, + hscParseIdentifier, #ifdef GHCI - , hscStmt, hscTcExpr, hscThing, - , compileExpr + hscStmt, hscTcExpr, hscKcType, + compileExpr, #endif ) where #include "HsVersions.h" #ifdef GHCI -import HsSyn ( Stmt(..) ) -import TcHsSyn ( TypecheckedHsExpr ) -import IfaceSyn ( IfaceDecl ) +import HsSyn ( Stmt(..), LHsExpr, LStmt, LHsType ) +import Module ( Module ) import CodeOutput ( outputForeignStubs ) import ByteCodeGen ( byteCodeGen, coreExprToBCOs ) import Linker ( HValue, linkExpr ) -import TidyPgm ( tidyCoreExpr ) +import CoreTidy ( tidyExpr ) import CorePrep ( corePrepExpr ) import Flattening ( flattenExpr ) -import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnThing ) -import RdrHsSyn ( RdrNameStmt ) -import RdrName ( GlobalRdrEnv ) +import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnType ) import Type ( Type ) import PrelNames ( iNTERACTIVE ) -import StringBuffer ( stringToStringBuffer ) -import SrcLoc ( noSrcLoc ) -import Name ( Name ) +import Kind ( Kind ) import CoreLint ( lintUnfolding ) import DsMeta ( templateHaskellNames ) -import BasicTypes ( Fixity ) +import SrcLoc ( noSrcLoc ) +import VarEnv ( emptyTidyEnv ) #endif -import StringBuffer ( hGetStringBuffer ) +import Var ( Id ) +import Module ( emptyModuleEnv, ModLocation(..) ) +import RdrName ( GlobalRdrEnv, RdrName ) +import HsSyn ( HsModule, LHsBinds, HsGroup ) +import SrcLoc ( Located(..) ) +import StringBuffer ( hGetStringBuffer, stringToStringBuffer ) import Parser -import Lexer ( P(..), ParseResult(..), mkPState, showPFailed ) +import Lexer ( P(..), ParseResult(..), mkPState ) import SrcLoc ( mkSrcLoc ) import TcRnDriver ( tcRnModule, tcRnExtCore ) import TcIface ( typecheckIface ) +import TcRnMonad ( initIfaceCheck, TcGblEnv(..) ) import IfaceEnv ( initNameCache ) import LoadIface ( ifaceStats, initExternalPackageState ) import PrelInfo ( wiredInThings, basicKnownKeyNames ) -import RdrName ( GlobalRdrEnv ) -import MkIface ( checkOldIface, mkIface ) +import MkIface ( checkOldIface, mkIface, writeIfaceFile ) import Desugar import Flattening ( flatten ) import SimplCore -import TidyPgm ( tidyCorePgm ) +import TidyPgm ( tidyProgram, mkBootModDetails ) import CorePrep ( corePrepPgm ) import CoreToStg ( coreToStg ) +import TyCon ( isDataTyCon ) +import Packages ( mkHomeModules ) import Name ( Name, NamedThing(..) ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) +import CmmParse ( parseCmmFile ) import CodeOutput ( codeOutput ) -import CmdLineOpts -import DriverPhases ( isExtCore_file ) -import ErrUtils ( dumpIfSet, dumpIfSet_dyn, showPass ) +import DynFlags +import ErrUtils import UniqSupply ( mkSplitUniqSupply ) import Outputable @@ -71,12 +77,11 @@ import HscTypes import MkExternalCore ( emitExternalCore ) import ParserCore import ParserCoreUtils -import Module ( Module, ModLocation(..), showModMsg ) import FastString import Maybes ( expectJust ) - +import Bag ( unitBag ) import Monad ( when ) -import Maybe ( isJust, fromJust ) +import Maybe ( isJust ) import IO import DATA_IOREF ( newIORef, readIORef ) \end{code} @@ -89,16 +94,20 @@ import DATA_IOREF ( newIORef, readIORef ) %************************************************************************ \begin{code} -newHscEnv :: GhciMode -> DynFlags -> IO HscEnv -newHscEnv ghci_mode dflags +newHscEnv :: DynFlags -> IO HscEnv +newHscEnv dflags = do { eps_var <- newIORef initExternalPackageState ; us <- mkSplitUniqSupply 'r' ; nc_var <- newIORef (initNameCache us knownKeyNames) - ; return (HscEnv { hsc_mode = ghci_mode, - hsc_dflags = dflags, + ; fc_var <- newIORef emptyModuleEnv + ; 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_NC = nc_var, + hsc_FC = fc_var } ) } knownKeyNames :: [Name] -- Put here to avoid loops involving DsMeta, @@ -120,7 +129,13 @@ knownKeyNames = map getName wiredInThings \begin{code} data HscResult -- Compilation failed - = HscFail + = HscFail + + -- In IDE mode: we just do the static/dynamic checks + | HscChecked + (Located (HsModule RdrName)) -- parsed + (Maybe (HsGroup Name)) -- renamed + (Maybe (LHsBinds Id, GlobalRdrEnv, ModDetails)) -- typechecked -- Concluded that it wasn't necessary | HscNoRecomp ModDetails -- new details (HomeSymbolTable additions) @@ -128,98 +143,248 @@ data HscResult -- 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 - -> Module - -> ModLocation -- location info - -> Bool -- True <=> source unchanged - -> Bool -- True <=> have an object file (for msgs only) - -> Maybe ModIface -- old interface, if available + -> ModSummary + -> Bool -- True <=> source unchanged + -> Bool -- True <=> have an object file (for msgs only) + -> Maybe ModIface -- Old interface, if available + -> Maybe (Int, Int) -- Just (i,n) <=> module i of n (for msgs) -> IO HscResult -hscMain hsc_env mod location +hscMain hsc_env mod_summary source_unchanged have_object maybe_old_iface + mb_mod_index = do { (recomp_reqd, maybe_checked_iface) <- - _scc_ "checkOldIface" - checkOldIface hsc_env mod - (ml_hi_file location) + {-# SCC "checkOldIface" #-} + checkOldIface hsc_env mod_summary 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 have_object - mod location maybe_checked_iface + ; what_next hsc_env mod_summary have_object + maybe_checked_iface + mb_mod_index } --- hscNoRecomp definitely expects to have the old interface available -hscNoRecomp hsc_env have_object - mod location (Just old_iface) - | hsc_mode hsc_env == OneShot +------------------------------ +hscNoRecomp hsc_env mod_summary + have_object (Just old_iface) + mb_mod_index + | isOneShot (ghcMode (hsc_dflags 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 bomb bomb) } | otherwise - = do { - when (verbosity (hsc_dflags hsc_env) >= 1) $ - hPutStrLn stderr ("Skipping " ++ - showModMsg have_object mod location); + = do { compilationProgressMsg (hsc_dflags hsc_env) $ + (showModuleIndex mb_mod_index ++ + "Skipping " ++ showModMsg have_object mod_summary) - new_details <- _scc_ "tcRnIface" - typecheckIface hsc_env old_iface ; - dumpIfaceStats hsc_env ; + ; new_details <- {-# SCC "tcRnIface" #-} + initIfaceCheck hsc_env $ + typecheckIface old_iface ; + ; dumpIfaceStats hsc_env - return (HscNoRecomp new_details old_iface) - } + ; return (HscNoRecomp new_details old_iface) + } + +hscNoRecomp hsc_env mod_summary + have_object Nothing + mb_mod_index + = panic "hscNoRecomp" -- hscNoRecomp definitely expects to + -- have the old interface available + +------------------------------ +hscRecomp hsc_env mod_summary + have_object maybe_old_iface + mb_mod_index + = case ms_hsc_src mod_summary of + HsSrcFile -> do + front_res <- hscFileFrontEnd hsc_env mod_summary mb_mod_index + case ghcMode (hsc_dflags hsc_env) of + JustTypecheck -> hscBootBackEnd hsc_env mod_summary maybe_old_iface front_res + _ -> hscBackEnd hsc_env mod_summary maybe_old_iface front_res + + HsBootFile -> do + front_res <- hscFileFrontEnd hsc_env mod_summary mb_mod_index + hscBootBackEnd hsc_env mod_summary maybe_old_iface front_res + + ExtCoreFile -> do + front_res <- hscCoreFrontEnd hsc_env mod_summary + hscBackEnd hsc_env mod_summary maybe_old_iface front_res + +hscCoreFrontEnd hsc_env mod_summary = do { + ------------------- + -- PARSE + ------------------- + ; inp <- readFile (expectJust "hscCoreFrontEnd" (ms_hspp_file mod_summary)) + ; case parseCore inp 1 of + FailP s -> errorMsg (hsc_dflags hsc_env) (text s{-ToDo: wrong-}) >> return Nothing + OkP rdr_module -> do { + + ------------------- + -- RENAME and TYPECHECK + ------------------- + ; (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! + }} + -hscRecomp hsc_env have_object - mod location maybe_checked_iface - = do { - -- what target are we shooting for? - ; let one_shot = hsc_mode hsc_env == OneShot - ; 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)) - - ; when (not one_shot && verbosity dflags >= 1) $ - hPutStrLn stderr ("Compiling " ++ - showModMsg (not toInterp) mod location); +hscFileFrontEnd hsc_env mod_summary mb_mod_index = do { + ------------------- + -- DISPLAY PROGRESS MESSAGE + ------------------- + ; let dflags = hsc_dflags hsc_env + one_shot = isOneShot (ghcMode dflags) + toInterp = hscTarget dflags == HscInterpreted + ; when (not one_shot) $ + compilationProgressMsg dflags $ + (showModuleIndex mb_mod_index ++ + "Compiling " ++ showModMsg (not toInterp) mod_summary) - ; front_res <- if toCore then - hscCoreFrontEnd hsc_env location - else - hscFrontEnd hsc_env location + ------------------- + -- PARSE + ------------------- + ; let hspp_file = expectJust "hscFileFrontEnd" (ms_hspp_file mod_summary) + hspp_buf = ms_hspp_buf mod_summary - ; case front_res of - Left flure -> return flure; - Right ds_result -> do { + ; 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 { - -- OMITTED: - -- ; seqList imported_modules (return ()) + ------------------- + -- RENAME and TYPECHECK + ------------------- + (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 -> do { + + ------------------- + -- DESUGAR + ------------------- + ; (warns, maybe_ds_result) <- {-# SCC "DeSugar" #-} + deSugar hsc_env tc_result + ; printBagOfWarnings dflags warns + ; return maybe_ds_result + }}}}} + +------------------------------ + +hscFileCheck :: HscEnv -> ModSummary -> IO HscResult +hscFileCheck hsc_env mod_summary = do { + ------------------- + -- PARSE + ------------------- + ; let dflags = hsc_dflags hsc_env + hspp_file = expectJust "hscFileFrontEnd" (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 HscFail } ; + 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 (HscChecked rdr_module Nothing Nothing); + Just tc_result -> do + let md = ModDetails { + md_types = tcg_type_env tc_result, + md_exports = tcg_exports tc_result, + md_insts = tcg_insts tc_result, + md_rules = [panic "no rules"] } + -- Rules are CoreRules, not the + -- RuleDecls we get out of the typechecker + return (HscChecked rdr_module + (tcg_rn_decls tc_result) + (Just (tcg_binds tc_result, + tcg_rdr_env tc_result, + md))) + }}}} + +------------------------------ +hscBootBackEnd :: HscEnv -> ModSummary -> Maybe ModIface -> Maybe ModGuts -> IO HscResult +-- For hs-boot files, there's no code generation to do + +hscBootBackEnd hsc_env mod_summary maybe_old_iface Nothing + = return HscFail +hscBootBackEnd hsc_env mod_summary maybe_old_iface (Just ds_result) + = do { details <- mkBootModDetails hsc_env ds_result + + ; (new_iface, no_change) + <- {-# SCC "MkFinalIface" #-} + mkIface hsc_env maybe_old_iface ds_result details + + ; writeIfaceFile hsc_env (ms_location mod_summary) new_iface no_change + + -- And the answer is ... + ; dumpIfaceStats hsc_env + + ; return (HscRecomp details new_iface + False False Nothing) + } + +------------------------------ +hscBackEnd :: HscEnv -> ModSummary -> Maybe ModIface -> Maybe ModGuts -> IO HscResult + +hscBackEnd hsc_env mod_summary maybe_old_iface Nothing + = return HscFail + +hscBackEnd hsc_env mod_summary maybe_old_iface (Just ds_result) + = do { -- OMITTED: + -- ; seqList imported_modules (return ()) + + let one_shot = isOneShot (ghcMode dflags) + dflags = hsc_dflags hsc_env ------------------- -- FLATTENING ------------------- - ; flat_result <- _scc_ "Flattening" + ; flat_result <- {-# SCC "Flattening" #-} flatten hsc_env ds_result @@ -249,17 +414,14 @@ hscRecomp hsc_env have_object ------------------- -- SIMPLIFY ------------------- - ; simpl_result <- _scc_ "Core2Core" + ; simpl_result <- {-# SCC "Core2Core" #-} core2core hsc_env flat_result ------------------- -- TIDY ------------------- - ; tidy_result <- _scc_ "CoreTidy" - tidyCorePgm hsc_env simpl_result - - -- Emit external core - ; emitExternalCore dflags tidy_result + ; (cg_guts, details) <- {-# SCC "CoreTidy" #-} + tidyProgram hsc_env simpl_result -- Alive at this point: -- tidy_result, pcs_final @@ -271,124 +433,74 @@ hscRecomp hsc_env have_object -- 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 - ; new_iface <- _scc_ "MkFinalIface" - mkIface hsc_env location - maybe_checked_iface tidy_result + ; (new_iface, no_change) + <- {-# SCC "MkFinalIface" #-} + mkIface hsc_env maybe_old_iface simpl_result details + ; writeIfaceFile hsc_env (ms_location mod_summary) new_iface no_change -- 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") + ; 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 } + ; final_details <- if one_shot then return (error "no final details") + else return $! details + + -- Emit external core + ; emitExternalCore dflags cg_guts ------------------- -- CONVERT TO STG and COMPLETE CODE GENERATION ; (stub_h_exists, stub_c_exists, maybe_bcos) - <- hscBackEnd dflags tidy_result + <- hscCodeGen dflags (ms_location mod_summary) cg_guts -- 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 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); - OkP rdr_module -> do { - - ------------------- - -- RENAME and TYPECHECK - ------------------- - ; maybe_tc_result <- _scc_ "TypeCheck" - tcRnExtCore hsc_env rdr_module - ; case maybe_tc_result of { - Nothing -> return (Left HscFail); - Just mod_guts -> return (Right mod_guts) - -- No desugaring to do! - }}} - + } -hscFrontEnd hsc_env location = do { - ------------------- - -- PARSE - ------------------- - ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) - (expectJust "hscFrontEnd:hspp" (ml_hspp_file location)) - - ; case maybe_parsed of { - Nothing -> return (Left HscFail); - Just rdr_module -> do { - - ------------------- - -- RENAME and TYPECHECK - ------------------- - ; maybe_tc_result <- _scc_ "Typecheck-Rename" - tcRnModule hsc_env rdr_module - ; case maybe_tc_result of { - Nothing -> return (Left HscFail); - Just tc_result -> do { - - ------------------- - -- DESUGAR - ------------------- - ; 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 - ModGuts{ -- This is the last use of the ModGuts in a compilation. +hscCodeGen dflags location + CgGuts{ -- 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 { + cg_module = this_mod, + cg_binds = core_binds, + cg_tycons = tycons, + cg_dir_imps = dir_imps, + cg_foreign = foreign_stubs, + cg_home_mods = home_mods, + cg_dep_pkgs = dependencies } = do { + + let { data_tycons = filter isDataTyCon tycons } ; + -- cg_tycons includes newtypes, for the benefit of External Core, + -- but we don't generate any code for newtypes ------------------- -- PREPARE FOR CODE GENERATION -- Do saturation and convert to A-normal form - prepd_binds <- _scc_ "CorePrep" - corePrepPgm dflags core_binds type_env; + prepd_binds <- {-# SCC "CorePrep" #-} + corePrepPgm dflags core_binds data_tycons ; - case dopt_HscLang dflags of + case hscTarget dflags of HscNothing -> return (False, False, Nothing) HscInterpreted -> #ifdef GHCI do ----------------- Generate byte code ------------------ - comp_bc <- byteCodeGen dflags prepd_binds type_env + comp_bc <- byteCodeGen dflags prepd_binds data_tycons ------------------ Create f-x-dynamic C-side stuff --- (istub_h_exists, istub_c_exists) - <- outputForeignStubs dflags foreign_stubs + <- outputForeignStubs dflags this_mod location foreign_stubs return ( istub_h_exists, istub_c_exists, Just comp_bc ) #else @@ -398,35 +510,56 @@ hscBackEnd dflags other -> do ----------------- Convert to STG ------------------ - (stg_binds, cost_centre_info) <- _scc_ "CoreToStg" - myCoreToStg dflags this_mod prepd_binds + (stg_binds, cost_centre_info) <- {-# SCC "CoreToStg" #-} + myCoreToStg dflags home_mods this_mod prepd_binds ------------------ Code generation ------------------ - abstractC <- _scc_ "CodeGen" - codeGen dflags this_mod type_env foreign_stubs - dir_imps cost_centre_info stg_binds + abstractC <- {-# SCC "CodeGen" #-} + codeGen dflags home_mods this_mod data_tycons + foreign_stubs dir_imps cost_centre_info + stg_binds ------------------ Code output ----------------------- (stub_h_exists, stub_c_exists) - <- codeOutput dflags this_mod foreign_stubs + <- codeOutput dflags this_mod location foreign_stubs dependencies abstractC return (stub_h_exists, stub_c_exists, Nothing) } -myParseModule dflags src_filename - = do -------------------------- Parser ---------------- - showPass dflags "Parser" - _scc_ "Parser" do - buf <- hGetStringBuffer src_filename +hscCmmFile :: DynFlags -> FilePath -> IO Bool +hscCmmFile dflags filename = do + maybe_cmm <- parseCmmFile dflags (mkHomeModules []) filename + case maybe_cmm of + Nothing -> return False + Just cmm -> do + codeOutput dflags no_mod no_loc NoStubs [] [cmm] + return True + 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" } + + +myParseModule dflags src_filename maybe_src_buf + = -------------------------- Parser ---------------- + showPass dflags "Parser" >> + {-# SCC "Parser" #-} do + + -- sometimes we already have the buffer in memory, perhaps + -- because we needed to parse the imports out of it, or get the + -- module name. + buf <- case maybe_src_buf of + Just b -> return b + Nothing -> hGetStringBuffer src_filename let loc = mkSrcLoc (mkFastString src_filename) 1 0 case unP parseModule (mkPState buf loc dflags) of { - PFailed l1 l2 err -> do { hPutStrLn stderr (showSDoc (showPFailed l1 l2 err)); - return Nothing }; + PFailed span err -> return (Left (mkPlainErrMsg span err)); POk _ rdr_module -> do { @@ -435,18 +568,18 @@ 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. }} -myCoreToStg dflags this_mod prepd_binds +myCoreToStg dflags home_mods this_mod prepd_binds = do - stg_binds <- _scc_ "Core2Stg" - coreToStg dflags prepd_binds + stg_binds <- {-# SCC "Core2Stg" #-} + coreToStg home_mods prepd_binds - (stg_binds2, cost_centre_info) <- _scc_ "Core2Stg" - stg2stg dflags this_mod stg_binds + (stg_binds2, cost_centre_info) <- {-# SCC "Stg2Stg" #-} + stg2stg dflags home_mods this_mod stg_binds return (stg_binds2, cost_centre_info) \end{code} @@ -488,19 +621,19 @@ 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 - -> InteractiveContext -- Context for compiling -> String -- The statement - -> IO (Maybe (InteractiveContext, [Name], HValue)) + -> IO (Maybe (HscEnv, [Name], HValue)) -hscStmt hsc_env icontext stmt +hscStmt hsc_env stmt = do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) stmt ; case maybe_stmt of { - Nothing -> return 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 - maybe_tc_result - <- tcRnStmt hsc_env icontext parsed_stmt + let icontext = hsc_IC hsc_env + ; maybe_tc_result <- tcRnStmt hsc_env icontext parsed_stmt ; case maybe_tc_result of { Nothing -> return Nothing ; @@ -512,91 +645,79 @@ hscStmt hsc_env icontext stmt (ic_type_env new_ic) tc_expr - ; return (Just (new_ic, bound_names, hval)) + ; return (Just (hsc_env{ hsc_IC=new_ic }, bound_names, hval)) }}}}} hscTcExpr -- Typecheck an expression (but don't run it) :: HscEnv - -> InteractiveContext -- Context for compiling -> String -- The expression -> IO (Maybe Type) -hscTcExpr hsc_env icontext expr +hscTcExpr hsc_env expr = do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) expr + ; let icontext = hsc_IC hsc_env ; case maybe_stmt of { - Just (ExprStmt expr _ _) + Nothing -> return Nothing ; -- Parse error + Just (Just (L _ (ExprStmt expr _ _))) -> tcRnExpr hsc_env icontext expr ; - Just other -> do { hPutStrLn stderr ("not an expression: `" ++ expr ++ "'") ; + Just other -> 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 ; + Just other -> do { errorMsg (hsc_dflags hsc_env) (text "not an type:" <+> quotes (text str)) ; return Nothing } ; Nothing -> return Nothing } } +#endif \end{code} \begin{code} -hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) -hscParseStmt dflags str - = do showPass dflags "Parser" - _scc_ "Parser" do +#ifdef GHCI +hscParseStmt :: DynFlags -> String -> IO (Maybe (Maybe (LStmt RdrName))) +hscParseStmt = hscParseThing parseStmt + +hscParseType :: DynFlags -> String -> IO (Maybe (LHsType RdrName)) +hscParseType = hscParseThing parseType +#endif + +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 + = showPass dflags "Parser" >> + {-# SCC "Parser" #-} do buf <- stringToStringBuffer str let loc = mkSrcLoc FSLIT("") 1 0 - case unP parseStmt (mkPState buf loc dflags) of { - - PFailed l1 l2 err -> do { hPutStrLn stderr (showSDoc (showPFailed l1 l2 err)); - 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. - 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} - -%************************************************************************ -%* * -\subsection{Getting information about an identifer} -%* * -%************************************************************************ - -\begin{code} -#ifdef GHCI -hscThing -- like hscStmt, but deals with a single identifier - :: HscEnv - -> InteractiveContext -- Context for compiling - -> String -- The identifier - -> IO [(IfaceDecl, Fixity)] - -hscThing hsc_env ic str - = do maybe_rdr_name <- myParseIdentifier (hsc_dflags hsc_env) str - case maybe_rdr_name of { - Nothing -> return []; - Just rdr_name -> do - - maybe_tc_result <- tcRnThing hsc_env ic rdr_name - - case maybe_tc_result of { - Nothing -> return [] ; - Just things -> return things - }} - -myParseIdentifier dflags str - = do buf <- stringToStringBuffer str - - let loc = mkSrcLoc FSLIT("") 1 0 - case unP parseIdentifier (mkPState buf loc dflags) of - - PFailed l1 l2 err -> do { hPutStrLn stderr (showSDoc (showPFailed l1 l2 err)); - return Nothing } - - POk _ rdr_name -> return (Just rdr_name) -#endif \end{code} %************************************************************************ @@ -609,7 +730,7 @@ myParseIdentifier dflags str #ifdef GHCI compileExpr :: HscEnv -> Module -> GlobalRdrEnv -> TypeEnv - -> TypecheckedHsExpr + -> LHsExpr Id -> IO HValue compileExpr hsc_env this_mod rdr_env type_env tc_expr @@ -626,7 +747,7 @@ compileExpr hsc_env this_mod rdr_env type_env tc_expr ; simpl_expr <- simplifyExpr dflags flat_expr -- Tidy it (temporary, until coreSat does cloning) - ; tidy_expr <- tidyCoreExpr simpl_expr + ; let tidy_expr = tidyExpr emptyTidyEnv simpl_expr -- Prepare for codegen ; prepd_expr <- corePrepExpr dflags tidy_expr @@ -670,3 +791,19 @@ dumpIfaceStats hsc_env dump_rn_stats = dopt Opt_D_dump_rn_stats dflags dump_if_trace = dopt Opt_D_dump_if_trace dflags \end{code} + +%************************************************************************ +%* * + Progress Messages: Module i of n +%* * +%************************************************************************ + +\begin{code} +showModuleIndex Nothing = "" +showModuleIndex (Just (i,n)) = "[" ++ padded ++ " of " ++ n_str ++ "] " + where + n_str = show n + i_str = show i + padded = replicate (length n_str - length i_str) ' ' ++ i_str +\end{code} +