duplicateLocalDs, newSysLocalDs, newSysLocalsDs,
newFailLocalDs,
getSrcLocDs, putSrcLocDs,
- getModuleAndGroupDs,
+ getModuleDs,
getUniqueDs,
+ getDOptsDs,
dsLookupGlobalValue,
- ValueEnv,
dsWarn,
DsWarnings,
- DsMatchContext(..), DsMatchKind(..), pprDsWarnings
+ DsMatchContext(..), DsMatchKind(..)
) where
#include "HsVersions.h"
-import Bag ( emptyBag, snocBag, bagToList, Bag )
+import Bag ( emptyBag, snocBag, Bag )
import ErrUtils ( WarnMsg )
-import HsSyn ( OutPat )
-import Id ( mkUserLocal, mkSysLocal, setIdUnique, Id )
-import Name ( Module, Name, maybeWiredInIdName )
+import Id ( mkSysLocal, setIdUnique, Id )
+import Module ( Module )
import Var ( TyVar, setTyVarUnique )
-import VarEnv
import Outputable
import SrcLoc ( noSrcLoc, SrcLoc )
import TcHsSyn ( TypecheckedPat )
-import TcEnv ( ValueEnv )
import Type ( Type )
-import UniqSupply ( initUs, splitUniqSupply, uniqFromSupply, uniqsFromSupply,
+import UniqSupply ( initUs_, splitUniqSupply, uniqFromSupply, uniqsFromSupply,
UniqSM, UniqSupply )
import Unique ( Unique )
-import UniqFM ( lookupWithDefaultUFM )
+import UniqFM ( lookupWithDefaultUFM_Directly )
import Util ( zipWithEqual )
+import Name ( Name, lookupNameEnv )
+import HscTypes ( HomeSymbolTable, PersistentCompilerState(..),
+ TyThing(..), TypeEnv, lookupTypeEnv )
+import CmdLineOpts ( DynFlags )
infixr 9 `thenDs`
\end{code}
presumably include source-file location information:
\begin{code}
type DsM result =
- UniqSupply
- -> ValueEnv
- -> SrcLoc -- to put in pattern-matching error msgs
- -> (Module, Group) -- module + group name : for SCC profiling
+ DynFlags
+ -> UniqSupply
+ -> (Name -> Id) -- Lookup well-known Ids
+ -> SrcLoc -- to put in pattern-matching error msgs
+ -> Module -- module: for SCC profiling
-> DsWarnings
-> (result, DsWarnings)
type DsWarnings = Bag WarnMsg -- The desugarer reports matches which are
-- completely shadowed or incomplete patterns
-type Group = FAST_STRING
-
{-# INLINE andDs #-}
{-# INLINE thenDs #-}
{-# INLINE returnDs #-}
-- initDs returns the UniqSupply out the end (not just the result)
-initDs :: UniqSupply
- -> ValueEnv
- -> (Module, Group) -- module name: for profiling; (group name: from switches)
+initDs :: DynFlags
+ -> UniqSupply
+ -> (HomeSymbolTable, PersistentCompilerState, TypeEnv)
+ -> Module -- module name: for profiling
-> DsM a
-> (a, DsWarnings)
-initDs init_us genv module_and_group action
- = action init_us genv noSrcLoc module_and_group emptyBag
+initDs dflags init_us (hst,pcs,local_type_env) mod action
+ = action dflags init_us lookup noSrcLoc mod emptyBag
+ where
+ -- This lookup 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
+ pst = pcs_PST pcs
+ lookup n = case lookupTypeEnv pst n of {
+ Just (AnId v) -> v ;
+ other ->
+ case lookupTypeEnv hst n of {
+ Just (AnId v) -> v ;
+ other ->
+ case lookupNameEnv local_type_env n of
+ Just (AnId v) -> v ;
+ other -> pprPanic "initDS: lookup:" (ppr n)
+ }}
thenDs :: DsM a -> (a -> DsM b) -> DsM b
andDs :: (a -> a -> a) -> DsM a -> DsM a -> DsM a
-thenDs m1 m2 us genv loc mod_and_grp warns
+thenDs m1 m2 dflags us genv loc mod warns
= case splitUniqSupply us of { (s1, s2) ->
- case (m1 s1 genv loc mod_and_grp warns) of { (result, warns1) ->
- m2 result s2 genv loc mod_and_grp warns1}}
+ case (m1 dflags s1 genv loc mod warns) of { (result, warns1) ->
+ m2 result dflags s2 genv loc mod warns1}}
-andDs combiner m1 m2 us genv loc mod_and_grp warns
+andDs combiner m1 m2 dflags us genv loc mod warns
= case splitUniqSupply us of { (s1, s2) ->
- case (m1 s1 genv loc mod_and_grp warns) of { (result1, warns1) ->
- case (m2 s2 genv loc mod_and_grp warns1) of { (result2, warns2) ->
+ case (m1 dflags s1 genv loc mod warns) of { (result1, warns1) ->
+ case (m2 dflags s2 genv loc mod warns1) of { (result2, warns2) ->
(combiner result1 result2, warns2) }}}
returnDs :: a -> DsM a
-returnDs result us genv loc mod_and_grp warns = (result, warns)
+returnDs result dflags us genv loc mod warns = (result, warns)
listDs :: [DsM a] -> DsM [a]
listDs [] = returnDs []
\begin{code}
newSysLocalDs, newFailLocalDs :: Type -> DsM Id
-newSysLocalDs ty us genv loc mod_and_grp warns
+newSysLocalDs ty dflags us genv loc mod warns
= case uniqFromSupply us of { assigned_uniq ->
(mkSysLocal SLIT("ds") assigned_uniq ty, warns) }
newSysLocalsDs tys = mapDs newSysLocalDs tys
-newFailLocalDs ty us genv loc mod_and_grp warns
+newFailLocalDs ty dflags us genv loc mod warns
= case uniqFromSupply us of { assigned_uniq ->
(mkSysLocal SLIT("fail") assigned_uniq ty, warns) }
-- The UserLocal bit just helps make the code a little clearer
getUniqueDs :: DsM Unique
-getUniqueDs us genv loc mod_and_grp warns
+getUniqueDs dflags us genv loc mod warns
= case (uniqFromSupply us) of { assigned_uniq ->
(assigned_uniq, warns) }
+getDOptsDs :: DsM DynFlags
+getDOptsDs dflags us genv loc mod warns
+ = (dflags, warns)
+
duplicateLocalDs :: Id -> DsM Id
-duplicateLocalDs old_local us genv loc mod_and_grp warns
+duplicateLocalDs old_local dflags us genv loc mod warns
= case uniqFromSupply us of { assigned_uniq ->
(setIdUnique old_local assigned_uniq, warns) }
cloneTyVarsDs :: [TyVar] -> DsM [TyVar]
-cloneTyVarsDs tyvars us genv loc mod_and_grp warns
+cloneTyVarsDs tyvars dflags us genv loc mod warns
= case uniqsFromSupply (length tyvars) us of { uniqs ->
(zipWithEqual "cloneTyVarsDs" setTyVarUnique tyvars uniqs, warns) }
\end{code}
\begin{code}
newTyVarsDs :: [TyVar] -> DsM [TyVar]
-newTyVarsDs tyvar_tmpls us genv loc mod_and_grp warns
+newTyVarsDs tyvar_tmpls dflags us genv loc mod warns
= case uniqsFromSupply (length tyvar_tmpls) us of { uniqs ->
(zipWithEqual "newTyVarsDs" setTyVarUnique tyvar_tmpls uniqs, warns) }
\end{code}
\begin{code}
uniqSMtoDsM :: UniqSM a -> DsM a
-uniqSMtoDsM u_action us genv loc mod_and_grp warns
- = (initUs us u_action, warns)
+uniqSMtoDsM u_action dflags us genv loc mod warns
+ = (initUs_ us u_action, warns)
getSrcLocDs :: DsM SrcLoc
-getSrcLocDs us genv loc mod_and_grp warns
+getSrcLocDs dflags us genv loc mod warns
= (loc, warns)
putSrcLocDs :: SrcLoc -> DsM a -> DsM a
-putSrcLocDs new_loc expr us genv old_loc mod_and_grp warns
- = expr us genv new_loc mod_and_grp warns
+putSrcLocDs new_loc expr dflags us genv old_loc mod warns
+ = expr dflags us genv new_loc mod warns
dsWarn :: WarnMsg -> DsM ()
-dsWarn warn us genv loc mod_and_grp warns = ((), warns `snocBag` warn)
+dsWarn warn dflags us genv loc mod warns = ((), warns `snocBag` warn)
\end{code}
\begin{code}
-getModuleAndGroupDs :: DsM (Module, Group)
-getModuleAndGroupDs us genv loc mod_and_grp warns
- = (mod_and_grp, warns)
+getModuleDs :: DsM Module
+getModuleDs dflags us genv loc mod warns = (mod, warns)
\end{code}
\begin{code}
dsLookupGlobalValue :: Name -> DsM Id
-dsLookupGlobalValue name us genv loc mod_and_grp warns
- = case maybeWiredInIdName name of
- Just id -> (id, warns)
- Nothing -> (lookupWithDefaultUFM genv def name, warns)
- where
- def = pprPanic "tcLookupGlobalValue:" (ppr name)
+dsLookupGlobalValue name dflags us genv loc mod warns
+ = (genv name, warns)
\end{code}
%************************************************************************
%* *
-%* type synonym EquationInfo and access functions for its pieces *
+\subsection{Type synonym @EquationInfo@ and access functions for its pieces}
%* *
%************************************************************************
| DoBindMatch
| ListCompMatch
| LetMatch
+ | RecUpdMatch
deriving ()
-
-pprDsWarnings :: DsWarnings -> SDoc
-pprDsWarnings warns = vcat (bagToList warns)
\end{code}
projects / ghc-hetmet.git / blobdiff