#include "HsVersions.h"
-import CmdLineOpts ( DynFlags, DynFlag(..), dopt, opt_SccProfilingOn )
-import HscTypes ( ModDetails(..) )
+import CmdLineOpts ( DynFlag(..), dopt, opt_SccProfilingOn )
+import HscTypes ( ModGuts(..), ModGuts, HscEnv(..),
+ Dependencies(..), TypeEnv,
+ unQualInScope )
import HsSyn ( MonoBinds, RuleDecl(..), RuleBndr(..),
HsExpr(..), HsBinds(..), MonoBinds(..) )
import TcHsSyn ( TypecheckedRuleDecl, TypecheckedHsExpr )
-import TcModule ( TcResults(..) )
+import TcRnTypes ( TcGblEnv(..), ImportAvails(..) )
+import MkIface ( mkUsageInfo )
import Id ( Id )
import CoreSyn
import PprCore ( pprIdRules, pprCoreExpr )
import DsForeign ( dsForeigns )
import DsExpr () -- Forces DsExpr to be compiled; DsBinds only
-- depends on DsExpr.hi-boot.
-import Module ( Module )
+import Module ( Module, moduleEnvElts, emptyModuleEnv )
import Id ( Id )
-import NameEnv ( lookupNameEnv )
+import RdrName ( GlobalRdrEnv )
+import NameSet
import VarEnv
import VarSet
-import Bag ( isEmptyBag )
+import Bag ( isEmptyBag, mapBag, emptyBag )
import CoreLint ( showPass, endPass )
-import ErrUtils ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings )
+import ErrUtils ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings,
+ addShortWarnLocLine, errorsFound )
import Outputable
+import qualified Pretty
import UniqSupply ( mkSplitUniqSupply )
-import HscTypes ( HomeSymbolTable, PersistentCompilerState(..), TyThing(..), lookupType, )
+import SrcLoc ( SrcLoc )
+import DATA_IOREF ( readIORef )
+import FastString
\end{code}
%************************************************************************
%* *
%************************************************************************
-The only trick here is to get the @DsMonad@ stuff off to a good
-start.
-
\begin{code}
-deSugar :: DynFlags
- -> PersistentCompilerState -> HomeSymbolTable
- -> Module -> PrintUnqualified
- -> TcResults
- -> IO (ModDetails, (SDoc, SDoc, [FAST_STRING], [CoreBndr]))
-
-deSugar dflags pcs hst mod_name unqual
- (TcResults {tc_env = type_env,
- tc_binds = all_binds,
- tc_insts = insts,
- tc_rules = rules,
- tc_fords = fo_decls})
+deSugar :: HscEnv -> TcGblEnv -> IO (Maybe ModGuts)
+-- Can modify PCS by faulting in more declarations
+
+deSugar hsc_env
+ (TcGblEnv { tcg_mod = mod,
+ tcg_type_env = type_env,
+ tcg_imports = imports,
+ tcg_exports = exports,
+ tcg_dus = dus,
+ tcg_inst_uses = dfun_uses_var,
+ tcg_rdr_env = rdr_env,
+ tcg_fix_env = fix_env,
+ tcg_deprecs = deprecs,
+ tcg_insts = insts,
+ tcg_binds = binds,
+ tcg_fords = fords,
+ tcg_rules = rules })
= do { showPass dflags "Desugar"
- ; us <- mkSplitUniqSupply 'd'
-- Do desugaring
- ; let (ds_result, ds_warns) = initDs dflags us lookup mod_name
- (dsProgram mod_name all_binds rules fo_decls)
+ ; let { is_boot = imp_dep_mods imports }
+ ; (results, warnings) <- initDs hsc_env mod type_env is_boot $
+ dsProgram binds rules fords
- (ds_binds, ds_rules, foreign_stuff) = ds_result
-
- mod_details = ModDetails { md_types = type_env,
- md_insts = insts,
- md_rules = ds_rules,
- md_binds = ds_binds }
+ ; let { (ds_binds, ds_rules, ds_fords) = results
+ ; warns = mapBag mk_warn warnings
+ ; warn_doc = pprBagOfWarnings warns }
-- Display any warnings
- ; doIfSet (not (isEmptyBag ds_warns))
- (printErrs unqual (pprBagOfWarnings ds_warns))
+ ; doIfSet (not (isEmptyBag warnings))
+ (printErrs warn_doc)
+
+ -- If warnings are considered errors, leave.
+ ; if errorsFound dflags (warns, emptyBag)
+ then return Nothing
+ else do
-- Lint result if necessary
- ; endPass dflags "Desugar" Opt_D_dump_ds ds_binds
+ { endPass dflags "Desugar" Opt_D_dump_ds ds_binds
-- Dump output
; doIfSet (dopt Opt_D_dump_ds dflags)
- (printDump (ppr_ds_rules ds_rules))
-
- ; return (mod_details, foreign_stuff)
- }
+ (printDump (ppr_ds_rules ds_rules))
+
+ ; dfun_uses <- readIORef dfun_uses_var -- What dfuns are used
+ ; let used_names = allUses dus emptyNameSet `unionNameSets` dfun_uses
+ ; usages <- mkUsageInfo hsc_env imports used_names
+ ; let
+ deps = Deps { dep_mods = moduleEnvElts (imp_dep_mods imports),
+ dep_pkgs = imp_dep_pkgs imports,
+ dep_orphs = imp_orphs imports }
+ 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_rdr_env = rdr_env,
+ mg_fix_env = fix_env,
+ mg_deprecs = deprecs,
+ mg_types = type_env,
+ mg_insts = insts,
+ mg_rules = ds_rules,
+ mg_binds = ds_binds,
+ mg_foreign = ds_fords }
+
+ ; return (Just mod_guts)
+ }}
where
- -- The lookup function passed to initDs is used for well-known Ids,
- -- such as fold, build, cons etc, so the chances are
- -- it'll be found in the package symbol table. That's
- -- why we don't merge all these tables
- pte = pcs_PTE pcs
- lookup n = case lookupType hst pte n of {
- Just (AnId v) -> v ;
- other ->
- case lookupNameEnv type_env n of
- Just (AnId v) -> v ;
- other -> pprPanic "Desugar: lookup:" (ppr n)
- }
-
-deSugarExpr :: DynFlags
- -> PersistentCompilerState -> HomeSymbolTable
- -> Module -> PrintUnqualified
+ dflags = hsc_dflags hsc_env
+ print_unqual = unQualInScope rdr_env
+
+ -- 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
+
+
+deSugarExpr :: HscEnv
+ -> Module -> GlobalRdrEnv -> TypeEnv
-> TypecheckedHsExpr
-> IO CoreExpr
-deSugarExpr dflags pcs hst mod_name unqual tc_expr
+deSugarExpr hsc_env this_mod rdr_env type_env tc_expr
= do { showPass dflags "Desugar"
; us <- mkSplitUniqSupply 'd'
-- Do desugaring
- ; let (core_expr, ds_warns) = initDs dflags us lookup mod_name (dsExpr tc_expr)
+ ; 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
- -- Display any warnings
+ -- Display any warnings
+ -- Note: if -Werror is used, we don't signal an error here.
; doIfSet (not (isEmptyBag ds_warns))
- (printErrs unqual (pprBagOfWarnings ds_warns))
+ (printErrs (pprBagOfWarnings (mapBag mk_warn ds_warns)))
-- Dump output
; dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr core_expr)
; return core_expr
}
where
- pte = pcs_PTE pcs
- lookup n = case lookupType hst pte n of
- Just (AnId v) -> v
- other -> pprPanic "Desugar: lookup:" (ppr n)
+ dflags = hsc_dflags hsc_env
+ print_unqual = unQualInScope rdr_env
-dsProgram mod_name all_binds rules fo_decls
+ mk_warn :: (SrcLoc,SDoc) -> (SrcLoc, Pretty.Doc)
+ mk_warn (loc,sdoc) = addShortWarnLocLine loc print_unqual sdoc
+
+
+dsProgram all_binds rules fo_decls
= dsMonoBinds auto_scc all_binds [] `thenDs` \ core_prs ->
- dsForeigns mod_name fo_decls `thenDs` \ (fe_binders, foreign_binds, h_code, c_code, headers) ->
+ dsForeigns fo_decls `thenDs` \ (ds_fords, foreign_binds) ->
let
ds_binds = [Rec (foreign_binds ++ core_prs)]
-- Notice that we put the whole lot in a big Rec, even the foreign binds
local_binders = mkVarSet (bindersOfBinds ds_binds)
in
- mapDs (dsRule local_binders) rules `thenDs` \ rules' ->
- returnDs (ds_binds, rules', (h_code, c_code, headers, fe_binders))
+ mappM (dsRule local_binders) rules `thenDs` \ ds_rules ->
+ returnDs (ds_binds, ds_rules, ds_fords)
where
auto_scc | opt_SccProfilingOn = TopLevel
| otherwise = NoSccs
\end{code}
+
%************************************************************************
%* *
%* Desugaring transformation rules
\begin{code}
dsRule :: IdSet -> TypecheckedRuleDecl -> DsM (Id, CoreRule)
-dsRule in_scope (IfaceRuleOut fun rule) -- Built-in rules come this way
- = returnDs (fun, rule)
-
dsRule in_scope (HsRule name act vars lhs rhs loc)
= putSrcLocDs loc $
ds_lhs all_vars lhs `thenDs` \ (fn, args) ->