X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=8bcd749b7a5daed4b70016e02e3641486d29b1af;hb=16e4ce4c0c02650082f2e11982017c903c549ad5;hp=67596216eed21d001c9e86e4275907e6d2056f82;hpb=17d765ce13bf28d9b79672a567d7faf28c822c76;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 6759621..8bcd749 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -1,50 +1,54 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1993-2000 % + \section[GHC_Main]{Main driver for Glasgow Haskell compiler} \begin{code} -module HscMain ( HscResult(..), hscMain, +module HscMain ( + HscResult(..), hscMain, initPersistentCompilerState #ifdef GHCI - hscStmt, + , hscStmt, hscTcExpr, hscThing, + , compileExpr #endif - initPersistentCompilerState ) where + ) where #include "HsVersions.h" #ifdef GHCI -import ByteCodeGen ( byteCodeGen ) -import CoreTidy ( tidyCoreExpr ) +import TcHsSyn ( TypecheckedHsExpr ) +import CodeOutput ( outputForeignStubs ) +import ByteCodeGen ( byteCodeGen, coreExprToBCOs ) +import Linker ( HValue, linkExpr ) +import TidyPgm ( tidyCoreExpr ) import CorePrep ( corePrepExpr ) -import Rename ( renameStmt ) +import Flattening ( flattenExpr ) +import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnThing ) import RdrHsSyn ( RdrNameStmt ) import Type ( Type ) -import Id ( Id, idName, setGlobalIdDetails ) -import IdInfo ( GlobalIdDetails(VanillaGlobal) ) -import HscTypes ( InteractiveContext(..), TyThing(..) ) import PrelNames ( iNTERACTIVE ) import StringBuffer ( stringToStringBuffer ) +import SrcLoc ( noSrcLoc ) +import Name ( Name ) +import CoreLint ( lintUnfolding ) #endif import HsSyn -import Id ( idName ) -import IdInfo ( CafInfo(..), CgInfoEnv, CgInfo(..) ) +import RdrName ( nameRdrName ) import StringBuffer ( hGetStringBuffer, freeStringBuffer ) import Parser -import Lex ( PState(..), ParseResult(..) ) +import Lex ( ParseResult(..), ExtFlags(..), mkPState ) import SrcLoc ( mkSrcLoc ) -import Rename ( checkOldIface, renameModule, closeIfaceDecls ) -import Rules ( emptyRuleBase ) -import PrelInfo ( wiredInThingEnv, wiredInThings ) -import PrelNames ( vanillaSyntaxMap, knownKeyNames ) -import MkIface ( mkFinalIface ) -import TcModule -import InstEnv ( emptyInstEnv ) +import TcRnDriver ( checkOldIface, tcRnModule, tcRnExtCore, tcRnIface ) +import RnEnv ( extendOrigNameCache ) +import PrelInfo ( wiredInThingEnv, knownKeyNames ) +import PrelRules ( builtinRules ) +import MkIface ( mkIface ) import Desugar +import Flattening ( flatten ) import SimplCore -import CoreUtils ( coreBindsSize ) -import CoreTidy ( tidyCorePgm ) +import TidyPgm ( tidyCorePgm ) import CorePrep ( corePrepPgm ) import StgSyn import CoreToStg ( coreToStg ) @@ -52,30 +56,27 @@ import SimplStg ( stg2stg ) import CodeGen ( codeGen ) import CodeOutput ( codeOutput ) -import Module ( ModuleName, moduleName, mkHomeModule, - moduleUserString ) +import Module ( emptyModuleEnv ) import CmdLineOpts -import ErrUtils ( dumpIfSet_dyn, showPass, printError ) -import Util ( unJust ) +import DriverPhases ( isExtCore_file ) +import ErrUtils ( dumpIfSet_dyn, showPass ) import UniqSupply ( mkSplitUniqSupply ) -import Bag ( emptyBag ) +import Bag ( consBag, emptyBag ) import Outputable -import Interpreter -import CmStaticInfo ( GhciMode(..) ) import HscStats ( ppSourceStats ) import HscTypes -import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) -import OccName ( OccName ) -import Name ( Name, nameModule, nameOccName, getName, isGlobalName ) -import NameEnv ( emptyNameEnv, mkNameEnv ) -import Module ( Module, lookupModuleEnvByName ) -import Maybes ( orElse ) - -import IOExts ( newIORef, readIORef, writeIORef, unsafePerformIO ) +import MkExternalCore ( emitExternalCore ) +import ParserCore +import ParserCoreUtils +import FiniteMap ( emptyFM ) +import Name ( nameModule ) +import Module ( Module, ModLocation(..), showModMsg ) +import FastString +import Maybes ( expectJust ) import Monad ( when ) -import Maybe ( isJust ) +import Maybe ( isJust, fromJust ) import IO \end{code} @@ -98,283 +99,304 @@ data HscResult | HscRecomp PersistentCompilerState -- updated PCS ModDetails -- new details (HomeSymbolTable additions) ModIface -- new iface (if any compilation was done) - (Maybe String) -- generated stub_h filename (in TMPDIR) - (Maybe String) -- generated stub_c filename (in TMPDIR) - (Maybe ([UnlinkedBCO],ItblEnv)) -- interpreted code, if any - + Bool -- stub_h exists + Bool -- stub_c exists + (Maybe CompiledByteCode) -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves hscMain - :: GhciMode - -> DynFlags + :: HscEnv + -> PersistentCompilerState -- IN: persistent compiler state -> Module - -> ModuleLocation -- location info + -> ModLocation -- location info -> Bool -- True <=> source unchanged -> Bool -- True <=> have an object file (for msgs only) -> Maybe ModIface -- old interface, if available - -> HomeSymbolTable -- for home module ModDetails - -> HomeIfaceTable - -> PersistentCompilerState -- IN: persistent compiler state -> IO HscResult -hscMain ghci_mode dflags mod location source_unchanged have_object - maybe_old_iface hst hit pcs +hscMain hsc_env pcs mod location + source_unchanged have_object maybe_old_iface = do { - showPass dflags ("Checking old interface for hs = " - ++ show (ml_hs_file location) - ++ ", hspp = " ++ show (ml_hspp_file location)); - - (pcs_ch, errs_found, (recomp_reqd, maybe_checked_iface)) - <- checkOldIface ghci_mode dflags hit hst pcs - (unJust "hscMain" (ml_hi_file location)) - source_unchanged maybe_old_iface; - - if errs_found then - return (HscFail pcs_ch) - else 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 { let no_old_iface = not (isJust maybe_checked_iface) what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp - ; - what_next ghci_mode dflags have_object mod location - maybe_checked_iface hst hit pcs_ch - }} + ; what_next hsc_env pcs_ch have_object + mod location maybe_checked_iface + }}} --- we definitely expect to have the old interface available -hscNoRecomp ghci_mode dflags have_object - mod location (Just old_iface) hst hit pcs_ch - | ghci_mode == OneShot + +-- hscNoRecomp definitely expects to have the old interface available +hscNoRecomp hsc_env pcs_ch have_object + mod location (Just old_iface) + | hsc_mode hsc_env == OneShot = do { - hPutStrLn stderr "compilation IS NOT required"; + when (verbosity (hsc_dflags hsc_env) > 0) $ + hPutStrLn stderr "compilation IS NOT required"; let { bomb = panic "hscNoRecomp:OneShot" }; return (HscNoRecomp pcs_ch bomb bomb) } | otherwise = do { - when (verbosity dflags >= 1) $ + when (verbosity (hsc_dflags hsc_env) >= 1) $ hPutStrLn stderr ("Skipping " ++ - compMsg have_object mod location); - - -- CLOSURE - (pcs_cl, closure_errs, cl_hs_decls) - <- closeIfaceDecls dflags hit hst pcs_ch old_iface ; - if closure_errs then - return (HscFail pcs_cl) - else do { + showModMsg have_object mod location); - -- TYPECHECK - maybe_tc_result - <- typecheckIface dflags pcs_cl hst old_iface (vanillaSyntaxMap, cl_hs_decls); + -- Typecheck + (pcs_tc, maybe_tc_result) <- tcRnIface hsc_env pcs_ch old_iface ; case maybe_tc_result of { - Nothing -> return (HscFail pcs_cl); - Just (pcs_tc, new_details) -> + Nothing -> return (HscFail pcs_tc); + Just new_details -> return (HscNoRecomp pcs_tc new_details old_iface) - }}} - -compMsg use_object mod location = - mod_str ++ take (max 0 (16 - length mod_str)) (repeat ' ') - ++" ( " ++ unJust "hscRecomp" (ml_hs_file location) ++ ", " - ++ (if use_object - then unJust "hscRecomp" (ml_obj_file location) - else "interpreted") - ++ " )" - where mod_str = moduleUserString mod - + }} -hscRecomp ghci_mode dflags have_object - mod location maybe_checked_iface hst hit pcs_ch +hscRecomp hsc_env pcs_ch have_object + mod location maybe_checked_iface = do { -- what target are we shooting for? - ; let toInterp = dopt_HscLang dflags == HscInterpreted + ; 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 (verbosity dflags >= 1) $ + ; when (not one_shot && verbosity dflags >= 1) $ hPutStrLn stderr ("Compiling " ++ - compMsg (not toInterp) mod location); + showModMsg (not toInterp) mod location); + + ; front_res <- if toCore then + hscCoreFrontEnd hsc_env pcs_ch location + else + hscFrontEnd hsc_env pcs_ch location + + ; case front_res of + Left flure -> return flure; + Right (pcs_tc, ds_result) -> do { + + + -- OMITTED: + -- ; seqList imported_modules (return ()) ------------------- - -- PARSE + -- FLATTENING ------------------- - ; maybe_parsed <- myParseModule dflags - (unJust "hscRecomp:hspp" (ml_hspp_file location)) - ; case maybe_parsed of { - Nothing -> return (HscFail pcs_ch); - Just rdr_module -> do { - ; let this_mod = mkHomeModule (hsModuleName rdr_module) - + ; flat_result <- _scc_ "Flattening" + flatten hsc_env pcs_tc ds_result + + + ; let -- Rule-base accumulated from imported packages + pkg_rule_base = eps_rule_base (pcs_EPS pcs_tc) + + -- 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 + ------------------- - -- RENAME + -- SIMPLIFY ------------------- - ; (pcs_rn, print_unqualified, maybe_rn_result) - <- _scc_ "Rename" - renameModule dflags hit hst pcs_ch this_mod rdr_module - ; case maybe_rn_result of { - Nothing -> return (HscFail pcs_ch{-was: pcs_rn-}); - Just (is_exported, new_iface, rn_hs_decls) -> do { - - -- In interactive mode, we don't want to discard any top-level entities at - -- all (eg. do not inline them away during simplification), and retain them - -- all in the TypeEnv so they are available from the command line. - -- - -- isGlobalName separates the user-defined top-level names from those - -- introduced by the type checker. - ; let dont_discard | ghci_mode == Interactive = isGlobalName - | otherwise = is_exported + ; simpl_result <- _scc_ "Core2Core" + core2core hsc_env pkg_rule_base flat_result ------------------- - -- TYPECHECK + -- TIDY ------------------- - ; maybe_tc_result - <- _scc_ "TypeCheck" typecheckModule dflags pcs_rn hst new_iface - print_unqualified rn_hs_decls - ; case maybe_tc_result of { - Nothing -> return (HscFail pcs_ch{-was: pcs_rn-}); - Just (pcs_tc, tc_result) -> do { - + ; (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 + + ; emitExternalCore dflags tidy_result + + -- Alive at this point: + -- tidy_result, pcs_final + -- hsc_env + ------------------- - -- DESUGAR + -- BUILD THE NEW ModIface and ModDetails + -- and emit external core if necessary + -- 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 + + + -- 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 + + -- 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 } + ------------------- - ; (ds_details, foreign_stuff) - <- _scc_ "DeSugar" - deSugar dflags pcs_tc hst this_mod print_unqualified tc_result + -- CONVERT TO STG and COMPLETE CODE GENERATION + ; (stub_h_exists, stub_c_exists, maybe_bcos) + <- hscBackEnd dflags tidy_result + -- and the answer is ... + ; return (HscRecomp pcs_final + final_details + final_iface + stub_h_exists stub_c_exists + maybe_bcos) + }} + +hscCoreFrontEnd hsc_env pcs_ch location = do { ------------------- - -- SIMPLIFY + -- 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)); + OkP rdr_module -> do { + + ------------------- + -- RENAME and TYPECHECK ------------------- - ; simpl_details - <- _scc_ "Core2Core" - core2core dflags pcs_tc hst dont_discard ds_details + ; (pcs_tc, maybe_tc_result) <- _scc_ "TypeCheck" + tcRnExtCore hsc_env pcs_ch rdr_module + ; case maybe_tc_result of { + Nothing -> return (Left (HscFail pcs_tc)); + Just mod_guts -> return (Right (pcs_tc, mod_guts)) + -- No desugaring to do! + }}} + +hscFrontEnd hsc_env pcs_ch location = do { ------------------- - -- TIDY + -- PARSE ------------------- - ; 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_details) - <- tidyCorePgm dflags this_mod pcs_tc cg_info simpl_details - + ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) + (expectJust "hscFrontEnd:hspp" (ml_hspp_file location)) + + ; case maybe_parsed of { + Nothing -> return (Left (HscFail pcs_ch)); + Just rdr_module -> do { + ------------------- - -- PREPARE FOR CODE GENERATION + -- RENAME and TYPECHECK ------------------- - -- Do saturation and convert to A-normal form - ; prepd_details <- corePrepPgm dflags tidy_details + ; (pcs_tc, maybe_tc_result) <- _scc_ "Typecheck-Rename" + tcRnModule hsc_env pcs_ch rdr_module + ; case maybe_tc_result of { + Nothing -> return (Left (HscFail pcs_ch)); + Just tc_result -> do { ------------------- - -- CONVERT TO STG and COMPLETE CODE GENERATION + -- DESUGAR ------------------- - ; let - ModDetails{md_binds=binds, md_types=env_tc} = prepd_details + ; ds_result <- _scc_ "DeSugar" + deSugar hsc_env pcs_tc tc_result + ; return (Right (pcs_tc, ds_result)) + }}}}} + + +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 { - local_tycons = typeEnvTyCons env_tc - local_classes = typeEnvClasses env_tc + ------------------- + -- PREPARE FOR CODE GENERATION + -- Do saturation and convert to A-normal form + prepd_binds <- _scc_ "CorePrep" + corePrepPgm dflags core_binds type_env; - imported_module_names = map ideclName (hsModuleImports rdr_module) - imported_modules = map mod_name_to_Module imported_module_names + case dopt_HscLang dflags of + HscNothing -> return (False, False, Nothing) - (h_code,c_code,fe_binders) = foreign_stuff + HscInterpreted -> +#ifdef GHCI + do ----------------- Generate byte code ------------------ + comp_bc <- byteCodeGen dflags prepd_binds type_env - pit = pcs_PIT pcs_simpl - - mod_name_to_Module :: ModuleName -> Module - mod_name_to_Module nm - = let str_mi = lookupModuleEnvByName hit nm `orElse` - lookupModuleEnvByName pit nm `orElse` - pprPanic "mod_name_to_Module: no hst or pst mapping for" - (ppr nm) - in mi_module str_mi - - ; (maybe_stub_h_filename, maybe_stub_c_filename, - maybe_bcos, final_iface ) - <- if toInterp - then do - ----------------- Generate byte code ------------------ - (bcos,itbl_env) <- byteCodeGen dflags binds - local_tycons local_classes - - -- Fill in the code-gen info - writeIORef cg_info_ref (Just emptyNameEnv) - - ------------------ BUILD THE NEW ModIface ------------ - final_iface <- _scc_ "MkFinalIface" - mkFinalIface ghci_mode dflags location - maybe_checked_iface new_iface tidy_details - - return ( Nothing, Nothing, - Just (bcos,itbl_env), final_iface ) - - else do - ----------------- Convert to STG ------------------ - (stg_binds, cost_centre_info, stg_back_end_info) - <- _scc_ "CoreToStg" - myCoreToStg dflags this_mod binds - - -- Fill in the code-gen info for the earlier tidyCorePgm - writeIORef cg_info_ref (Just stg_back_end_info) - - ------------------ BUILD THE NEW ModIface ------------ - final_iface <- _scc_ "MkFinalIface" - mkFinalIface ghci_mode dflags location - maybe_checked_iface new_iface tidy_details - - ------------------ Code generation ------------------ - abstractC <- _scc_ "CodeGen" - codeGen dflags this_mod imported_modules - cost_centre_info fe_binders - local_tycons stg_binds - - ------------------ Code output ----------------------- - (maybe_stub_h_name, maybe_stub_c_name) - <- codeOutput dflags this_mod local_tycons - binds stg_binds - c_code h_code abstractC - - return ( maybe_stub_h_name, maybe_stub_c_name, - Nothing, final_iface ) - - ; let final_details = tidy_details {md_binds = []} + ------------------ Create f-x-dynamic C-side stuff --- + (istub_h_exists, istub_c_exists) + <- outputForeignStubs dflags foreign_stubs + + 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) <- _scc_ "CoreToStg" + myCoreToStg dflags this_mod prepd_binds + + ------------------ Code generation ------------------ + abstractC <- _scc_ "CodeGen" + 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 this_mod foreign_stubs + dependencies abstractC + + return (stub_h_exists, stub_c_exists, Nothing) + } - -- and the answer is ... - ; return (HscRecomp pcs_simpl - final_details - final_iface - maybe_stub_h_filename maybe_stub_c_filename - maybe_bcos) - }}}}}}} myParseModule dflags src_filename = do -------------------------- Parser ---------------- showPass dflags "Parser" _scc_ "Parser" do + buf <- hGetStringBuffer src_filename - buf <- hGetStringBuffer True{-expand tabs-} src_filename - - let glaexts | dopt Opt_GlasgowExts dflags = 1# - | otherwise = 0# + let exts = mkExtFlags dflags + loc = mkSrcLoc (mkFastString src_filename) 1 - case parseModule buf PState{ bol = 0#, atbol = 1#, - context = [], glasgow_exts = glaexts, - loc = mkSrcLoc (_PK_ src_filename) 1 } of { + case parseModule buf (mkPState loc exts) of { PFailed err -> do { hPutStrLn stderr (showSDoc err); freeStringBuffer buf; return Nothing }; - POk _ rdr_module@(HsModule mod_name _ _ _ _ _ _) -> do { + POk _ rdr_module -> do { dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_module) ; @@ -386,30 +408,15 @@ myParseModule dflags src_filename }} -myCoreToStg dflags this_mod 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 - - stg_binds <- _scc_ "Core2Stg" coreToStg dflags tidy_binds - - (stg_binds2, cost_centre_info) - <- _scc_ "Core2Stg" stg2stg dflags this_mod stg_binds - - let env_rhs :: CgInfoEnv - env_rhs = mkNameEnv [ (idName bndr, CgInfo (stgRhsArity rhs) caf_info) - | (bind,_) <- stg_binds2, - let caf_info - | stgBindHasCafRefs bind = MayHaveCafRefs - | otherwise = NoCafRefs, - (bndr,rhs) <- stgBindPairs bind ] - - return (stg_binds2, cost_centre_info, env_rhs) - where - stgBindPairs (StgNonRec _ b r) = [(b,r)] - stgBindPairs (StgRec _ prs) = prs + stg_binds <- _scc_ "Core2Stg" + coreToStg dflags prepd_binds + + (stg_binds2, cost_centre_info) <- _scc_ "Core2Stg" + stg2stg dflags this_mod stg_binds + + return (stg_binds2, cost_centre_info) \end{code} @@ -419,22 +426,6 @@ myCoreToStg dflags this_mod tidy_binds %* * %************************************************************************ -\begin{code} -#ifdef GHCI -hscStmt - :: DynFlags - -> HomeSymbolTable - -> HomeIfaceTable - -> PersistentCompilerState -- IN: persistent compiler state - -> InteractiveContext -- Context for compiling - -> String -- The statement - -> Bool -- just treat it as an expression - -> IO ( PersistentCompilerState, - Maybe ( [Id], - Type, - UnlinkedBCOExpr) ) -\end{code} - When the UnlinkedBCOExpr is linked you get an HValue of type IO [HValue] When you run it you get a list of HValues that should be @@ -462,91 +453,67 @@ A naked expression returns a singleton Name [it]. result not showable) ==> error \begin{code} -hscStmt dflags hst hit pcs0 icontext stmt just_expr - = let - InteractiveContext { - ic_rn_env = rn_env, - ic_type_env = type_env, - ic_module = scope_mod } = icontext - in - do { maybe_stmt <- hscParseStmt dflags stmt - ; case maybe_stmt of - Nothing -> return (pcs0, Nothing) - Just parsed_stmt -> do { - - let { notExprStmt (ExprStmt _ _) = False; - notExprStmt _ = True - }; - - if (just_expr && notExprStmt parsed_stmt) - then do hPutStrLn stderr ("not an expression: `" ++ stmt ++ "'") - return (pcs0, Nothing) - else do { - - -- Rename it - (pcs1, print_unqual, maybe_renamed_stmt) - <- renameStmt dflags hit hst pcs0 scope_mod - iNTERACTIVE rn_env parsed_stmt - - ; case maybe_renamed_stmt of - Nothing -> return (pcs0, Nothing) - Just (bound_names, rn_stmt) -> do { - - -- Typecheck it - maybe_tc_return <- - if just_expr - then case rn_stmt of { (syn, ExprStmt e _, decls) -> - typecheckExpr dflags pcs1 hst type_env - print_unqual iNTERACTIVE (syn,e,decls) } - else typecheckStmt dflags pcs1 hst type_env - print_unqual iNTERACTIVE bound_names rn_stmt - - ; case maybe_tc_return of - Nothing -> return (pcs0, Nothing) - Just (pcs2, tc_expr, bound_ids, ty) -> do { - - -- Desugar it - ds_expr <- deSugarExpr dflags pcs2 hst iNTERACTIVE print_unqual tc_expr - - -- Simplify it - ; simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr +#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) ) - -- Tidy it (temporary, until coreSat does cloning) - ; tidy_expr <- tidyCoreExpr simpl_expr +hscStmt hsc_env pcs icontext stmt + = do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) stmt + ; case maybe_stmt of { + Nothing -> return (pcs, Nothing) ; + Just parsed_stmt -> do { - -- Prepare for codegen - ; prepd_expr <- corePrepExpr dflags tidy_expr + -- Rename and typecheck it + (pcs1, maybe_tc_result) + <- tcRnStmt hsc_env pcs icontext parsed_stmt - -- Convert to BCOs - ; bcos <- coreExprToBCOs dflags prepd_expr + ; case maybe_tc_result of { + Nothing -> return (pcs1, Nothing) ; + Just (new_ic, bound_names, tc_expr) -> do { - ; let - -- Make all the bound ids "global" ids, now that - -- they're notionally top-level bindings. This is - -- important: otherwise when we come to compile an expression - -- using these ids later, the byte code generator will consider - -- the occurrences to be free rather than global. - global_bound_ids = map globaliseId bound_ids; - globaliseId id = setGlobalIdDetails id VanillaGlobal + -- Then desugar, code gen, and link it + ; hval <- compileExpr hsc_env pcs1 iNTERACTIVE + (ic_rn_gbl_env new_ic) + (ic_type_env new_ic) + tc_expr - ; return (pcs2, Just (global_bound_ids, ty, bcos)) + ; return (pcs1, 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) + +hscTcExpr hsc_env pcs 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) } } +\end{code} +\begin{code} hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) hscParseStmt dflags str - = do -------------------------- Parser ---------------- - showPass dflags "Parser" - _scc_ "Parser" do + = do showPass dflags "Parser" + _scc_ "Parser" do buf <- stringToStringBuffer str - let glaexts | dopt Opt_GlasgowExts dflags = 1# - | otherwise = 0# + let exts = mkExtFlags dflags + loc = mkSrcLoc FSLIT("") 1 - case parseStmt buf PState{ bol = 0#, atbol = 1#, - context = [], glasgow_exts = glaexts, - loc = mkSrcLoc SLIT("") 0 } of { + case parseStmt buf (mkPState loc exts) of { PFailed err -> do { hPutStrLn stderr (showSDoc err); -- Not yet implemented in <4.11 freeStringBuffer buf; @@ -568,6 +535,109 @@ hscParseStmt dflags str %************************************************************************ %* * +\subsection{Getting information about an identifer} +%* * +%************************************************************************ + +\begin{code} +#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 + + maybe_rdr_name <- myParseIdentifier dflags str + case maybe_rdr_name of { + Nothing -> return (pcs0, []); + Just rdr_name -> do + + (pcs1, maybe_tc_result) <- + tcRnThing hsc_env pcs0 ic rdr_name + + case maybe_tc_result of { + Nothing -> return (pcs1, []) ; + Just things -> return (pcs1, things) + }} + +myParseIdentifier dflags str + = do buf <- stringToStringBuffer str + + let exts = mkExtFlags 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} + +%************************************************************************ +%* * + Desugar, simplify, convert to bytecode, and link an expression +%* * +%************************************************************************ + +\begin{code} +#ifdef GHCI +compileExpr :: HscEnv + -> PersistentCompilerState + -> Module -> GlobalRdrEnv -> TypeEnv + -> TypecheckedHsExpr + -> IO HValue + +compileExpr hsc_env pcs 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 + + -- Flatten it + ; flat_expr <- flattenExpr hsc_env pcs ds_expr + + -- Simplify it + ; simpl_expr <- simplifyExpr dflags flat_expr + + -- Tidy it (temporary, until coreSat does cloning) + ; tidy_expr <- tidyCoreExpr simpl_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 + + ; return hval + } +#endif +\end{code} + + +%************************************************************************ +%* * \subsection{Initial persistent state} %* * %************************************************************************ @@ -575,44 +645,40 @@ hscParseStmt dflags str \begin{code} initPersistentCompilerState :: IO PersistentCompilerState initPersistentCompilerState - = do prs <- initPersistentRenamerState + = do nc <- initNameCache return ( - PCS { pcs_PIT = emptyIfaceTable, - pcs_PTE = wiredInThingEnv, - pcs_insts = emptyInstEnv, - pcs_rules = emptyRuleBase, - pcs_PRS = prs - } - ) - -initPersistentRenamerState :: IO PersistentRenamerState + PCS { pcs_EPS = initExternalPackageState, + pcs_nc = nc }) + +initNameCache :: IO NameCache = do us <- mkSplitUniqSupply 'r' - return ( - PRS { prsOrig = NameSupply { nsUniqs = us, - nsNames = initOrigNames, - nsIPs = emptyFM }, - prsDecls = (emptyNameEnv, 0), - prsInsts = (emptyBag, 0), - prsRules = (emptyBag, 0), - prsImpMods = emptyFM - } - ) - -initOrigNames :: FiniteMap (ModuleName,OccName) Name -initOrigNames - = grab knownKeyNames `plusFM` grab (map getName wiredInThings) - where - grab names = foldl add emptyFM names - add env name - = addToFM env (moduleName (nameModule name), nameOccName name) name - - -initRules :: PackageRuleBase -initRules = emptyRuleBase -{- SHOULD BE (ish) - foldl add emptyVarEnv builtinRules - where - add env (name,rule) - = extendRuleBase env name rule --} + return (NameCache { nsUniqs = us, + nsNames = initOrigNames, + nsIPs = emptyFM }) + +initExternalPackageState :: ExternalPackageState +initExternalPackageState + = emptyExternalPackageState { + eps_rules = foldr add_rule (emptyBag, 0) builtinRules, + eps_PTE = wiredInThingEnv, + } + 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 + +mkExtFlags dflags + = ExtFlags { glasgowExtsEF = dopt Opt_GlasgowExts dflags, + ffiEF = dopt Opt_FFI dflags, + withEF = dopt Opt_With dflags, + arrowsEF = dopt Opt_Arrows dflags, + parrEF = dopt Opt_PArr dflags} \end{code}