import HscTypes ( ModGuts(..), ModGuts, HscEnv(..), GhciMode(..),
Dependencies(..), TypeEnv,
unQualInScope, availsToNameSet )
-import HsSyn ( MonoBinds, RuleDecl(..), RuleBndr(..),
- HsExpr(..), HsBinds(..), MonoBinds(..) )
-import TcHsSyn ( TypecheckedRuleDecl, TypecheckedHsExpr )
+import HsSyn ( RuleDecl(..), RuleBndr(..), HsExpr(..), LHsExpr,
+ HsBindGroup(..), LRuleDecl, HsBind(..) )
import TcRnTypes ( TcGblEnv(..), ImportAvails(..) )
import MkIface ( mkUsageInfo )
import Id ( Id, setIdLocalExported, idName )
import PprCore ( pprIdRules, pprCoreExpr )
import Subst ( substExpr, mkSubst, mkInScopeSet )
import DsMonad
-import DsExpr ( dsExpr )
-import DsBinds ( dsMonoBinds, AutoScc(..) )
+import DsExpr ( dsLExpr )
+import DsBinds ( dsHsBinds, AutoScc(..) )
import DsForeign ( dsForeigns )
import DsExpr () -- Forces DsExpr to be compiled; DsBinds only
-- depends on DsExpr.hi-boot.
import NameSet
import VarEnv
import VarSet
-import Bag ( isEmptyBag, mapBag, emptyBag )
+import Bag ( Bag, isEmptyBag, mapBag, emptyBag, bagToList )
import CoreLint ( showPass, endPass )
import CoreFVs ( ruleRhsFreeVars )
+import Packages ( thPackage )
import ErrUtils ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings,
- addShortWarnLocLine, errorsFound )
+ mkWarnMsg, errorsFound, WarnMsg )
+import ListSetOps ( insertList )
import Outputable
-import qualified Pretty
import UniqSupply ( mkSplitUniqSupply )
-import SrcLoc ( SrcLoc )
+import SrcLoc ( Located(..), SrcSpan, unLoc )
import DATA_IOREF ( readIORef )
import FastString
+import Data.List ( sort )
\end{code}
%************************************************************************
%************************************************************************
\begin{code}
-deSugar :: HscEnv -> TcGblEnv -> IO (Maybe ModGuts)
+deSugar :: HscEnv -> TcGblEnv -> IO (Bag WarnMsg, Maybe ModGuts)
-- Can modify PCS by faulting in more declarations
deSugar hsc_env
tcg_exports = exports,
tcg_dus = dus,
tcg_inst_uses = dfun_uses_var,
+ tcg_th_used = th_var,
tcg_rdr_env = rdr_env,
tcg_fix_env = fix_env,
tcg_deprecs = deprecs,
= do { showPass dflags "Desugar"
-- Do desugaring
- ; let { is_boot = imp_dep_mods imports }
- ; (results, warnings) <- initDs hsc_env mod type_env is_boot $
+ ; (results, warnings) <- initDs hsc_env mod type_env $
dsProgram ghci_mode tcg_env
; let { (ds_binds, ds_rules, ds_fords) = results
; warns = mapBag mk_warn warnings
- ; warn_doc = pprBagOfWarnings warns }
-
- -- Display any warnings
- ; doIfSet (not (isEmptyBag warnings))
- (printErrs warn_doc)
+ }
-- If warnings are considered errors, leave.
; if errorsFound dflags (warns, emptyBag)
- then return Nothing
+ then return (warns, Nothing)
else do
-- Lint result if necessary
; dfun_uses <- readIORef dfun_uses_var -- What dfuns are used
; let used_names = allUses dus `unionNameSets` dfun_uses
; usages <- mkUsageInfo hsc_env imports used_names
+
+ ; th_used <- readIORef th_var
; let
+ pkgs | th_used = insertList thPackage (imp_dep_pkgs imports)
+ | otherwise = imp_dep_pkgs imports
+
deps = Deps { dep_mods = moduleEnvElts (imp_dep_mods imports),
- dep_pkgs = imp_dep_pkgs imports,
- dep_orphs = imp_orphs imports }
+ dep_pkgs = sort pkgs,
+ dep_orphs = sort (imp_orphs imports) }
+ -- sort to get into canonical order
+
mod_guts = ModGuts {
mg_module = mod,
mg_exports = exports,
mg_deps = deps,
mg_usages = usages,
- mg_dir_imps = [m | (m,_) <- moduleEnvElts (imp_mods imports)],
+ mg_dir_imps = [m | (m,_,_) <- moduleEnvElts (imp_mods imports)],
mg_rdr_env = rdr_env,
mg_fix_env = fix_env,
mg_deprecs = deprecs,
mg_binds = ds_binds,
mg_foreign = ds_fords }
- ; return (Just mod_guts)
+ ; return (warns, Just mod_guts)
}}
where
-- Desugarer warnings are SDocs; here we
-- add the info about whether or not to print unqualified
- mk_warn :: (SrcLoc,SDoc) -> (SrcLoc, Pretty.Doc)
- mk_warn (loc, sdoc) = addShortWarnLocLine loc print_unqual sdoc
+ mk_warn :: (SrcSpan,SDoc) -> WarnMsg
+ mk_warn (loc, sdoc) = mkWarnMsg loc print_unqual sdoc
deSugarExpr :: HscEnv
-> Module -> GlobalRdrEnv -> TypeEnv
- -> TypecheckedHsExpr
+ -> LHsExpr Id
-> IO CoreExpr
deSugarExpr hsc_env this_mod rdr_env type_env tc_expr
= do { showPass dflags "Desugar"
; us <- mkSplitUniqSupply 'd'
-- Do desugaring
- ; let { is_boot = emptyModuleEnv } -- Assume no hi-boot files when
- -- doing stuff from the command line
- ; (core_expr, ds_warns) <- initDs hsc_env this_mod type_env is_boot $
- dsExpr tc_expr
+ ; (core_expr, ds_warns) <- initDs hsc_env this_mod type_env $
+ dsLExpr tc_expr
-- Display any warnings
-- Note: if -Werror is used, we don't signal an error here.
dflags = hsc_dflags hsc_env
print_unqual = unQualInScope rdr_env
- mk_warn :: (SrcLoc,SDoc) -> (SrcLoc, Pretty.Doc)
- mk_warn (loc,sdoc) = addShortWarnLocLine loc print_unqual sdoc
+ mk_warn :: (SrcSpan,SDoc) -> WarnMsg
+ mk_warn (loc,sdoc) = mkWarnMsg loc print_unqual sdoc
dsProgram ghci_mode (TcGblEnv { tcg_exports = exports,
tcg_binds = binds,
tcg_fords = fords,
tcg_rules = rules })
- = dsMonoBinds auto_scc binds [] `thenDs` \ core_prs ->
+ = dsHsBinds auto_scc binds [] `thenDs` \ core_prs ->
dsForeigns fords `thenDs` \ (ds_fords, foreign_prs) ->
let
all_prs = foreign_prs ++ core_prs
-- introduced by the type checker.
is_exported :: Name -> Bool
is_exported | ghci_mode == Interactive = isExternalName
- | otherwise = (`elemNameSet` export_fvs)
-
- export_fvs = availsToNameSet exports
+ | otherwise = (`elemNameSet` exports)
ppr_ds_rules [] = empty
ppr_ds_rules rules
%************************************************************************
\begin{code}
-dsRule :: IdSet -> TypecheckedRuleDecl -> DsM (Id, CoreRule)
-dsRule in_scope (HsRule name act vars lhs rhs loc)
- = putSrcLocDs loc $
+dsRule :: IdSet -> LRuleDecl Id -> DsM (Id, CoreRule)
+dsRule in_scope (L loc (HsRule name act vars lhs rhs))
+ = putSrcSpanDs loc $
ds_lhs all_vars lhs `thenDs` \ (fn, args) ->
- dsExpr rhs `thenDs` \ core_rhs ->
+ dsLExpr rhs `thenDs` \ core_rhs ->
returnDs (fn, Rule name act tpl_vars args core_rhs)
where
- tpl_vars = [var | RuleBndr var <- vars]
- all_vars = mkInScopeSet (in_scope `unionVarSet` mkVarSet tpl_vars)
+ tpl_vars = [var | RuleBndr (L _ var) <- vars]
+ all_vars = mkInScopeSet (extendVarSetList in_scope tpl_vars)
ds_lhs all_vars lhs
= let
- (dict_binds, body) = case lhs of
- (HsLet (MonoBind dict_binds _ _) body) -> (dict_binds, body)
- other -> (EmptyMonoBinds, lhs)
+ (dict_binds, body) =
+ case unLoc lhs of
+ (HsLet [HsBindGroup dict_binds _ _] body) -> (dict_binds, body)
+ other -> (emptyBag, lhs)
in
- ds_dict_binds dict_binds `thenDs` \ dict_binds' ->
- dsExpr body `thenDs` \ body' ->
+ mappM ds_dict_bind (bagToList dict_binds) `thenDs` \ dict_binds' ->
+ dsLExpr body `thenDs` \ body' ->
-- Substitute the dict bindings eagerly,
-- and take the body apart into a (f args) form
in
returnDs pair
-ds_dict_binds EmptyMonoBinds = returnDs []
-ds_dict_binds (AndMonoBinds b1 b2) = ds_dict_binds b1 `thenDs` \ env1 ->
- ds_dict_binds b2 `thenDs` \ env2 ->
- returnDs (env1 ++ env2)
-ds_dict_binds (VarMonoBind id rhs) = dsExpr rhs `thenDs` \ rhs' ->
- returnDs [(id,rhs')]
+ds_dict_bind (L _ (VarBind id rhs)) =
+ dsLExpr rhs `thenDs` \ rhs' ->
+ returnDs (id,rhs')
\end{code}
projects / ghc-hetmet.git / blobdiff