import Id
import Name
import CoreSyn
-import OccurAnal
import PprCore
import DsMonad
import DsExpr
import Coverage
import Data.IORef
-import Data.Char
\end{code}
%************************************************************************
%************************************************************************
\begin{code}
-deSugar :: HscEnv -> ModLocation -> TcGblEnv -> IO (Maybe ModGuts)
+deSugar :: HscEnv -> ModLocation -> TcGblEnv -> IO (Messages, Maybe ModGuts)
-- Can modify PCS by faulting in more declarations
deSugar hsc_env
tcg_fix_env = fix_env,
tcg_inst_env = inst_env,
tcg_fam_inst_env = fam_inst_env,
- tcg_deprecs = deprecs,
+ tcg_warns = warns,
+ tcg_anns = anns,
tcg_binds = binds,
tcg_fords = fords,
tcg_rules = rules,
-- Desugar the program
; let export_set = availsToNameSet exports
- ; let auto_scc = mkAutoScc mod export_set
+ ; let auto_scc = mkAutoScc dflags mod export_set
; let target = hscTarget dflags
; let hpcInfo = emptyHpcInfo other_hpc_info
- ; mb_res <- case target of
- HscNothing -> return (Just ([], [], NoStubs, hpcInfo, emptyModBreaks))
- _ -> do (binds_cvr,ds_hpc_info, modBreaks)
- <- if (opt_Hpc
- || target == HscInterpreted)
- && (not (isHsBoot hsc_src))
- then addCoverageTicksToBinds dflags mod mod_loc (typeEnvTyCons type_env) binds
- else return (binds, hpcInfo, emptyModBreaks)
- initDs hsc_env mod rdr_env type_env $ do
- { core_prs <- dsTopLHsBinds auto_scc binds_cvr
- ; (ds_fords, foreign_prs) <- dsForeigns fords
- ; let all_prs = foreign_prs ++ core_prs
- ; ds_rules <- mapM dsRule rules
- ; return (all_prs, catMaybes ds_rules, ds_fords, ds_hpc_info, modBreaks)
- }
+ ; (msgs, mb_res)
+ <- case target of
+ HscNothing ->
+ return (emptyMessages,
+ Just ([], [], NoStubs, hpcInfo, emptyModBreaks))
+ _ -> do
+ (binds_cvr,ds_hpc_info, modBreaks)
+ <- if (opt_Hpc
+ || target == HscInterpreted)
+ && (not (isHsBoot hsc_src))
+ then addCoverageTicksToBinds dflags mod mod_loc (typeEnvTyCons type_env) binds
+ else return (binds, hpcInfo, emptyModBreaks)
+ initDs hsc_env mod rdr_env type_env $ do
+ core_prs <- dsTopLHsBinds auto_scc binds_cvr
+ (ds_fords, foreign_prs) <- dsForeigns fords
+ let all_prs = foreign_prs ++ core_prs
+ ds_rules <- mapM dsRule rules
+ return (all_prs, catMaybes ds_rules, ds_fords, ds_hpc_info, modBreaks)
+
; case mb_res of {
- Nothing -> return Nothing ;
+ Nothing -> return (msgs, Nothing) ;
Just (all_prs, ds_rules, ds_fords,ds_hpc_info, modBreaks) -> do
{ -- Add export flags to bindings
mg_dir_imps = imp_mods imports,
mg_rdr_env = rdr_env,
mg_fix_env = fix_env,
- mg_deprecs = deprecs,
+ mg_warns = warns,
+ mg_anns = anns,
mg_types = type_env,
mg_insts = insts,
mg_fam_insts = fam_insts,
mg_modBreaks = modBreaks,
mg_vect_info = noVectInfo
}
- ; return (Just mod_guts)
+ ; return (msgs, Just mod_guts)
}}}
-mkAutoScc :: Module -> NameSet -> AutoScc
-mkAutoScc mod exports
+mkAutoScc :: DynFlags -> Module -> NameSet -> AutoScc
+mkAutoScc dflags mod exports
| not opt_SccProfilingOn -- No profiling
= NoSccs
- | opt_AutoSccsOnAllToplevs -- Add auto-scc on all top-level things
+ -- Add auto-scc on all top-level things
+ | dopt Opt_AutoSccsOnAllToplevs dflags
= AddSccs mod (\id -> not $ isDerivedOccName $ getOccName id)
-- See #1641. This is pretty yucky, but I can't see a better way
-- to identify compiler-generated Ids, and at least this should
-- catch them all.
- | opt_AutoSccsOnExportedToplevs -- Only on exported things
+ -- Only on exported things
+ | dopt Opt_AutoSccsOnExportedToplevs dflags
= AddSccs mod (\id -> idName id `elemNameSet` exports)
| otherwise
= NoSccs
deSugarExpr :: HscEnv
-> Module -> GlobalRdrEnv -> TypeEnv
-> LHsExpr Id
- -> IO (Maybe CoreExpr)
+ -> IO (Messages, Maybe CoreExpr)
-- Prints its own errors; returns Nothing if error occurred
-deSugarExpr hsc_env this_mod rdr_env type_env tc_expr
- = do { let dflags = hsc_dflags hsc_env
- ; showPass dflags "Desugar"
+deSugarExpr hsc_env this_mod rdr_env type_env tc_expr = do
+ let dflags = hsc_dflags hsc_env
+ showPass dflags "Desugar"
- -- Do desugaring
- ; mb_core_expr <- initDs hsc_env this_mod rdr_env type_env $
- dsLExpr tc_expr
+ -- Do desugaring
+ (msgs, mb_core_expr) <- initDs hsc_env this_mod rdr_env type_env $
+ dsLExpr tc_expr
- ; case mb_core_expr of {
- Nothing -> return Nothing ;
- Just expr -> do {
+ case mb_core_expr of
+ Nothing -> return (msgs, Nothing)
+ Just expr -> do
- -- Dump output
- dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr expr)
+ -- Dump output
+ dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr expr)
- ; return (Just expr) } } }
+ return (msgs, Just expr)
-- addExportFlags
-- Set the no-discard flag if either
dsRule :: LRuleDecl Id -> DsM (Maybe CoreRule)
dsRule (L loc (HsRule name act vars lhs _tv_lhs rhs _fv_rhs))
= putSrcSpanDs loc $
- do { let bndrs = [var | RuleBndr (L _ var) <- vars]
+ do { let bndrs' = [var | RuleBndr (L _ var) <- vars]
; lhs' <- dsLExpr lhs
; rhs' <- dsLExpr rhs
- ; case decomposeRuleLhs (occurAnalyseExpr lhs') of {
- Nothing -> do { warnDs msg; return Nothing } ;
- Just (fn_id, args) -> do
-
-- Substitute the dict bindings eagerly,
-- and take the body apart into a (f args) form
+ ; case decomposeRuleLhs (mkLams bndrs' lhs') of {
+ Nothing -> do { warnDs msg; return Nothing } ;
+ Just (bndrs, fn_id, args) -> do
+
{ let local_rule = isLocalId fn_id
-- NB: isLocalId is False of implicit Ids. This is good becuase
-- we don't want to attach rules to the bindings of implicit Ids,