import DsForeign ( dsForeigns )
import DsExpr () -- Forces DsExpr to be compiled; DsBinds only
-- depends on DsExpr.hi-boot.
-import Module ( Module, moduleEnvElts, delModuleEnv, moduleFS )
+import Module
+import UniqFM ( eltsUFM, delFromUFM )
+import PackageConfig ( thPackageId )
import RdrName ( GlobalRdrEnv )
import NameSet
import VarSet
-import Bag ( Bag, isEmptyBag, emptyBag )
import Rules ( roughTopNames )
import CoreLint ( showPass, endPass )
import CoreFVs ( ruleRhsFreeVars, exprsFreeNames )
-import Packages ( PackageState(thPackageId), PackageIdH(..) )
-import ErrUtils ( doIfSet, dumpIfSet_dyn, printBagOfWarnings,
- errorsFound, WarnMsg )
+import ErrUtils ( doIfSet, dumpIfSet_dyn )
import ListSetOps ( insertList )
import Outputable
-import UniqSupply ( mkSplitUniqSupply )
import SrcLoc ( Located(..) )
import DATA_IOREF ( readIORef )
import Maybes ( catMaybes )
%************************************************************************
\begin{code}
-deSugar :: HscEnv -> TcGblEnv -> IO (Bag WarnMsg, Maybe ModGuts)
+deSugar :: HscEnv -> TcGblEnv -> IO (Maybe ModGuts)
-- Can modify PCS by faulting in more declarations
deSugar hsc_env
tcg_src = hsc_src,
tcg_type_env = type_env,
tcg_imports = imports,
- tcg_home_mods = home_mods,
tcg_exports = exports,
tcg_dus = dus,
tcg_inst_uses = dfun_uses_var,
= do { showPass dflags "Desugar"
-- Desugar the program
- ; ((all_prs, ds_rules, ds_fords), warns)
- <- case ghcMode (hsc_dflags hsc_env) of
- JustTypecheck -> return (([], [], NoStubs), emptyBag)
+ ; mb_res <- case ghcMode dflags of
+ JustTypecheck -> return (Just ([], [], NoStubs))
_ -> initDs hsc_env mod rdr_env type_env $ do
{ core_prs <- dsTopLHsBinds auto_scc binds
; (ds_fords, foreign_prs) <- dsForeigns fords
; ds_rules <- mappM (dsRule mod local_bndrs) rules
; return (all_prs, catMaybes ds_rules, ds_fords)
}
-
- -- If warnings are considered errors, leave.
- ; if errorsFound dflags (warns, emptyBag)
- then return (warns, Nothing)
- else do
+ ; case mb_res of {
+ Nothing -> return Nothing ;
+ Just (all_prs, ds_rules, ds_fords) -> do
{ -- Add export flags to bindings
keep_alive <- readIORef keep_var
; dfun_uses <- readIORef dfun_uses_var -- What dfuns are used
; th_used <- readIORef th_var -- Whether TH is used
; let used_names = allUses dus `unionNameSets` dfun_uses
- thPackage = thPackageId (pkgState dflags)
- pkgs | ExtPackage th_id <- thPackage, th_used
- = insertList th_id (imp_dep_pkgs imports)
- | otherwise
- = imp_dep_pkgs imports
+ pkgs | th_used = insertList thPackageId (imp_dep_pkgs imports)
+ | otherwise = imp_dep_pkgs imports
- dep_mods = moduleEnvElts (delModuleEnv (imp_dep_mods imports) mod)
+ dep_mods = eltsUFM (delFromUFM (imp_dep_mods imports) (moduleName mod))
-- M.hi-boot can be in the imp_dep_mods, but we must remove
-- it before recording the modules on which this one depends!
-- (We want to retain M.hi-boot in imp_dep_mods so that
dir_imp_mods = imp_mods imports
- ; usages <- mkUsageInfo hsc_env home_mods dir_imp_mods dep_mods used_names
+ ; usages <- mkUsageInfo hsc_env dir_imp_mods dep_mods used_names
; let
-- Modules don't compare lexicographically usually,
-- but we want them to do so here.
le_mod :: Module -> Module -> Bool
- le_mod m1 m2 = moduleFS m1 <= moduleFS m2
- le_dep_mod :: (Module, IsBootInterface) -> (Module, IsBootInterface) -> Bool
- le_dep_mod (m1,_) (m2,_) = m1 `le_mod` m2
+ le_mod m1 m2 = moduleNameFS (moduleName m1)
+ <= moduleNameFS (moduleName m2)
+ le_dep_mod :: (ModuleName, IsBootInterface) -> (ModuleName, IsBootInterface) -> Bool
+ le_dep_mod (m1,_) (m2,_) = moduleNameFS m1 <= moduleNameFS m2
deps = Deps { dep_mods = sortLe le_dep_mod dep_mods,
dep_pkgs = sortLe (<=) pkgs,
mg_boot = isHsBoot hsc_src,
mg_exports = exports,
mg_deps = deps,
- mg_home_mods = home_mods,
mg_usages = usages,
mg_dir_imps = [m | (m,_,_) <- moduleEnvElts dir_imp_mods],
mg_rdr_env = rdr_env,
mg_binds = ds_binds,
mg_foreign = ds_fords }
- ; return (warns, Just mod_guts)
- }}
+ ; return (Just mod_guts)
+ }}}
where
- dflags = hsc_dflags hsc_env
- ghci_mode = ghcMode (hsc_dflags hsc_env)
+ dflags = hsc_dflags hsc_env
+ ghci_mode = ghcMode (hsc_dflags hsc_env)
auto_scc | opt_SccProfilingOn = TopLevel
| otherwise = NoSccs
deSugarExpr :: HscEnv
-> Module -> GlobalRdrEnv -> TypeEnv
-> LHsExpr Id
- -> IO CoreExpr
+ -> IO (Maybe CoreExpr)
+-- Prints its own errors; returns Nothing if error occurred
+
deSugarExpr hsc_env this_mod rdr_env type_env tc_expr
- = do { showPass dflags "Desugar"
- ; us <- mkSplitUniqSupply 'd'
+ = do { let dflags = hsc_dflags hsc_env
+ ; showPass dflags "Desugar"
-- Do desugaring
- ; (core_expr, ds_warns) <- initDs hsc_env this_mod rdr_env type_env $
- dsLExpr tc_expr
+ ; mb_core_expr <- initDs hsc_env this_mod rdr_env type_env $
+ dsLExpr tc_expr
- -- Display any warnings
- -- Note: if -Werror is used, we don't signal an error here.
- ; doIfSet (not (isEmptyBag ds_warns))
- (printBagOfWarnings dflags ds_warns)
+ ; case mb_core_expr of {
+ Nothing -> return Nothing ;
+ Just expr -> do {
- -- Dump output
- ; dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr core_expr)
-
- ; return core_expr
- }
- where
- dflags = hsc_dflags hsc_env
+ -- Dump output
+ dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr expr)
+ ; return (Just expr) } } }
-- addExportFlags
-- Set the no-discard flag if either
; rhs' <- dsLExpr rhs
; case decomposeRuleLhs bndrs lhs' of {
- Nothing -> do { dsWarn msg; return Nothing } ;
+ Nothing -> do { warnDs msg; return Nothing } ;
Just (bndrs', fn_id, args) -> do
-- Substitute the dict bindings eagerly,