X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRename.lhs;h=b092251b9916395f92f2cd78aae839a9473603b6;hb=41a0f74e7b3e215b8f3eb6738c7ae50baea9d82c;hp=9e28cd90426aa5aa1b5e0dd3175a9dd65863171e;hpb=4166dff80e8ec94022a040318ff2759913fbbe06;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/Rename.lhs b/ghc/compiler/rename/Rename.lhs index 9e28cd9..b092251 100644 --- a/ghc/compiler/rename/Rename.lhs +++ b/ghc/compiler/rename/Rename.lhs @@ -4,76 +4,62 @@ \section[Rename]{Renaming and dependency analysis passes} \begin{code} -module Rename ( renameModule, renameExpr, closeIfaceDecls, checkOldIface ) where +module Rename ( + renameModule, renameStmt, renameRdrName, + closeIfaceDecls, checkOldIface + ) where #include "HsVersions.h" import HsSyn -import RdrHsSyn ( RdrNameHsModule, RdrNameHsDecl, RdrNameDeprecation, RdrNameHsExpr, - RdrNameTyClDecl, RdrNameRuleDecl, RdrNameInstDecl, RdrNameImportDecl +import RdrHsSyn ( RdrNameHsModule, RdrNameHsDecl, RdrNameDeprecation, + RdrNameTyClDecl, RdrNameRuleDecl, RdrNameInstDecl, RdrNameImportDecl, + RdrNameStmt ) import RnHsSyn ( RenamedHsDecl, RenamedTyClDecl, RenamedRuleDecl, RenamedInstDecl, - extractHsTyNames, RenamedHsExpr, + RenamedStmt, instDeclFVs, tyClDeclFVs, ruleDeclFVs ) import CmdLineOpts ( DynFlags, DynFlag(..) ) import RnMonad -import RnExpr ( rnExpr ) +import RnExpr ( rnStmt ) import RnNames ( getGlobalNames, exportsFromAvail ) import RnSource ( rnSourceDecls, rnTyClDecl, rnIfaceRuleDecl, rnInstDecl ) import RnIfaces ( slurpImpDecls, mkImportInfo, recordLocalSlurps, - getInterfaceExports, closeDecls, + closeDecls, RecompileRequired, outOfDate, recompileRequired ) -import RnHiFiles ( readIface, removeContext, loadInterface, +import RnHiFiles ( readIface, loadInterface, loadExports, loadFixDecls, loadDeprecs, - tryLoadInterface ) -import RnEnv ( availsToNameSet, availName, mkIfaceGlobalRdrEnv, - emptyAvailEnv, unitAvailEnv, availEnvElts, + ) +import RnEnv ( availsToNameSet, mkIfaceGlobalRdrEnv, + unitAvailEnv, availEnvElts, availNames, plusAvailEnv, groupAvails, warnUnusedImports, warnUnusedLocalBinds, warnUnusedModules, - lookupOrigNames, lookupSrcName, - newGlobalName, unQualInScope + lookupSrcName, getImplicitStmtFVs, + getImplicitModuleFVs, newGlobalName, unQualInScope, + ubiquitousNames, lookupOccRn ) import Module ( Module, ModuleName, WhereFrom(..), moduleNameUserString, moduleName, moduleEnvElts ) -import Name ( Name, NamedThing(..), getSrcLoc, - nameIsLocalOrFrom, nameOccName, nameModule, - ) -import Name ( mkNameEnv, nameEnvElts, extendNameEnv ) -import RdrName ( elemRdrEnv, foldRdrEnv, isQual ) -import OccName ( occNameFlavour ) +import Name ( Name, nameModule ) +import NameEnv import NameSet -import TysWiredIn ( unitTyCon, intTyCon, boolTyCon ) -import PrelNames ( mAIN_Name, pREL_MAIN_Name, pRELUDE_Name, - ioTyCon_RDR, main_RDR_Unqual, - unpackCString_RDR, unpackCStringFoldr_RDR, unpackCStringUtf8_RDR, - eqString_RDR - ) -import PrelInfo ( derivingOccurrences ) -import Type ( funTyCon ) +import RdrName ( foldRdrEnv, isQual ) +import PrelNames ( pRELUDE_Name ) import ErrUtils ( dumpIfSet, dumpIfSet_dyn, showPass, printErrorsAndWarnings, errorsFound ) import Bag ( bagToList ) import FiniteMap ( FiniteMap, fmToList, emptyFM, lookupFM, addToFM_C, elemFM, addToFM ) -import UniqFM ( lookupUFM ) import Maybes ( maybeToBool, catMaybes ) import Outputable import IO ( openFile, IOMode(..) ) -import HscTypes ( PersistentCompilerState, HomeIfaceTable, HomeSymbolTable, - ModIface(..), WhatsImported(..), - VersionInfo(..), ImportVersion, IsExported, - IfaceDecls, mkIfaceDecls, dcl_tycl, dcl_rules, dcl_insts, - GlobalRdrEnv, pprGlobalRdrEnv, - AvailEnv, GenAvailInfo(..), AvailInfo, Avails, - Provenance(..), ImportReason(..), initialVersionInfo, - Deprecations(..), lookupDeprec, lookupIface - ) +import HscTypes -- lots of it import List ( partition, nub ) \end{code} @@ -82,7 +68,7 @@ import List ( partition, nub ) %********************************************************* %* * -\subsection{The two main wrappers} +\subsection{The main wrappers} %* * %********************************************************* @@ -91,7 +77,8 @@ renameModule :: DynFlags -> HomeIfaceTable -> HomeSymbolTable -> PersistentCompilerState -> Module -> RdrNameHsModule - -> IO (PersistentCompilerState, Maybe (PrintUnqualified, (IsExported, ModIface, [RenamedHsDecl]))) + -> IO (PersistentCompilerState, PrintUnqualified, + Maybe (IsExported, ModIface, [RenamedHsDecl])) -- Nothing => some error occurred in the renamer renameModule dflags hit hst pcs this_module rdr_module @@ -99,60 +86,129 @@ renameModule dflags hit hst pcs this_module rdr_module rename this_module rdr_module \end{code} - \begin{code} -renameExpr :: DynFlags +renameStmt :: DynFlags -> HomeIfaceTable -> HomeSymbolTable -> PersistentCompilerState - -> Module -> RdrNameHsExpr + -> Module -- current module + -> InteractiveContext + -> RdrNameStmt -- parsed stmt -> IO ( PersistentCompilerState, - Maybe (PrintUnqualified, (RenamedHsExpr, [RenamedHsDecl])) + PrintUnqualified, + Maybe ([Name], (RenamedStmt, [RenamedHsDecl])) ) -renameExpr dflags hit hst pcs this_module expr - = do { renameSource dflags hit hst pcs this_module $ - tryLoadInterface doc (moduleName this_module) ImportByUser - `thenRn` \ (iface, maybe_err) -> - case maybe_err of { - Just msg -> ioToRnM (printErrs alwaysQualify - (ptext SLIT("failed to load interface for") - <+> quotes (ppr this_module) - <> char ':' <+> msg)) `thenRn_` - returnRn Nothing; - Nothing -> - - let rdr_env = mi_globals iface - print_unqual = unQualInScope rdr_env - in - - initRnMS rdr_env emptyLocalFixityEnv SourceMode (rnExpr expr) - `thenRn` \ (e,fvs) -> - - checkErrsRn `thenRn` \ no_errs_so_far -> - if not no_errs_so_far then - -- Found errors already, so exit now - doDump e [] `thenRn_` - returnRn Nothing - else - - lookupOrigNames implicit_occs `thenRn` \ implicit_names -> - slurpImpDecls (fvs `plusFV` implicit_names) `thenRn` \ decls -> - - doDump e decls `thenRn_` - returnRn (Just (print_unqual, (e, decls))) - }} +renameStmt dflags hit hst pcs this_module ic stmt + = renameSource dflags hit hst pcs this_module $ + extendTypeEnvRn (ic_type_env ic) $ + + -- load the context module + loadContextModule (ic_module ic) $ \ (rdr_env, print_unqual) -> + + -- Rename the stmt + initRnMS rdr_env emptyAvailEnv (ic_rn_env ic) emptyLocalFixityEnv CmdLineMode ( + rnStmt stmt $ \ stmt' -> + returnRn (([], stmt'), emptyFVs) + ) `thenRn` \ ((binders, stmt), fvs) -> + + -- Bale out if we fail + checkErrsRn `thenRn` \ no_errs_so_far -> + if not no_errs_so_far then + doDump dflags [] stmt [] `thenRn_` returnRn (print_unqual, Nothing) + else + + -- Add implicit free vars, and close decls + getImplicitStmtFVs `thenRn` \ implicit_fvs -> + slurpImpDecls (fvs `plusFV` implicit_fvs) `thenRn` \ decls -> + -- NB: an earlier version deleted (rdrEnvElts local_env) from + -- the fvs. But (a) that isn't necessary, because previously + -- bound things in the local_env will be in the TypeEnv, and + -- the renamer doesn't re-slurp such things, and + -- (b) it's WRONG to delete them. Consider in GHCi: + -- Mod> let x = e :: T + -- Mod> let y = x + 3 + -- We need to pass 'x' among the fvs to slurpImpDecls, so that + -- the latter can see that T is a gate, and hence import the Num T + -- instance decl. (See the InTypEnv case in RnIfaces.slurpSourceRefs.) + + doDump dflags binders stmt decls `thenRn_` + returnRn (print_unqual, Just (binders, (stmt, decls))) + where - implicit_occs = string_occs - doc = text "context for compiling expression" - - doDump :: RenamedHsExpr -> [RenamedHsDecl] -> RnMG (Either IOError ()) - doDump e decls = - getDOptsRn `thenRn` \ dflags -> - ioToRnM (dumpIfSet_dyn dflags Opt_D_dump_rn "Renamer:" - (vcat (ppr e : map ppr decls))) -\end{code} + doDump :: DynFlags -> [Name] -> RenamedStmt -> [RenamedHsDecl] + -> RnMG (Either IOError ()) + doDump dflags bndrs stmt decls + = ioToRnM (dumpIfSet_dyn dflags Opt_D_dump_rn "Renamer:" + (vcat [text "Binders:" <+> ppr bndrs, + ppr stmt, text "", + vcat (map ppr decls)])) +renameRdrName + :: DynFlags + -> HomeIfaceTable -> HomeSymbolTable + -> PersistentCompilerState + -> Module -- current module + -> InteractiveContext + -> [RdrName] -- name to rename + -> IO ( PersistentCompilerState, + PrintUnqualified, + Maybe ([Name], [RenamedHsDecl]) + ) + +renameRdrName dflags hit hst pcs this_module ic rdr_names = + renameSource dflags hit hst pcs this_module $ + extendTypeEnvRn (ic_type_env ic) $ + loadContextModule (ic_module ic) $ \ (rdr_env, print_unqual) -> + + -- rename the rdr_name + initRnMS rdr_env emptyAvailEnv (ic_rn_env ic) emptyLocalFixityEnv CmdLineMode + (mapRn (tryRn.lookupOccRn) rdr_names) `thenRn` \ maybe_names -> + let + ok_names = [ a | Right a <- maybe_names ] + in + if null ok_names + then let errs = head [ e | Left e <- maybe_names ] + in setErrsRn errs `thenRn_` + doDump dflags ok_names [] `thenRn_` + returnRn (print_unqual, Nothing) + else + + slurpImpDecls (mkNameSet ok_names) `thenRn` \ decls -> + + doDump dflags ok_names decls `thenRn_` + returnRn (print_unqual, Just (ok_names, decls)) + where + doDump :: DynFlags -> [Name] -> [RenamedHsDecl] -> RnMG (Either IOError ()) + doDump dflags names decls + = ioToRnM (dumpIfSet_dyn dflags Opt_D_dump_rn "Renamer:" + (vcat [ppr names, text "", + vcat (map ppr decls)])) + + +-- Load the interface for the context module, so +-- that we can get its top-level lexical environment +-- Bale out if we fail to do this +loadContextModule scope_module thing_inside + = let doc = text "context for compiling expression" + in + loadInterface doc (moduleName scope_module) ImportByUser `thenRn` \ iface -> + + -- If this is a module we previously compiled, then mi_globals will + -- have its top-level environment. If it is an imported module, then + -- we must invent a top-level environment from its exports. + let rdr_env | Just env <- mi_globals iface = env + | otherwise = mkIfaceGlobalRdrEnv (mi_exports iface) + + print_unqual = unQualInScope rdr_env + in + checkErrsRn `thenRn` \ no_errs_so_far -> + if not no_errs_so_far then + returnRn (print_unqual, Nothing) + else + thing_inside (rdr_env, print_unqual) +\end{code} + %********************************************************* %* * \subsection{The main function: rename} @@ -164,49 +220,66 @@ renameSource :: DynFlags -> HomeIfaceTable -> HomeSymbolTable -> PersistentCompilerState -> Module - -> RnMG (Maybe (PrintUnqualified, r)) - -> IO (PersistentCompilerState, Maybe (PrintUnqualified, r)) + -> RnMG (PrintUnqualified, Maybe r) + -> IO (PersistentCompilerState, PrintUnqualified, Maybe r) -- Nothing => some error occurred in the renamer renameSource dflags hit hst old_pcs this_module thing_inside = do { showPass dflags "Renamer" -- Initialise the renamer monad - ; (new_pcs, msgs, maybe_rn_stuff) <- initRn dflags hit hst old_pcs this_module thing_inside + ; (new_pcs, msgs, (print_unqual, maybe_rn_stuff)) + <- initRn dflags hit hst old_pcs this_module thing_inside -- Print errors from renaming - ; let print_unqual = case maybe_rn_stuff of - Just (unqual, _) -> unqual - Nothing -> alwaysQualify - ; printErrorsAndWarnings print_unqual msgs ; -- Return results. No harm in updating the PCS ; if errorsFound msgs then - return (new_pcs, Nothing) + return (new_pcs, print_unqual, Nothing) else - return (new_pcs, maybe_rn_stuff) + return (new_pcs, print_unqual, maybe_rn_stuff) } \end{code} \begin{code} -rename :: Module -> RdrNameHsModule -> RnMG (Maybe (PrintUnqualified, (IsExported, ModIface, [RenamedHsDecl]))) +rename :: Module -> RdrNameHsModule + -> RnMG (PrintUnqualified, Maybe (IsExported, ModIface, [RenamedHsDecl])) rename this_module contents@(HsModule _ _ exports imports local_decls mod_deprec loc) = pushSrcLocRn loc $ -- FIND THE GLOBAL NAME ENVIRONMENT - getGlobalNames this_module contents `thenRn` \ (gbl_env, local_gbl_env, all_avails@(_, global_avail_env)) -> + getGlobalNames this_module contents `thenRn` \ (gbl_env, local_gbl_env, + (mod_avail_env, global_avail_env)) -> + let + print_unqualified = unQualInScope gbl_env + full_avail_env :: NameEnv AvailInfo + -- The domain of global_avail_env is just the 'major' things; + -- variables, type constructors, classes. + -- E.g. Functor |-> Functor( Functor, fmap ) + -- The domain of full_avail_env is everything in scope + -- E.g. Functor |-> Functor( Functor, fmap ) + -- fmap |-> Functor( Functor, fmap ) + -- + -- This filled-out avail_env is needed to generate + -- exports (mkExportAvails), and for generating minimal + -- exports (reportUnusedNames) + full_avail_env = mkNameEnv [ (name,avail) + | avail <- availEnvElts global_avail_env, + name <- availNames avail] + in -- Exit if we've found any errors checkErrsRn `thenRn` \ no_errs_so_far -> if not no_errs_so_far then -- Found errors already, so exit now rnDump [] [] `thenRn_` - returnRn Nothing + returnRn (print_unqualified, Nothing) else -- PROCESS EXPORT LIST - exportsFromAvail mod_name exports all_avails gbl_env `thenRn` \ export_avails -> + exportsFromAvail mod_name exports mod_avail_env + full_avail_env gbl_env `thenRn` \ export_avails -> traceRn (text "Local top-level environment" $$ nest 4 (pprGlobalRdrEnv local_gbl_env)) `thenRn_` @@ -219,10 +292,8 @@ rename this_module contents@(HsModule _ _ exports imports local_decls mod_deprec fixitiesFromLocalDecls local_gbl_env local_decls `thenRn` \ local_fixity_env -> -- RENAME THE SOURCE - rnSourceDecls gbl_env local_fixity_env local_decls `thenRn` \ (rn_local_decls, source_fvs) -> - - -- CHECK THAT main IS DEFINED, IF REQUIRED - checkMain this_module local_gbl_env `thenRn_` + rnSourceDecls gbl_env global_avail_env + local_fixity_env local_decls `thenRn` \ (rn_local_decls, source_fvs) -> -- EXIT IF ERRORS FOUND -- We exit here if there are any errors in the source, *before* @@ -233,24 +304,33 @@ rename this_module contents@(HsModule _ _ exports imports local_decls mod_deprec if not no_errs_so_far then -- Found errors already, so exit now rnDump [] rn_local_decls `thenRn_` - returnRn Nothing + returnRn (print_unqualified, Nothing) else -- SLURP IN ALL THE NEEDED DECLARATIONS - implicitFVs mod_name rn_local_decls `thenRn` \ implicit_fvs -> + -- Find out what re-bindable names to use for desugaring + getImplicitModuleFVs mod_name rn_local_decls `thenRn` \ implicit_fvs -> let - slurp_fvs = implicit_fvs `plusFV` source_fvs + export_fvs = availsToNameSet export_avails + source_fvs2 = source_fvs `plusFV` export_fvs + -- The export_fvs make the exported names look just as if they + -- occurred in the source program. For the reasoning, see the + -- comments with RnIfaces.mkImportInfo + -- It also helps reportUnusedNames, which of course must not complain + -- that 'f' isn't mentioned if it is mentioned in the export list + + source_fvs3 = implicit_fvs `plusFV` source_fvs2 -- It's important to do the "plus" this way round, so that -- when compiling the prelude, locally-defined (), Bool, etc -- override the implicit ones. - in - traceRn (text "Source FVs:" <+> fsep (map ppr (nameSetToList slurp_fvs))) `thenRn_` - slurpImpDecls slurp_fvs `thenRn` \ rn_imp_decls -> + in + traceRn (text "Source FVs:" <+> fsep (map ppr (nameSetToList source_fvs3))) `thenRn_` + slurpImpDecls source_fvs3 `thenRn` \ rn_imp_decls -> rnDump rn_imp_decls rn_local_decls `thenRn_` -- GENERATE THE VERSION/USAGE INFO - mkImportInfo mod_name imports `thenRn` \ my_usages -> + mkImportInfo mod_name imports `thenRn` \ my_usages -> -- BUILD THE MODULE INTERFACE let @@ -264,118 +344,35 @@ rename this_module contents@(HsModule _ _ exports imports local_decls mod_deprec my_exports = groupAvails this_module export_avails final_decls = rn_local_decls ++ rn_imp_decls - is_orphan = any (isOrphanDecl this_module) rn_local_decls mod_iface = ModIface { mi_module = this_module, mi_version = initialVersionInfo, mi_usages = my_usages, mi_boot = False, - mi_orphan = is_orphan, + mi_orphan = panic "is_orphan", mi_exports = my_exports, - mi_globals = gbl_env, + mi_globals = Just gbl_env, mi_fixities = fixities, mi_deprecs = my_deprecs, mi_decls = panic "mi_decls" } - print_unqualified = unQualInScope gbl_env is_exported name = name `elemNameSet` exported_names exported_names = availsToNameSet export_avails in -- REPORT UNUSED NAMES, AND DEBUG DUMP reportUnusedNames mod_iface print_unqualified - imports global_avail_env - source_fvs export_avails rn_imp_decls `thenRn_` + imports full_avail_env gbl_env + source_fvs2 rn_imp_decls `thenRn_` + -- NB: source_fvs2: include exports (else we get bogus + -- warnings of unused things) but not implicit FVs. - returnRn (Just (print_unqualified, (is_exported, mod_iface, final_decls))) + returnRn (print_unqualified, Just (is_exported, mod_iface, final_decls)) where mod_name = moduleName this_module \end{code} -Checking that main is defined - -\begin{code} -checkMain :: Module -> GlobalRdrEnv -> RnMG () -checkMain this_mod local_env - | moduleName this_mod == mAIN_Name - = checkRn (main_RDR_Unqual `elemRdrEnv` local_env) noMainErr - | otherwise - = returnRn () -\end{code} - -@implicitFVs@ forces the renamer to slurp in some things which aren't -mentioned explicitly, but which might be needed by the type checker. - -\begin{code} -implicitFVs mod_name decls - = lookupOrigNames implicit_occs `thenRn` \ implicit_names -> - returnRn (mkNameSet (map getName default_tycons) `plusFV` - implicit_names) - where - -- Add occurrences for Int, and (), because they - -- are the types to which ambigious type variables may be defaulted by - -- the type checker; so they won't always appear explicitly. - -- [The () one is a GHC extension for defaulting CCall results.] - -- ALSO: funTyCon, since it occurs implicitly everywhere! - -- (we don't want to be bothered with making funTyCon a - -- free var at every function application!) - -- Double is dealt with separately in getGates - default_tycons = [unitTyCon, funTyCon, boolTyCon, intTyCon] - - -- Add occurrences for IO or PrimIO - implicit_main | mod_name == mAIN_Name - || mod_name == pREL_MAIN_Name = [ioTyCon_RDR] - | otherwise = [] - - -- Now add extra "occurrences" for things that - -- the deriving mechanism, or defaulting, will later need in order to - -- generate code - implicit_occs = string_occs ++ foldr ((++) . get) implicit_main decls - - - get (TyClD (TyData _ _ _ _ _ _ (Just deriv_classes) _ _ _)) - = concat (map get_deriv deriv_classes) - get other = [] - - get_deriv cls = case lookupUFM derivingOccurrences cls of - Nothing -> [] - Just occs -> occs - --- Virtually every program has error messages in it somewhere -string_occs = [unpackCString_RDR, unpackCStringFoldr_RDR, - unpackCStringUtf8_RDR, eqString_RDR] -\end{code} - -\begin{code} -isOrphanDecl this_mod (InstD (InstDecl inst_ty _ _ _ _)) - = not (foldNameSet ((||) . nameIsLocalOrFrom this_mod) False - (extractHsTyNames (removeContext inst_ty))) - -- The 'removeContext' is because of - -- instance Foo a => Baz T where ... - -- The decl is an orphan if Baz and T are both not locally defined, - -- even if Foo *is* locally defined - -isOrphanDecl this_mod (RuleD (HsRule _ _ _ lhs _ _)) - = check lhs - where - -- At the moment we just check for common LHS forms - -- Expand as necessary. Getting it wrong just means - -- more orphans than necessary - check (HsVar v) = not (nameIsLocalOrFrom this_mod v) - check (HsApp f a) = check f && check a - check (HsLit _) = False - check (HsOverLit _) = False - check (OpApp l o _ r) = check l && check o && check r - check (NegApp e _) = check e - check (HsPar e) = check e - check (SectionL e o) = check e && check o - check (SectionR o e) = check e && check o - - check other = True -- Safe fall through - -isOrphanDecl _ _ = False -\end{code} %********************************************************* @@ -395,7 +392,7 @@ fixitiesFromLocalDecls gbl_env decls getFixities acc (FixD fix) = fix_decl acc fix - getFixities acc (TyClD (ClassDecl _ _ _ _ sigs _ _ _ )) + getFixities acc (TyClD (ClassDecl { tcdSigs = sigs})) = foldlRn fix_decl acc [sig | FixSig sig <- sigs] -- Get fixities from class decl sigs too. getFixities acc other_decl @@ -453,7 +450,8 @@ rnDeprecs gbl_env Nothing decls %************************************************************************ \begin{code} -checkOldIface :: DynFlags +checkOldIface :: GhciMode + -> DynFlags -> HomeIfaceTable -> HomeSymbolTable -> PersistentCompilerState -> FilePath @@ -462,8 +460,20 @@ checkOldIface :: DynFlags -> IO (PersistentCompilerState, Bool, (RecompileRequired, Maybe ModIface)) -- True <=> errors happened -checkOldIface dflags hit hst pcs iface_path source_unchanged maybe_iface - = runRn dflags hit hst pcs (panic "Bogus module") $ +checkOldIface ghci_mode dflags hit hst pcs iface_path source_unchanged maybe_iface + = runRn dflags hit hst pcs (panic "Bogus module") $ + + -- CHECK WHETHER THE SOURCE HAS CHANGED + ( if not source_unchanged then + traceHiDiffsRn (nest 4 (text "Source file changed or recompilation check turned off")) + else returnRn () ) `thenRn_` + + -- If the source has changed and we're in interactive mode, avoid reading + -- an interface; just return the one we might have been supplied with. + if ghci_mode == Interactive && not source_unchanged then + returnRn (outOfDate, maybe_iface) + else + case maybe_iface of Just old_iface -> -- Use the one we already have setModuleRn (mi_module old_iface) (check_versions old_iface) @@ -472,7 +482,9 @@ checkOldIface dflags hit hst pcs iface_path source_unchanged maybe_iface -> readIface iface_path `thenRn` \ read_result -> case read_result of Left err -> -- Old interface file not found, or garbled; give up - traceRn (text "Bad old interface file" $$ nest 4 err) `thenRn_` + traceHiDiffsRn ( + text "Cannot read old interface file:" + $$ nest 4 err) `thenRn_` returnRn (outOfDate, Nothing) Right parsed_iface @@ -482,9 +494,11 @@ checkOldIface dflags hit hst pcs iface_path source_unchanged maybe_iface where check_versions :: ModIface -> RnMG (RecompileRequired, Maybe ModIface) check_versions iface + | not source_unchanged + = returnRn (outOfDate, Just iface) + | otherwise = -- Check versions - recompileRequired iface_path source_unchanged iface - `thenRn` \ recompile -> + recompileRequired iface_path iface `thenRn` \ recompile -> returnRn (recompile, Just iface) \end{code} @@ -523,7 +537,7 @@ loadOldIface parsed_iface mi_boot = False, mi_orphan = pi_orphan iface, mi_fixities = fix_env, mi_deprecs = deprec_env, mi_decls = decls, - mi_globals = mkIfaceGlobalRdrEnv avails + mi_globals = Nothing } in returnRn mod_iface @@ -603,16 +617,17 @@ closeIfaceDecls dflags hit hst pcs local_names = foldl add emptyNameSet tycl_decls add names decl = addListToNameSet names (map fst (tyClDeclSysNames decl ++ tyClDeclNames decl)) in - -- Record that we have now got declarations for local_names + recordLocalSlurps local_names `thenRn_` -- Do the transitive closure - lookupOrigNames implicit_occs `thenRn` \ implicit_names -> - closeDecls decls (needed `plusFV` implicit_names) + closeDecls decls (needed `plusFV` implicit_fvs) `thenRn` \closed_decls -> + rnDump [] closed_decls `thenRn_` + returnRn closed_decls where - implicit_occs = string_occs -- Data type decls with record selectors, - -- which may appear in the decls, need unpackCString - -- and friends. It's easier to just grab them right now. + implicit_fvs = ubiquitousNames -- Data type decls with record selectors, + -- which may appear in the decls, need unpackCString + -- and friends. It's easier to just grab them right now. \end{code} %********************************************************* @@ -625,29 +640,19 @@ closeIfaceDecls dflags hit hst pcs reportUnusedNames :: ModIface -> PrintUnqualified -> [RdrNameImportDecl] -> AvailEnv + -> GlobalRdrEnv -> NameSet -- Used in this module - -> Avails -- Exported by this module -> [RenamedHsDecl] -> RnMG () -reportUnusedNames my_mod_iface unqual imports avail_env - source_fvs export_avails imported_decls +reportUnusedNames my_mod_iface unqual imports avail_env gbl_env + used_names imported_decls = warnUnusedModules unused_imp_mods `thenRn_` warnUnusedLocalBinds bad_locals `thenRn_` warnUnusedImports bad_imp_names `thenRn_` - printMinimalImports this_mod unqual minimal_imports `thenRn_` - warnDeprecations this_mod export_avails my_deprecs - really_used_names - + printMinimalImports this_mod unqual minimal_imports where this_mod = mi_module my_mod_iface - gbl_env = mi_globals my_mod_iface - my_deprecs = mi_deprecs my_mod_iface - -- The export_fvs make the exported names look just as if they - -- occurred in the source program. - export_fvs = availsToNameSet export_avails - used_names = source_fvs `plusFV` export_fvs - -- Now, a use of C implies a use of T, -- if C was brought into scope by T(..) or T(C) really_used_names = used_names `unionNameSets` @@ -669,21 +674,21 @@ reportUnusedNames my_mod_iface unqual imports avail_env -- Collect the defined names from the in-scope environment -- Look for the qualified ones only, else get duplicates - defined_names :: [(Name,Provenance)] + defined_names :: [GlobalRdrElt] defined_names = foldRdrEnv add [] gbl_env add rdr_name ns acc | isQual rdr_name = ns ++ acc | otherwise = acc - defined_and_used, defined_but_not_used :: [(Name,Provenance)] + defined_and_used, defined_but_not_used :: [GlobalRdrElt] (defined_and_used, defined_but_not_used) = partition used defined_names - used (name,_) = name `elemNameSet` really_used_names + used (GRE name _ _) = name `elemNameSet` really_used_names -- Filter out the ones only defined implicitly bad_locals :: [Name] - bad_locals = [n | (n,LocalDef) <- defined_but_not_used] + bad_locals = [n | (GRE n LocalDef _) <- defined_but_not_used] bad_imp_names :: [(Name,Provenance)] - bad_imp_names = [(n,p) | (n,p@(NonLocalDef (UserImport mod _ True))) <- defined_but_not_used, + bad_imp_names = [(n,p) | GRE n p@(NonLocalDef (UserImport mod _ True)) _ <- defined_but_not_used, not (module_unused mod)] -- inst_mods are directly-imported modules that @@ -716,9 +721,12 @@ reportUnusedNames my_mod_iface unqual imports avail_env minimal_imports1 = foldr add_name minimal_imports0 defined_and_used minimal_imports = foldr add_inst_mod minimal_imports1 inst_mods - add_name (n,NonLocalDef (UserImport m _ _)) acc = addToFM_C plusAvailEnv acc (moduleName (nameModule n)) - (unitAvailEnv (mk_avail n)) - add_name (n,other_prov) acc = acc + -- We've carefully preserved the provenance so that we can + -- construct minimal imports that import the name by (one of) + -- the same route(s) as the programmer originally did. + add_name (GRE n (NonLocalDef (UserImport m _ _)) _) acc = addToFM_C plusAvailEnv acc (moduleName m) + (unitAvailEnv (mk_avail n)) + add_name (GRE n other_prov _) acc = acc mk_avail n = case lookupNameEnv avail_env n of Just (AvailTC m _) | n==m -> AvailTC n [n] @@ -744,45 +752,14 @@ reportUnusedNames my_mod_iface unqual imports avail_env module_unused :: Module -> Bool module_unused mod = moduleName mod `elem` unused_imp_mods -warnDeprecations this_mod export_avails my_deprecs used_names - = doptRn Opt_WarnDeprecations `thenRn` \ warn_drs -> - if not warn_drs then returnRn () else - - -- The home modules for things in the export list - -- may not have been loaded yet; do it now, so - -- that we can see their deprecations, if any - mapRn_ load_home export_mods `thenRn_` - - getIfacesRn `thenRn` \ ifaces -> - getHomeIfaceTableRn `thenRn` \ hit -> - let - pit = iPIT ifaces - deprecs = [ (n,txt) - | n <- nameSetToList used_names, - Just txt <- [lookup_deprec hit pit n] ] - in - mapRn_ warnDeprec deprecs - - where - export_mods = nub [ moduleName (nameModule name) - | avail <- export_avails, - let name = availName avail, - not (nameIsLocalOrFrom this_mod name) ] - - load_home m = loadInterface (text "Check deprecations for" <+> ppr m) m ImportBySystem - - lookup_deprec hit pit n - | nameIsLocalOrFrom this_mod n - = lookupDeprec my_deprecs n - | otherwise - = case lookupIface hit pit n of - Just iface -> lookupDeprec (mi_deprecs iface) n - Nothing -> pprPanic "warnDeprecations:" (ppr n) -- ToDo: deal with original imports with 'qualified' and 'as M' clauses +printMinimalImports :: Module -- This module + -> PrintUnqualified + -> FiniteMap ModuleName AvailEnv -- Minimal imports + -> RnMG () printMinimalImports this_mod unqual imps - = doptRn Opt_D_dump_minimal_imports `thenRn` \ dump_minimal -> - if not dump_minimal then returnRn () else + = ifOptRn Opt_D_dump_minimal_imports $ mapRn to_ies (fmToList imps) `thenRn` \ mod_ies -> ioToRnM (do { h <- openFile filename WriteMode ; @@ -802,12 +779,16 @@ printMinimalImports this_mod unqual imps returnRn (mod, ies) to_ie :: AvailInfo -> RnMG (IE Name) + -- The main trick here is that if we're importing all the constructors + -- we want to say "T(..)", but if we're importing only a subset we want + -- to say "T(A,B,C)". So we have to find out what the module exports. to_ie (Avail n) = returnRn (IEVar n) to_ie (AvailTC n [m]) = ASSERT( n==m ) returnRn (IEThingAbs n) to_ie (AvailTC n ns) - = getInterfaceExports n_mod ImportBySystem `thenRn` \ (_, avails_by_module) -> - case [xs | (m,as) <- avails_by_module, + = loadInterface (text "Compute minimal imports from" <+> ppr n_mod) + n_mod ImportBySystem `thenRn` \ iface -> + case [xs | (m,as) <- mi_exports iface, m == n_mod, AvailTC x xs <- as, x == n] of @@ -887,14 +868,6 @@ getRnStats imported_decls ifaces %************************************************************************ \begin{code} -warnDeprec :: (Name, DeprecTxt) -> RnM d () -warnDeprec (name, txt) - = pushSrcLocRn (getSrcLoc name) $ - addWarnRn $ - sep [ text (occNameFlavour (nameOccName name)) <+> ppr name <+> - text "is deprecated:", nest 4 (ppr txt) ] - - dupFixityDecl rdr_name loc1 loc2 = vcat [ptext SLIT("Multiple fixity declarations for") <+> quotes (ppr rdr_name), ptext SLIT("at ") <+> ppr loc1, @@ -903,10 +876,6 @@ dupFixityDecl rdr_name loc1 loc2 badDeprec d = sep [ptext SLIT("Illegal deprecation when whole module is deprecated"), nest 4 (ppr d)] - -noMainErr - = hsep [ptext SLIT("Module"), quotes (ppr mAIN_Name), - ptext SLIT("must include a definition for"), quotes (ptext SLIT("main"))] \end{code}