X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=b5085cdbd183da5ac4ddb59c6ef048442280f4da;hb=2660fbb9fd95646f8eb2f4f953711853bd85cc0e;hp=e60fbbe2435540680d32b62dd285356e9fc70bcc;hpb=436d7d6786f82883b898c694f69df23111d06a0f;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index e60fbbe..b5085cd 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -1,79 +1,91 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1993-2000 % + \section[GHC_Main]{Main driver for Glasgow Haskell compiler} \begin{code} module HscMain ( HscResult(..), hscMain, #ifdef GHCI - hscStmt, + hscStmt, hscThing, #endif initPersistentCompilerState ) where #include "HsVersions.h" #ifdef GHCI -import RdrHsSyn ( RdrNameStmt ) -import Rename ( renameStmt ) +import Interpreter import ByteCodeGen ( byteCodeGen ) +import CoreTidy ( tidyCoreExpr ) +import CorePrep ( corePrepExpr ) +import Rename ( renameStmt, renameRdrName ) +import RdrName ( rdrNameOcc, setRdrNameOcc ) +import RdrHsSyn ( RdrNameStmt ) +import OccName ( dataName, tcClsName, + occNameSpace, setOccNameSpace ) +import Type ( Type ) +import Id ( Id, idName, setGlobalIdDetails ) +import IdInfo ( GlobalIdDetails(VanillaGlobal) ) +import HscTypes ( InteractiveContext(..) ) +import PrelNames ( iNTERACTIVE ) +import StringBuffer ( stringToStringBuffer ) +import FastString ( mkFastString ) +import Maybes ( catMaybes ) #endif import HsSyn -import StringBuffer ( hGetStringBuffer, - stringToStringBuffer, freeStringBuffer ) +import RdrName ( mkRdrOrig ) +import Id ( idName ) +import IdInfo ( CafInfo(..), CgInfoEnv, CgInfo(..) ) +import StringBuffer ( hGetStringBuffer, freeStringBuffer ) import Parser import Lex ( PState(..), ParseResult(..) ) import SrcLoc ( mkSrcLoc ) +import Finder ( findModule ) import Rename ( checkOldIface, renameModule, closeIfaceDecls ) import Rules ( emptyRuleBase ) import PrelInfo ( wiredInThingEnv, wiredInThings ) -import PrelNames ( vanillaSyntaxMap, knownKeyNames ) -import MkIface ( completeIface, mkModDetailsFromIface, mkModDetails, - writeIface, pprIface ) +import PrelRules ( builtinRules ) +import PrelNames ( knownKeyNames ) +import MkIface ( mkFinalIface ) import TcModule import InstEnv ( emptyInstEnv ) import Desugar import SimplCore import CoreUtils ( coreBindsSize ) import CoreTidy ( tidyCorePgm ) -import CoreSat +import CorePrep ( corePrepPgm ) +import StgSyn import CoreToStg ( coreToStg ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) import CodeOutput ( codeOutput ) -import Id ( Id, idName, idFlavour, modifyIdInfo ) -import IdInfo ( setFlavourInfo, makeConstantFlavour ) import Module ( ModuleName, moduleName, mkHomeModule, moduleUserString ) import CmdLineOpts -import ErrUtils ( dumpIfSet_dyn, showPass ) +import ErrUtils ( dumpIfSet_dyn, showPass, printError ) import Util ( unJust ) import UniqSupply ( mkSplitUniqSupply ) -import Bag ( emptyBag ) +import Bag ( consBag, emptyBag ) import Outputable -import Interpreter -import CmStaticInfo ( GhciMode(..) ) import HscStats ( ppSourceStats ) -import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..), - PersistentRenamerState(..), ModuleLocation(..), - HomeSymbolTable, InteractiveContext(..), TyThing(..), - NameSupply(..), PackageRuleBase, HomeIfaceTable, - typeEnvClasses, typeEnvTyCons, emptyIfaceTable, - extendLocalRdrEnv - ) +import HscTypes import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) import OccName ( OccName ) -import Name ( Name, nameModule, nameOccName, getName, isGlobalName, - emptyNameEnv, extendNameEnvList - ) -import Module ( Module, lookupModuleEnvByName ) +import Name ( Name, nameModule, nameOccName, getName, isGlobalName ) +import NameEnv ( emptyNameEnv, mkNameEnv ) +import Module ( Module ) + +import IOExts ( newIORef, readIORef, writeIORef, unsafePerformIO ) import Monad ( when ) -import Maybe ( isJust ) +import Maybe ( isJust, fromJust ) import IO + +import MkExternalCore ( emitExternalCore ) \end{code} @@ -95,10 +107,13 @@ 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 /tmp) - (Maybe String) -- generated stub_c filename (in /tmp) + Bool -- stub_h exists + Bool -- stub_c exists +#ifdef GHCI (Maybe ([UnlinkedBCO],ItblEnv)) -- interpreted code, if any - +#else + (Maybe ()) -- no interpreted code whatsoever +#endif -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves @@ -108,22 +123,24 @@ hscMain -> DynFlags -> Module -> ModuleLocation -- location info - -> Bool -- source unchanged? + -> 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 maybe_old_iface hst hit pcs +hscMain ghci_mode dflags mod location source_unchanged have_object + maybe_old_iface hst hit pcs = 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)) + <- _scc_ "checkOldIface" + checkOldIface ghci_mode dflags hit hst pcs (ml_hi_file location) source_unchanged maybe_old_iface; if errs_found then @@ -134,23 +151,26 @@ hscMain ghci_mode dflags mod location source_unchanged maybe_old_iface hst hit p what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp ; - what_next ghci_mode dflags mod location maybe_checked_iface - hst hit pcs_ch + what_next ghci_mode dflags have_object mod location + maybe_checked_iface hst hit pcs_ch }} -- we definitely expect to have the old interface available -hscNoRecomp ghci_mode dflags mod location (Just old_iface) hst hit pcs_ch +hscNoRecomp ghci_mode dflags have_object + mod location (Just old_iface) hst hit pcs_ch | ghci_mode == OneShot = do { - hPutStrLn stderr "compilation IS NOT required"; + when (verbosity dflags > 0) $ + hPutStrLn stderr "compilation IS NOT required"; let { bomb = panic "hscNoRecomp:OneShot" }; return (HscNoRecomp pcs_ch bomb bomb) } | otherwise = do { when (verbosity dflags >= 1) $ - hPutStrLn stderr ("Skipping " ++ compMsg mod location); + hPutStrLn stderr ("Skipping " ++ + compMsg have_object mod location); -- CLOSURE (pcs_cl, closure_errs, cl_hs_decls) @@ -161,31 +181,35 @@ hscNoRecomp ghci_mode dflags mod location (Just old_iface) hst hit pcs_ch -- TYPECHECK maybe_tc_result - <- typecheckIface dflags pcs_cl hst old_iface (vanillaSyntaxMap, cl_hs_decls); + <- typecheckIface dflags pcs_cl hst old_iface cl_hs_decls; case maybe_tc_result of { Nothing -> return (HscFail pcs_cl); - Just (pcs_tc, env_tc, local_rules) -> do { + Just (pcs_tc, new_details) -> - -- create a new details from the closed, typechecked, old iface - let new_details = mkModDetailsFromIface env_tc local_rules - ; return (HscNoRecomp pcs_tc new_details old_iface) - }}}} - -compMsg mod location = - mod_str ++ take (12 - length mod_str) (repeat ' ') - ++ " (" ++ unJust "hscRecomp" (ml_hs_file location) ++ ")" + }}} + +compMsg use_object mod location = + mod_str ++ replicate (max 0 (16 - length mod_str)) ' ' + ++" ( " ++ 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 mod location maybe_checked_iface hst hit pcs_ch +hscRecomp ghci_mode dflags have_object + mod location maybe_checked_iface hst hit pcs_ch = do { - ; when (verbosity dflags >= 1) $ - hPutStrLn stderr ("Compiling " ++ compMsg mod location); - -- what target are we shooting for? ; let toInterp = dopt_HscLang dflags == HscInterpreted + ; let toNothing = dopt_HscLang dflags == HscNothing + + ; when (ghci_mode /= OneShot && verbosity dflags >= 1) $ + hPutStrLn stderr ("Compiling " ++ + compMsg (not toInterp) mod location); ------------------- -- PARSE @@ -226,69 +250,147 @@ hscRecomp ghci_mode dflags mod location maybe_checked_iface hst hit pcs_ch Nothing -> return (HscFail pcs_ch{-was: pcs_rn-}); Just (pcs_tc, tc_result) -> do { - ; let env_tc = tc_env tc_result - ------------------- -- DESUGAR ------------------- - ; (ds_binds, ds_rules, foreign_stuff) + ; (ds_details, foreign_stuff) <- _scc_ "DeSugar" deSugar dflags pcs_tc hst this_mod print_unqualified tc_result + ; pcs_middle + <- if ghci_mode == OneShot + 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 + ------------------- - -- SIMPLIFY, TIDY-CORE + -- SIMPLIFY ------------------- - -- We grab the the unfoldings at this point. - ; (pcs_simpl, tidy_binds, orphan_rules) - <- simplThenTidy dflags pcs_tc hst this_mod dont_discard ds_binds ds_rules - + ; simpl_details + <- _scc_ "Core2Core" + core2core dflags pcs_middle hst dont_discard ds_details + ------------------- - -- BUILD THE NEW ModDetails AND ModIface + -- TIDY ------------------- - ; let new_details = mkModDetails env_tc tidy_binds orphan_rules - ; final_iface <- _scc_ "MkFinalIface" - mkFinalIface ghci_mode dflags location - maybe_checked_iface new_iface new_details + ; 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) + <- _scc_ "CoreTidy" + tidyCorePgm dflags this_mod pcs_middle cg_info simpl_details + + ; pcs_final <- if ghci_mode == OneShot then initPersistentCompilerState + else return pcs_simpl + -- alive at this point: + -- tidy_details + -- new_iface + + ; emitExternalCore dflags new_iface tidy_details ------------------- - -- CONVERT TO STG and COMPLETE CODE GENERATION + -- PREPARE FOR CODE GENERATION ------------------- -- Do saturation and convert to A-normal form - ; saturated <- coreSatPgm dflags tidy_binds + ; prepd_details <- _scc_ "CorePrep" corePrepPgm dflags tidy_details - ; (maybe_stub_h_filename, maybe_stub_c_filename, maybe_bcos) - <- restOfCodeGeneration dflags toInterp this_mod - (map ideclName (hsModuleImports rdr_module)) - foreign_stuff env_tc saturated - hit (pcs_PIT pcs_simpl) + ------------------- + -- CONVERT TO STG and COMPLETE CODE GENERATION + ------------------- + ; let + ModDetails{md_binds=binds, md_types=env_tc} = prepd_details - -- and the answer is ... - ; return (HscRecomp pcs_simpl new_details final_iface - maybe_stub_h_filename maybe_stub_c_filename - maybe_bcos) - }}}}}}} + local_tycons = typeEnvTyCons env_tc + local_classes = typeEnvClasses env_tc + + imported_module_names = map ideclName (hsModuleImports rdr_module) + + mod_name_to_Module nm + = do m <- findModule nm ; return (fst (fromJust m)) + + (h_code,c_code,fe_binders) = foreign_stuff + + ; imported_modules <- mapM mod_name_to_Module imported_module_names + + ; (stub_h_exists, stub_c_exists, maybe_bcos, final_iface ) + <- if toInterp +#ifdef GHCI + 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 ( False, False, Just (bcos,itbl_env), final_iface ) +#else + then error "GHC not compiled with interpreter" +#endif + 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 + + if toNothing + then do + return (False, False, Nothing, final_iface) + else do + ------------------ Code generation ------------------ + abstractC <- _scc_ "CodeGen" + codeGen dflags this_mod imported_modules + cost_centre_info fe_binders + local_tycons stg_binds + + ------------------ Code output ----------------------- + (stub_h_exists, stub_c_exists) + <- codeOutput dflags this_mod local_tycons + binds stg_binds + c_code h_code abstractC + + return (stub_h_exists, stub_c_exists, Nothing, final_iface) + + ; let final_details = tidy_details {md_binds = []} -mkFinalIface ghci_mode dflags location maybe_old_iface new_iface new_details - = case completeIface maybe_old_iface new_iface new_details of - (new_iface, Nothing) -- no change in the interfacfe - -> do when (dopt Opt_D_dump_hi_diffs dflags) - (printDump (text "INTERFACE UNCHANGED")) - dumpIfSet_dyn dflags Opt_D_dump_hi - "UNCHANGED FINAL INTERFACE" (pprIface new_iface) - return new_iface - (new_iface, Just sdoc_diffs) - -> do dumpIfSet_dyn dflags Opt_D_dump_hi_diffs "INTERFACE HAS CHANGED" - sdoc_diffs - dumpIfSet_dyn dflags Opt_D_dump_hi "NEW FINAL INTERFACE" - (pprIface new_iface) - -- Write the interface file - when (ghci_mode /= Interactive) - (writeIface (unJust "hscRecomp:hi" (ml_hi_file location)) - new_iface) - return new_iface + -- and the answer is ... + ; return (HscRecomp pcs_final + final_details + final_iface + stub_h_exists stub_c_exists + maybe_bcos) + }}}}}}} myParseModule dflags src_filename = do -------------------------- Parser ---------------- @@ -320,84 +422,27 @@ myParseModule dflags src_filename }} -simplThenTidy dflags pcs hst this_mod dont_discard binds rules - = do -- Do main Core-language transformations --------- - -- _scc_ "Core2Core" - (simplified, orphan_rules) - <- core2core dflags pcs hst dont_discard binds rules - - -- Do the final tidy-up - (pcs', tidy_binds, tidy_orphan_rules) - <- tidyCorePgm dflags this_mod pcs simplified orphan_rules - - return (pcs', tidy_binds, tidy_orphan_rules) - - -restOfCodeGeneration dflags toInterp this_mod imported_module_names - foreign_stuff env_tc tidy_binds - hit pit -- these last two for mapping ModNames to Modules - | toInterp - = do (bcos,itbl_env) - <- byteCodeGen dflags tidy_binds local_tycons local_classes - return (Nothing, Nothing, Just (bcos,itbl_env)) - - | otherwise - = do - -------------------------- Convert to STG ------------------------------- - (stg_binds, cost_centre_info) - <- _scc_ "CoreToStg" - myCoreToStg dflags this_mod tidy_binds env_tc - - -------------------------- 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 - tidy_binds stg_binds - c_code h_code abstractC - - return (maybe_stub_h_name, maybe_stub_c_name, Nothing) - where - local_tycons = typeEnvTyCons env_tc - local_classes = typeEnvClasses env_tc - imported_modules = map mod_name_to_Module imported_module_names - (h_code,c_code,fe_binders) = foreign_stuff - - mod_name_to_Module :: ModuleName -> Module - mod_name_to_Module nm - = let str_mi = case lookupModuleEnvByName hit nm of - Just mi -> mi - Nothing -> case lookupModuleEnvByName pit nm of - Just mi -> mi - Nothing -> barf nm - in mi_module str_mi - barf nm = pprPanic "mod_name_to_Module: no hst or pst mapping for" - (ppr nm) - - -myCoreToStg dflags this_mod tidy_binds env_tc +myCoreToStg dflags this_mod tidy_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 - --let bcos = byteCodeGen dflags tidy_binds local_tycons local_classes - - - stg_binds <- _scc_ "Core2Stg" coreToStg dflags this_mod tidy_binds + stg_binds <- _scc_ "Core2Stg" coreToStg dflags tidy_binds (stg_binds2, cost_centre_info) <- _scc_ "Core2Stg" stg2stg dflags this_mod stg_binds - return (stg_binds2, cost_centre_info) - where - local_tycons = typeEnvTyCons env_tc - local_classes = typeEnvClasses env_tc + let env_rhs :: CgInfoEnv + env_rhs = mkNameEnv [ (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) \end{code} @@ -416,10 +461,11 @@ hscStmt -> PersistentCompilerState -- IN: persistent compiler state -> InteractiveContext -- Context for compiling -> String -- The statement + -> Bool -- just treat it as an expression -> IO ( PersistentCompilerState, - Maybe (InteractiveContext, - [Id], - UnlinkedBCOExpr) ) + Maybe ( [Id], + Type, + UnlinkedBCOExpr) ) \end{code} When the UnlinkedBCOExpr is linked you get an HValue of type @@ -449,66 +495,69 @@ A naked expression returns a singleton Name [it]. result not showable) ==> error \begin{code} -hscStmt dflags hst hit pcs0 icontext stmt - = let - InteractiveContext { - ic_rn_env = rn_env, - ic_type_env = type_env, - ic_module = this_mod } = icontext - in - do { maybe_stmt <- hscParseStmt dflags stmt +hscStmt dflags hst hit pcs0 icontext stmt just_expr + = 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 this_mod rn_env parsed_stmt + <- renameStmt dflags hit hst pcs0 + iNTERACTIVE icontext parsed_stmt + ; case maybe_renamed_stmt of Nothing -> return (pcs0, Nothing) Just (bound_names, rn_stmt) -> do { -- Typecheck it - maybe_tc_return <- typecheckStmt dflags pcs1 hst type_env - print_unqual this_mod bound_names rn_stmt - ; case maybe_tc_return of { - Nothing -> return (pcs0, Nothing) ; - Just (pcs2, tc_expr, bound_ids) -> do { + maybe_tc_return <- + if just_expr + then case rn_stmt of { (ExprStmt e _ _, decls) -> + typecheckExpr dflags pcs1 hst (ic_type_env icontext) + print_unqual iNTERACTIVE (e,decls) } + else typecheckStmt dflags pcs1 hst (ic_type_env icontext) + 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 this_mod print_unqual tc_expr + ds_expr <- deSugarExpr dflags pcs2 hst iNTERACTIVE print_unqual tc_expr -- Simplify it ; simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr - -- Saturate it - ; sat_expr <- coreSatExpr dflags simpl_expr + -- Tidy it (temporary, until coreSat does cloning) + ; tidy_expr <- tidyCoreExpr simpl_expr + + -- Prepare for codegen + ; prepd_expr <- corePrepExpr dflags tidy_expr -- Convert to BCOs - ; bcos <- coreExprToBCOs dflags sat_expr + ; bcos <- coreExprToBCOs dflags prepd_expr ; let - -- make all the bound ids "constant" ids, now that + -- 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. - constant_bound_ids = map constantizeId bound_ids - constantizeId id - = modifyIdInfo (`setFlavourInfo` makeConstantFlavour - (idFlavour id)) id - - new_rn_env = extendLocalRdrEnv rn_env - (map idName constant_bound_ids) - -- Extend the renamer-env from bound_ids, not bound_names, - -- because the latter may contain [it] when the former is empty - - new_type_env = extendNameEnvList type_env - [(getName id, AnId id) | id <- constant_bound_ids] - - new_icontext = icontext { ic_rn_env = new_rn_env, - ic_type_env = new_type_env } - ; return (pcs2, Just (new_icontext, bound_ids, bcos)) + global_bound_ids = map globaliseId bound_ids; + globaliseId id = setGlobalIdDetails id VanillaGlobal + + ; return (pcs2, Just (global_bound_ids, ty, bcos)) + }}}}} hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) @@ -524,7 +573,7 @@ hscParseStmt dflags str case parseStmt buf PState{ bol = 0#, atbol = 1#, context = [], glasgow_exts = glaexts, - loc = mkSrcLoc SLIT("") 0 } of { + loc = mkSrcLoc SLIT("") 1 } of { PFailed err -> do { hPutStrLn stderr (showSDoc err); -- Not yet implemented in <4.11 freeStringBuffer buf; @@ -546,6 +595,79 @@ hscParseStmt dflags str %************************************************************************ %* * +\subsection{Getting information about an identifer} +%* * +%************************************************************************ + +\begin{code} +#ifdef GHCI +hscThing -- like hscStmt, but deals with a single identifier + :: DynFlags + -> HomeSymbolTable + -> HomeIfaceTable + -> PersistentCompilerState -- IN: persistent compiler state + -> InteractiveContext -- Context for compiling + -> String -- The identifier + -> IO ( PersistentCompilerState, + [TyThing] ) + +hscThing dflags hst hit pcs0 icontext str + = do maybe_rdr_name <- myParseIdentifier dflags str + case maybe_rdr_name of { + Nothing -> return (pcs0, []); + Just rdr_name -> do + + -- if the identifier is a constructor (begins with an + -- upper-case letter), then we need to consider both + -- constructor and type class identifiers. + let rdr_names + | occNameSpace occ == dataName = [ rdr_name, tccls_name ] + | otherwise = [ rdr_name ] + where + occ = rdrNameOcc rdr_name + tccls_occ = setOccNameSpace occ tcClsName + tccls_name = setRdrNameOcc rdr_name tccls_occ + + (pcs, unqual, maybe_rn_result) <- + renameRdrName dflags hit hst pcs0 iNTERACTIVE icontext rdr_names + + case maybe_rn_result of { + Nothing -> return (pcs, []); + Just (names, decls) -> do { + + maybe_pcs <- typecheckExtraDecls dflags pcs hst unqual + iNTERACTIVE decls; + + case maybe_pcs of { + Nothing -> return (pcs, []); + Just pcs -> + let maybe_ty_things = map (lookupType hst (pcs_PTE pcs)) names + in + return (pcs, catMaybes maybe_ty_things) } + }}} + +myParseIdentifier dflags str + = do buf <- stringToStringBuffer str + + let glaexts | dopt Opt_GlasgowExts dflags = 1# + | otherwise = 0# + + case parseIdentifier buf + PState{ bol = 0#, atbol = 1#, + context = [], glasgow_exts = glaexts, + loc = mkSrcLoc SLIT("") 1 } 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} + +%************************************************************************ +%* * \subsection{Initial persistent state} %* * %************************************************************************ @@ -571,10 +693,18 @@ initPersistentRenamerState :: IO PersistentRenamerState nsIPs = emptyFM }, prsDecls = (emptyNameEnv, 0), prsInsts = (emptyBag, 0), - prsRules = (emptyBag, 0), + prsRules = foldr add_rule (emptyBag, 0) builtinRules, prsImpMods = emptyFM } ) + where + add_rule (name,rule) (rules, n_rules) + = (gated_decl `consBag` rules, n_rules+1) + where + gated_decl = (gate_fn, (mod, IfaceRuleOut rdr_name rule)) + mod = nameModule name + rdr_name = mkRdrOrig (moduleName mod) (nameOccName name) + gate_fn vis_fn = vis_fn name -- Load the rule whenever name is visible initOrigNames :: FiniteMap (ModuleName,OccName) Name initOrigNames @@ -583,14 +713,4 @@ initOrigNames 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 --} \end{code}