X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcHsSyn.lhs;h=345011bb23e464240081eae311a90502bfc36010;hb=e0eaaf09894f74939166568573b36cb5bdafcfc7;hp=67681204949e1f8eb502a0be7a280e8715ee183e;hpb=8f7ac3fe40d3d55743b824deab655d0797a1c55f;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcHsSyn.lhs b/ghc/compiler/typecheck/TcHsSyn.lhs index 6768120..345011b 100644 --- a/ghc/compiler/typecheck/TcHsSyn.lhs +++ b/ghc/compiler/typecheck/TcHsSyn.lhs @@ -7,60 +7,59 @@ This module is an extension of @HsSyn@ syntax, for use in the type checker. \begin{code} -#include "HsVersions.h" - module TcHsSyn ( - SYN_IE(TcIdBndr), TcIdOcc(..), - - SYN_IE(TcMonoBinds), SYN_IE(TcHsBinds), SYN_IE(TcBind), SYN_IE(TcPat), - SYN_IE(TcExpr), SYN_IE(TcGRHSsAndBinds), SYN_IE(TcGRHS), SYN_IE(TcMatch), - SYN_IE(TcQual), SYN_IE(TcStmt), SYN_IE(TcArithSeqInfo), SYN_IE(TcRecordBinds), - SYN_IE(TcHsModule), SYN_IE(TcCoreExpr), + TcMonoBinds, TcHsBinds, TcPat, + TcExpr, TcGRHSsAndBinds, TcGRHS, TcMatch, + TcStmt, TcArithSeqInfo, TcRecordBinds, + TcHsModule, TcCoreExpr, TcDictBinds, - SYN_IE(TypecheckedHsBinds), SYN_IE(TypecheckedBind), - SYN_IE(TypecheckedMonoBinds), SYN_IE(TypecheckedPat), - SYN_IE(TypecheckedHsExpr), SYN_IE(TypecheckedArithSeqInfo), - SYN_IE(TypecheckedQual), SYN_IE(TypecheckedStmt), - SYN_IE(TypecheckedMatch), SYN_IE(TypecheckedHsModule), - SYN_IE(TypecheckedGRHSsAndBinds), SYN_IE(TypecheckedGRHS), - SYN_IE(TypecheckedRecordBinds), + TypecheckedHsBinds, + TypecheckedMonoBinds, TypecheckedPat, + TypecheckedHsExpr, TypecheckedArithSeqInfo, + TypecheckedStmt, + TypecheckedMatch, TypecheckedHsModule, + TypecheckedGRHSsAndBinds, TypecheckedGRHS, + TypecheckedRecordBinds, TypecheckedDictBinds, mkHsTyApp, mkHsDictApp, mkHsTyLam, mkHsDictLam, - tcIdType, tcIdTyVars, - zonkBinds, - zonkDictBinds + -- re-exported from TcEnv + TcIdOcc(..), TcIdBndr, tcIdType, tcIdTyVars, tcInstId, + + maybeBoxedPrimType, + + zonkTopBinds, zonkBinds, zonkMonoBinds, zonkTcId ) where -IMP_Ubiq(){-uitous-} +#include "HsVersions.h" -- friends: import HsSyn -- oodles of it -import Id ( GenId(..), IdDetails, -- Can meddle modestly with Ids - SYN_IE(DictVar), idType, - SYN_IE(IdEnv), growIdEnvList, lookupIdEnv +import Id ( idType, dataConArgTys, mkIdWithNewType, Id ) -- others: -import Name ( Name{--O only-} ) -import TcMonad -import TcType ( SYN_IE(TcType), TcMaybe, SYN_IE(TcTyVar), - zonkTcTypeToType, zonkTcTyVarToTyVar +import Name ( NamedThing(..) ) +import BasicTypes ( IfaceFlavour, Unused ) +import TcEnv ( tcLookupGlobalValueMaybe, tcExtendGlobalValEnv, tcGetGlobalValEnv, + TcIdOcc(..), TcIdBndr, GlobalValueEnv, + tcIdType, tcIdTyVars, tcInstId ) -import Usage ( SYN_IE(UVar) ) -import Util ( zipEqual, panic, pprPanic, pprTrace ) -import PprType ( GenType, GenTyVar ) -- instances -import Type ( mkTyVarTy, tyVarsOfType ) -import TyVar ( GenTyVar {- instances -}, - SYN_IE(TyVarEnv), growTyVarEnvList, emptyTyVarSet ) +import TcMonad +import TcType ( TcType, TcMaybe, TcTyVar, TcBox, + zonkTcTypeToType, zonkTcTyVarToTyVar, zonkTcType + ) +import TyCon ( isDataTyCon ) +import Type ( mkTyVarTy, splitAlgTyConApp_maybe, isUnpointedType, Type ) +import TyVar ( TyVar, TyVarEnv, emptyTyVarEnv, growTyVarEnvList ) import TysPrim ( voidTy ) import CoreSyn ( GenCoreExpr ) import Unique ( Unique ) -- instances +import Bag import UniqFM -import PprStyle -import Pretty +import Outputable \end{code} @@ -75,39 +74,33 @@ At the end of type checking we zonk everything to @Typechecked...@ datatypes, which have immutable type variables in them. \begin{code} -type TcIdBndr s = GenId (TcType s) -- Binders are all TcTypes -data TcIdOcc s = TcId (TcIdBndr s) -- Bindees may be either - | RealId Id - -type TcHsBinds s = HsBinds (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcBind s = Bind (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcMonoBinds s = MonoBinds (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcPat s = OutPat (TcTyVar s) UVar (TcIdOcc s) -type TcExpr s = HsExpr (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcGRHSsAndBinds s = GRHSsAndBinds (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcGRHS s = GRHS (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcMatch s = Match (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcQual s = Qualifier (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcStmt s = Stmt (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcArithSeqInfo s = ArithSeqInfo (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcRecordBinds s = HsRecordBinds (TcTyVar s) UVar (TcIdOcc s) (TcPat s) -type TcHsModule s = HsModule (TcTyVar s) UVar (TcIdOcc s) (TcPat s) - -type TcCoreExpr s = GenCoreExpr (TcIdOcc s) (TcIdOcc s) (TcTyVar s) UVar - -type TypecheckedPat = OutPat TyVar UVar Id -type TypecheckedMonoBinds = MonoBinds TyVar UVar Id TypecheckedPat -type TypecheckedHsBinds = HsBinds TyVar UVar Id TypecheckedPat -type TypecheckedBind = Bind TyVar UVar Id TypecheckedPat -type TypecheckedHsExpr = HsExpr TyVar UVar Id TypecheckedPat -type TypecheckedArithSeqInfo = ArithSeqInfo TyVar UVar Id TypecheckedPat -type TypecheckedQual = Qualifier TyVar UVar Id TypecheckedPat -type TypecheckedStmt = Stmt TyVar UVar Id TypecheckedPat -type TypecheckedMatch = Match TyVar UVar Id TypecheckedPat -type TypecheckedGRHSsAndBinds = GRHSsAndBinds TyVar UVar Id TypecheckedPat -type TypecheckedGRHS = GRHS TyVar UVar Id TypecheckedPat -type TypecheckedRecordBinds = HsRecordBinds TyVar UVar Id TypecheckedPat -type TypecheckedHsModule = HsModule TyVar UVar Id TypecheckedPat +type TcHsBinds s = HsBinds (TcBox s) (TcIdOcc s) (TcPat s) +type TcMonoBinds s = MonoBinds (TcBox s) (TcIdOcc s) (TcPat s) +type TcDictBinds s = TcMonoBinds s +type TcPat s = OutPat (TcBox s) (TcIdOcc s) +type TcExpr s = HsExpr (TcBox s) (TcIdOcc s) (TcPat s) +type TcGRHSsAndBinds s = GRHSsAndBinds (TcBox s) (TcIdOcc s) (TcPat s) +type TcGRHS s = GRHS (TcBox s) (TcIdOcc s) (TcPat s) +type TcMatch s = Match (TcBox s) (TcIdOcc s) (TcPat s) +type TcStmt s = Stmt (TcBox s) (TcIdOcc s) (TcPat s) +type TcArithSeqInfo s = ArithSeqInfo (TcBox s) (TcIdOcc s) (TcPat s) +type TcRecordBinds s = HsRecordBinds (TcBox s) (TcIdOcc s) (TcPat s) +type TcHsModule s = HsModule (TcBox s) (TcIdOcc s) (TcPat s) + +type TcCoreExpr s = GenCoreExpr (TcIdOcc s) (TcIdOcc s) (TcBox s) + +type TypecheckedPat = OutPat Unused Id +type TypecheckedMonoBinds = MonoBinds Unused Id TypecheckedPat +type TypecheckedDictBinds = TypecheckedMonoBinds +type TypecheckedHsBinds = HsBinds Unused Id TypecheckedPat +type TypecheckedHsExpr = HsExpr Unused Id TypecheckedPat +type TypecheckedArithSeqInfo = ArithSeqInfo Unused Id TypecheckedPat +type TypecheckedStmt = Stmt Unused Id TypecheckedPat +type TypecheckedMatch = Match Unused Id TypecheckedPat +type TypecheckedGRHSsAndBinds = GRHSsAndBinds Unused Id TypecheckedPat +type TypecheckedGRHS = GRHS Unused Id TypecheckedPat +type TypecheckedRecordBinds = HsRecordBinds Unused Id TypecheckedPat +type TypecheckedHsModule = HsModule Unused Id TypecheckedPat \end{code} \begin{code} @@ -122,179 +115,186 @@ mkHsTyLam tyvars expr = TyLam tyvars expr mkHsDictLam [] expr = expr mkHsDictLam dicts expr = DictLam dicts expr +\end{code} -tcIdType :: TcIdOcc s -> TcType s -tcIdType (TcId id) = idType id -tcIdType (RealId id) = pprPanic "tcIdType:" (ppr PprDebug id) +%************************************************************************ +%* * +\subsection[BackSubst-HsBinds]{Running a substitution over @HsBinds@} +%* * +%************************************************************************ -tcIdTyVars (TcId id) = tyVarsOfType (idType id) -tcIdTyVars (RealId _) = emptyTyVarSet -- Top level Ids have no free type variables -\end{code} +Some gruesome hackery for desugaring ccalls. It's here because if we put it +in Type.lhs we get irritating loops, and it's only used by TcInstDcls.lhs and +DsCCall.lhs. \begin{code} -instance Eq (TcIdOcc s) where - (TcId id1) == (TcId id2) = id1 == id2 - (RealId id1) == (RealId id2) = id1 == id2 - _ == _ = False - -instance Outputable (TcIdOcc s) where - ppr sty (TcId id) = ppr sty id - ppr sty (RealId id) = ppr sty id - -instance NamedThing (TcIdOcc s) where - getName (TcId id) = getName id - getName (RealId id) = getName id +maybeBoxedPrimType :: Type -> Maybe (Id, Type) +maybeBoxedPrimType ty + = case splitAlgTyConApp_maybe ty of -- Data type, + Just (tycon, tys_applied, [data_con]) | isDataTyCon tycon -- with exactly one constructor + -> case (dataConArgTys data_con tys_applied) of + [data_con_arg_ty] -- Applied to exactly one type, + | isUnpointedType data_con_arg_ty -- which is primitive + -> Just (data_con, data_con_arg_ty) + other_cases -> Nothing + other_cases -> Nothing \end{code} - %************************************************************************ %* * \subsection[BackSubst-HsBinds]{Running a substitution over @HsBinds@} %* * %************************************************************************ +@zonkTcId@ just works on TcIdOccs. It's used when zonking Method insts. + +\begin{code} +zonkTcId :: TcIdOcc s -> NF_TcM s (TcIdOcc s) +zonkTcId tc_id@(RealId id) = returnNF_Tc tc_id +zonkTcId (TcId id) + = zonkTcType (idType id) `thenNF_Tc` \ ty' -> + returnNF_Tc (TcId (mkIdWithNewType id ty')) +\end{code} + This zonking pass runs over the bindings a) to convert TcTyVars to TyVars etc, dereferencing any bindings etc b) convert unbound TcTyVar to Void + c) convert each TcIdBndr to an Id by zonking its type We pass an environment around so that + a) we know which TyVars are unbound b) we maintain sharing; eg an Id is zonked at its binding site and they all occurrences of that Id point to the common zonked copy +Actually, since this is all in the Tc monad, it's convenient to keep the +mapping from TcIds to Ids in the GVE of the Tc monad. (Those TcIds +were previously in the LVE of the Tc monad.) + It's all pretty boring stuff, because HsSyn is such a large type, and the environment manipulation is tiresome. - \begin{code} -zonkIdBndr :: TyVarEnv Type -> TcIdOcc s -> NF_TcM s Id -zonkIdBndr te (TcId (Id u n ty details prags info)) - = zonkTcTypeToType te ty `thenNF_Tc` \ ty' -> - returnNF_Tc (Id u n ty' details prags info) +extend_te te tyvars = growTyVarEnvList te [(tyvar, mkTyVarTy tyvar) | tyvar <- tyvars] +zonkIdBndr :: TyVarEnv Type -> TcIdOcc s -> NF_TcM s Id zonkIdBndr te (RealId id) = returnNF_Tc id +zonkIdBndr te (TcId id) + = zonkTcTypeToType te (idType id) `thenNF_Tc` \ ty' -> + returnNF_Tc (mkIdWithNewType id ty') -zonkIdOcc :: IdEnv Id -> TcIdOcc s -> Id -zonkIdOcc ve (RealId id) = id -zonkIdOcc ve (TcId id) = case (lookupIdEnv ve id) of - Just id' -> id' - Nothing -> pprTrace "zonkIdOcc: " (ppr PprDebug id) $ - Id u n voidTy details prags info - where - Id u n _ details prags info = id -extend_ve ve ids = growIdEnvList ve [(id,id) | id <- ids] -extend_te te tyvars = growTyVarEnvList te [(tyvar, mkTyVarTy tyvar) | tyvar <- tyvars] +zonkIdOcc :: TcIdOcc s -> NF_TcM s Id +zonkIdOcc (RealId id) = returnNF_Tc id +zonkIdOcc (TcId id) + = tcLookupGlobalValueMaybe (getName id) `thenNF_Tc` \ maybe_id' -> + let + new_id = case maybe_id' of + Just id' -> id' + Nothing -> pprTrace "zonkIdOcc: " (ppr id) $ + mkIdWithNewType id voidTy + in + returnNF_Tc new_id \end{code} -\begin{code} - -- Implicitly mutually recursive, which is overkill, - -- but it means that later ones see earlier ones -zonkDictBinds te ve dbs - = fixNF_Tc (\ ~(_,new_ve) -> - zonkDictBindsLocal te new_ve dbs `thenNF_Tc` \ (new_binds, dict_ids) -> - returnNF_Tc (new_binds, extend_ve ve dict_ids) - ) - - -- The ..Local version assumes the caller has set up - -- a ve that contains all the things bound here -zonkDictBindsLocal te ve [] = returnNF_Tc ([], []) - -zonkDictBindsLocal te ve ((dict,rhs) : binds) - = zonkIdBndr te dict `thenNF_Tc` \ new_dict -> - zonkExpr te ve rhs `thenNF_Tc` \ new_rhs -> - zonkDictBindsLocal te ve binds `thenNF_Tc` \ (new_binds, dict_ids) -> - returnNF_Tc ((new_dict,new_rhs) : new_binds, - new_dict:dict_ids) -\end{code} \begin{code} -zonkBinds :: TyVarEnv Type -> IdEnv Id - -> TcHsBinds s -> NF_TcM s (TypecheckedHsBinds, IdEnv Id) - -zonkBinds te ve EmptyBinds = returnNF_Tc (EmptyBinds, ve) - -zonkBinds te ve (ThenBinds binds1 binds2) - = zonkBinds te ve binds1 `thenNF_Tc` \ (new_binds1, ve1) -> - zonkBinds te ve1 binds2 `thenNF_Tc` \ (new_binds2, ve2) -> - returnNF_Tc (ThenBinds new_binds1 new_binds2, ve2) - -zonkBinds te ve (SingleBind bind) - = fixNF_Tc (\ ~(_,new_ve) -> - zonkBind te new_ve bind `thenNF_Tc` \ (new_bind, new_ids) -> - returnNF_Tc (SingleBind new_bind, extend_ve ve new_ids) - ) - -zonkBinds te ve (AbsBinds tyvars dicts locprs dict_binds val_bind) - = mapNF_Tc zonkTcTyVarToTyVar tyvars `thenNF_Tc` \ new_tyvars -> - let - new_te = extend_te te new_tyvars - in - mapNF_Tc (zonkIdBndr new_te) dicts `thenNF_Tc` \ new_dicts -> - mapNF_Tc (zonkIdBndr new_te) globals `thenNF_Tc` \ new_globals -> - let - ve1 = extend_ve ve new_globals - ve2 = extend_ve ve1 new_dicts - in - fixNF_Tc (\ ~(_, ve3) -> - zonkDictBindsLocal new_te ve3 dict_binds `thenNF_Tc` \ (new_dict_binds, ds) -> - zonkBind new_te ve3 val_bind `thenNF_Tc` \ (new_val_bind, ls) -> - let - new_locprs = zipEqual "zonkBinds" (map (zonkIdOcc ve3) locals) new_globals - in - returnNF_Tc (AbsBinds new_tyvars new_dicts new_locprs new_dict_binds new_val_bind, - extend_ve ve2 (ds++ls)) - ) `thenNF_Tc` \ (binds, _) -> - returnNF_Tc (binds, ve1) -- Yes, the "ve1" is right (SLPJ) +zonkTopBinds :: TcMonoBinds s -> NF_TcM s (TypecheckedMonoBinds, GlobalValueEnv) +zonkTopBinds binds -- Top level is implicitly recursive + = fixNF_Tc (\ ~(_, new_ids) -> + tcExtendGlobalValEnv (bagToList new_ids) $ + zonkMonoBinds emptyTyVarEnv binds `thenNF_Tc` \ (binds', new_ids) -> + tcGetGlobalValEnv `thenNF_Tc` \ env -> + returnNF_Tc ((binds', env), new_ids) + ) `thenNF_Tc` \ (stuff, _) -> + returnNF_Tc stuff + + +zonkBinds :: TyVarEnv Type + -> TcHsBinds s + -> NF_TcM s (TypecheckedHsBinds, TcEnv s) + +zonkBinds te binds + = go binds (\ binds' -> tcGetEnv `thenNF_Tc` \ env -> returnNF_Tc (binds', env)) where - (locals, globals) = unzip locprs + -- go :: TcHsBinds s -> (TypecheckedHsBinds -> NF_TcM s (TypecheckedHsBinds, TcEnv s)) + -- -> NF_TcM s (TypecheckedHsBinds, TcEnv s) + go (ThenBinds b1 b2) thing_inside = go b1 $ \ b1' -> + go b2 $ \ b2' -> + thing_inside (b1' `ThenBinds` b2') + + go EmptyBinds thing_inside = thing_inside EmptyBinds + + go (MonoBind bind sigs is_rec) thing_inside + = ASSERT( null sigs ) + fixNF_Tc (\ ~(_, new_ids) -> + tcExtendGlobalValEnv (bagToList new_ids) $ + zonkMonoBinds te bind `thenNF_Tc` \ (new_bind, new_ids) -> + thing_inside (MonoBind new_bind [] is_rec) `thenNF_Tc` \ stuff -> + returnNF_Tc (stuff, new_ids) + ) `thenNF_Tc` \ (stuff, _) -> + returnNF_Tc stuff \end{code} \begin{code} ------------------------------------------------------------------------- -zonkBind :: TyVarEnv Type -> IdEnv Id - -> TcBind s -> NF_TcM s (TypecheckedBind, [Id]) - -zonkBind te ve EmptyBind = returnNF_Tc (EmptyBind, []) - -zonkBind te ve (NonRecBind mbinds) - = zonkMonoBinds te ve mbinds `thenNF_Tc` \ (new_mbinds, new_ids) -> - returnNF_Tc (NonRecBind new_mbinds, new_ids) - -zonkBind te ve (RecBind mbinds) - = zonkMonoBinds te ve mbinds `thenNF_Tc` \ (new_mbinds, new_ids) -> - returnNF_Tc (RecBind new_mbinds, new_ids) - -------------------------------------------------------------------------- -zonkMonoBinds :: TyVarEnv Type -> IdEnv Id - -> TcMonoBinds s -> NF_TcM s (TypecheckedMonoBinds, [Id]) +zonkMonoBinds :: TyVarEnv Type + -> TcMonoBinds s + -> NF_TcM s (TypecheckedMonoBinds, Bag Id) -zonkMonoBinds te ve EmptyMonoBinds = returnNF_Tc (EmptyMonoBinds, []) +zonkMonoBinds te EmptyMonoBinds = returnNF_Tc (EmptyMonoBinds, emptyBag) -zonkMonoBinds te ve (AndMonoBinds mbinds1 mbinds2) - = zonkMonoBinds te ve mbinds1 `thenNF_Tc` \ (new_mbinds1, ids1) -> - zonkMonoBinds te ve mbinds2 `thenNF_Tc` \ (new_mbinds2, ids2) -> - returnNF_Tc (AndMonoBinds new_mbinds1 new_mbinds2, ids1 ++ ids2) +zonkMonoBinds te (AndMonoBinds mbinds1 mbinds2) + = zonkMonoBinds te mbinds1 `thenNF_Tc` \ (b1', ids1) -> + zonkMonoBinds te mbinds2 `thenNF_Tc` \ (b2', ids2) -> + returnNF_Tc (b1' `AndMonoBinds` b2', ids1 `unionBags` ids2) -zonkMonoBinds te ve (PatMonoBind pat grhss_w_binds locn) - = zonkPat te ve pat `thenNF_Tc` \ (new_pat, ids) -> - zonkGRHSsAndBinds te ve grhss_w_binds `thenNF_Tc` \ new_grhss_w_binds -> +zonkMonoBinds te (PatMonoBind pat grhss_w_binds locn) + = zonkPat te pat `thenNF_Tc` \ (new_pat, ids) -> + zonkGRHSsAndBinds te grhss_w_binds `thenNF_Tc` \ new_grhss_w_binds -> returnNF_Tc (PatMonoBind new_pat new_grhss_w_binds locn, ids) -zonkMonoBinds te ve (VarMonoBind var expr) +zonkMonoBinds te (VarMonoBind var expr) = zonkIdBndr te var `thenNF_Tc` \ new_var -> - zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - returnNF_Tc (VarMonoBind new_var new_expr, [new_var]) + zonkExpr te expr `thenNF_Tc` \ new_expr -> + returnNF_Tc (VarMonoBind new_var new_expr, unitBag new_var) -zonkMonoBinds te ve (CoreMonoBind var core_expr) +zonkMonoBinds te (CoreMonoBind var core_expr) = zonkIdBndr te var `thenNF_Tc` \ new_var -> - returnNF_Tc (CoreMonoBind new_var core_expr, [new_var]) + returnNF_Tc (CoreMonoBind new_var core_expr, unitBag new_var) -zonkMonoBinds te ve (FunMonoBind var inf ms locn) +zonkMonoBinds te (FunMonoBind var inf ms locn) = zonkIdBndr te var `thenNF_Tc` \ new_var -> - mapNF_Tc (zonkMatch te ve) ms `thenNF_Tc` \ new_ms -> - returnNF_Tc (FunMonoBind new_var inf new_ms locn, [new_var]) + mapNF_Tc (zonkMatch te) ms `thenNF_Tc` \ new_ms -> + returnNF_Tc (FunMonoBind new_var inf new_ms locn, unitBag new_var) + + +zonkMonoBinds te (AbsBinds tyvars dicts exports val_bind) + = mapNF_Tc zonkTcTyVarToTyVar tyvars `thenNF_Tc` \ new_tyvars -> + let + new_te = extend_te te new_tyvars + in + mapNF_Tc (zonkIdBndr new_te) dicts `thenNF_Tc` \ new_dicts -> + + tcExtendGlobalValEnv new_dicts $ + fixNF_Tc (\ ~(_, _, val_bind_ids) -> + tcExtendGlobalValEnv (bagToList val_bind_ids) $ + zonkMonoBinds new_te val_bind `thenNF_Tc` \ (new_val_bind, val_bind_ids) -> + mapNF_Tc (zonkExport new_te) exports `thenNF_Tc` \ new_exports -> + returnNF_Tc (new_val_bind, new_exports, val_bind_ids) + ) `thenNF_Tc ` \ (new_val_bind, new_exports, _) -> + let + new_globals = listToBag [global | (_, global, local) <- new_exports] + in + returnNF_Tc (AbsBinds new_tyvars new_dicts new_exports new_val_bind, + new_globals) + where + zonkExport te (tyvars, global, local) + = mapNF_Tc zonkTcTyVarToTyVar tyvars `thenNF_Tc` \ new_tyvars -> + zonkIdBndr te global `thenNF_Tc` \ new_global -> + zonkIdOcc local `thenNF_Tc` \ new_local -> + returnNF_Tc (new_tyvars, new_global, new_local) \end{code} %************************************************************************ @@ -304,41 +304,37 @@ zonkMonoBinds te ve (FunMonoBind var inf ms locn) %************************************************************************ \begin{code} -zonkMatch :: TyVarEnv Type -> IdEnv Id +zonkMatch :: TyVarEnv Type -> TcMatch s -> NF_TcM s TypecheckedMatch -zonkMatch te ve (PatMatch pat match) - = zonkPat te ve pat `thenNF_Tc` \ (new_pat, ids) -> - let - new_ve = extend_ve ve ids - in - zonkMatch te new_ve match `thenNF_Tc` \ new_match -> +zonkMatch te (PatMatch pat match) + = zonkPat te pat `thenNF_Tc` \ (new_pat, ids) -> + tcExtendGlobalValEnv (bagToList ids) $ + zonkMatch te match `thenNF_Tc` \ new_match -> returnNF_Tc (PatMatch new_pat new_match) -zonkMatch te ve (GRHSMatch grhss_w_binds) - = zonkGRHSsAndBinds te ve grhss_w_binds `thenNF_Tc` \ new_grhss_w_binds -> +zonkMatch te (GRHSMatch grhss_w_binds) + = zonkGRHSsAndBinds te grhss_w_binds `thenNF_Tc` \ new_grhss_w_binds -> returnNF_Tc (GRHSMatch new_grhss_w_binds) -zonkMatch te ve (SimpleMatch expr) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> +zonkMatch te (SimpleMatch expr) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> returnNF_Tc (SimpleMatch new_expr) ------------------------------------------------------------------------- -zonkGRHSsAndBinds :: TyVarEnv Type -> IdEnv Id +zonkGRHSsAndBinds :: TyVarEnv Type -> TcGRHSsAndBinds s -> NF_TcM s TypecheckedGRHSsAndBinds -zonkGRHSsAndBinds te ve (GRHSsAndBindsOut grhss binds ty) - = zonkBinds te ve binds `thenNF_Tc` \ (new_binds, new_ve) -> +zonkGRHSsAndBinds te (GRHSsAndBindsOut grhss binds ty) + = zonkBinds te binds `thenNF_Tc` \ (new_binds, new_env) -> + tcSetEnv new_env $ let zonk_grhs (GRHS guard expr locn) - = zonkExpr te new_ve guard `thenNF_Tc` \ new_guard -> - zonkExpr te new_ve expr `thenNF_Tc` \ new_expr -> + = zonkStmts te guard `thenNF_Tc` \ (new_guard, new_env) -> + tcSetEnv new_env $ + zonkExpr te expr `thenNF_Tc` \ new_expr -> returnNF_Tc (GRHS new_guard new_expr locn) - - zonk_grhs (OtherwiseGRHS expr locn) - = zonkExpr te new_ve expr `thenNF_Tc` \ new_expr -> - returnNF_Tc (OtherwiseGRHS new_expr locn) in mapNF_Tc zonk_grhs grhss `thenNF_Tc` \ new_grhss -> zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> @@ -352,255 +348,221 @@ zonkGRHSsAndBinds te ve (GRHSsAndBindsOut grhss binds ty) %************************************************************************ \begin{code} -zonkExpr :: TyVarEnv Type -> IdEnv Id +zonkExpr :: TyVarEnv Type -> TcExpr s -> NF_TcM s TypecheckedHsExpr -zonkExpr te ve (HsVar name) - = returnNF_Tc (HsVar (zonkIdOcc ve name)) +zonkExpr te (HsVar id) + = zonkIdOcc id `thenNF_Tc` \ id' -> + returnNF_Tc (HsVar id') -zonkExpr te ve (HsLit _) = panic "zonkExpr te ve:HsLit" +zonkExpr te (HsLit _) = panic "zonkExpr te:HsLit" -zonkExpr te ve (HsLitOut lit ty) +zonkExpr te (HsLitOut lit ty) = zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> returnNF_Tc (HsLitOut lit new_ty) -zonkExpr te ve (HsLam match) - = zonkMatch te ve match `thenNF_Tc` \ new_match -> +zonkExpr te (HsLam match) + = zonkMatch te match `thenNF_Tc` \ new_match -> returnNF_Tc (HsLam new_match) -zonkExpr te ve (HsApp e1 e2) - = zonkExpr te ve e1 `thenNF_Tc` \ new_e1 -> - zonkExpr te ve e2 `thenNF_Tc` \ new_e2 -> +zonkExpr te (HsApp e1 e2) + = zonkExpr te e1 `thenNF_Tc` \ new_e1 -> + zonkExpr te e2 `thenNF_Tc` \ new_e2 -> returnNF_Tc (HsApp new_e1 new_e2) -zonkExpr te ve (OpApp e1 op e2) - = zonkExpr te ve e1 `thenNF_Tc` \ new_e1 -> - zonkExpr te ve op `thenNF_Tc` \ new_op -> - zonkExpr te ve e2 `thenNF_Tc` \ new_e2 -> - returnNF_Tc (OpApp new_e1 new_op new_e2) +zonkExpr te (OpApp e1 op fixity e2) + = zonkExpr te e1 `thenNF_Tc` \ new_e1 -> + zonkExpr te op `thenNF_Tc` \ new_op -> + zonkExpr te e2 `thenNF_Tc` \ new_e2 -> + returnNF_Tc (OpApp new_e1 new_op fixity new_e2) -zonkExpr te ve (NegApp _ _) = panic "zonkExpr te ve:NegApp" -zonkExpr te ve (HsPar _) = panic "zonkExpr te ve:HsPar" +zonkExpr te (NegApp _ _) = panic "zonkExpr te:NegApp" +zonkExpr te (HsPar _) = panic "zonkExpr te:HsPar" -zonkExpr te ve (SectionL expr op) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - zonkExpr te ve op `thenNF_Tc` \ new_op -> +zonkExpr te (SectionL expr op) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> + zonkExpr te op `thenNF_Tc` \ new_op -> returnNF_Tc (SectionL new_expr new_op) -zonkExpr te ve (SectionR op expr) - = zonkExpr te ve op `thenNF_Tc` \ new_op -> - zonkExpr te ve expr `thenNF_Tc` \ new_expr -> +zonkExpr te (SectionR op expr) + = zonkExpr te op `thenNF_Tc` \ new_op -> + zonkExpr te expr `thenNF_Tc` \ new_expr -> returnNF_Tc (SectionR new_op new_expr) -zonkExpr te ve (HsCase expr ms src_loc) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - mapNF_Tc (zonkMatch te ve) ms `thenNF_Tc` \ new_ms -> +zonkExpr te (HsCase expr ms src_loc) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> + mapNF_Tc (zonkMatch te) ms `thenNF_Tc` \ new_ms -> returnNF_Tc (HsCase new_expr new_ms src_loc) -zonkExpr te ve (HsIf e1 e2 e3 src_loc) - = zonkExpr te ve e1 `thenNF_Tc` \ new_e1 -> - zonkExpr te ve e2 `thenNF_Tc` \ new_e2 -> - zonkExpr te ve e3 `thenNF_Tc` \ new_e3 -> +zonkExpr te (HsIf e1 e2 e3 src_loc) + = zonkExpr te e1 `thenNF_Tc` \ new_e1 -> + zonkExpr te e2 `thenNF_Tc` \ new_e2 -> + zonkExpr te e3 `thenNF_Tc` \ new_e3 -> returnNF_Tc (HsIf new_e1 new_e2 new_e3 src_loc) -zonkExpr te ve (HsLet binds expr) - = zonkBinds te ve binds `thenNF_Tc` \ (new_binds, new_ve) -> - zonkExpr te new_ve expr `thenNF_Tc` \ new_expr -> +zonkExpr te (HsLet binds expr) + = zonkBinds te binds `thenNF_Tc` \ (new_binds, new_env) -> + tcSetEnv new_env $ + zonkExpr te expr `thenNF_Tc` \ new_expr -> returnNF_Tc (HsLet new_binds new_expr) -zonkExpr te ve (HsDo _ _) = panic "zonkExpr te ve:HsDo" - -zonkExpr te ve (HsDoOut stmts then_id zero_id src_loc) - = zonkStmts te ve stmts `thenNF_Tc` \ new_stmts -> - returnNF_Tc (HsDoOut new_stmts (zonkIdOcc ve then_id) (zonkIdOcc ve zero_id) src_loc) +zonkExpr te (HsDo _ _ _) = panic "zonkExpr te:HsDo" -zonkExpr te ve (ListComp expr quals) - = zonkQuals te ve quals `thenNF_Tc` \ (new_quals, new_ve) -> - zonkExpr te new_ve expr `thenNF_Tc` \ new_expr -> - returnNF_Tc (ListComp new_expr new_quals) +zonkExpr te (HsDoOut do_or_lc stmts return_id then_id zero_id ty src_loc) + = zonkStmts te stmts `thenNF_Tc` \ (new_stmts, _) -> + zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> + zonkIdOcc return_id `thenNF_Tc` \ new_return_id -> + zonkIdOcc then_id `thenNF_Tc` \ new_then_id -> + zonkIdOcc zero_id `thenNF_Tc` \ new_zero_id -> + returnNF_Tc (HsDoOut do_or_lc new_stmts new_return_id new_then_id new_zero_id + new_ty src_loc) -zonkExpr te ve (ExplicitList _) = panic "zonkExpr te ve:ExplicitList" +zonkExpr te (ExplicitList _) = panic "zonkExpr te:ExplicitList" -zonkExpr te ve (ExplicitListOut ty exprs) +zonkExpr te (ExplicitListOut ty exprs) = zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> - mapNF_Tc (zonkExpr te ve) exprs `thenNF_Tc` \ new_exprs -> + mapNF_Tc (zonkExpr te) exprs `thenNF_Tc` \ new_exprs -> returnNF_Tc (ExplicitListOut new_ty new_exprs) -zonkExpr te ve (ExplicitTuple exprs) - = mapNF_Tc (zonkExpr te ve) exprs `thenNF_Tc` \ new_exprs -> +zonkExpr te (ExplicitTuple exprs) + = mapNF_Tc (zonkExpr te) exprs `thenNF_Tc` \ new_exprs -> returnNF_Tc (ExplicitTuple new_exprs) -zonkExpr te ve (RecordCon con rbinds) - = zonkExpr te ve con `thenNF_Tc` \ new_con -> - zonkRbinds te ve rbinds `thenNF_Tc` \ new_rbinds -> - returnNF_Tc (RecordCon new_con new_rbinds) +zonkExpr te (HsCon con_id tys exprs) + = mapNF_Tc (zonkTcTypeToType te) tys `thenNF_Tc` \ new_tys -> + mapNF_Tc (zonkExpr te) exprs `thenNF_Tc` \ new_exprs -> + returnNF_Tc (HsCon con_id new_tys new_exprs) -zonkExpr te ve (RecordUpd _ _) = panic "zonkExpr te ve:RecordUpd" +zonkExpr te (RecordCon con_id con_expr rbinds) + = zonkIdOcc con_id `thenNF_Tc` \ new_con_id -> + zonkExpr te con_expr `thenNF_Tc` \ new_con_expr -> + zonkRbinds te rbinds `thenNF_Tc` \ new_rbinds -> + returnNF_Tc (RecordCon new_con_id new_con_expr new_rbinds) -zonkExpr te ve (RecordUpdOut expr dicts rbinds) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - zonkRbinds te ve rbinds `thenNF_Tc` \ new_rbinds -> - returnNF_Tc (RecordUpdOut new_expr new_dicts new_rbinds) - where - new_dicts = map (zonkIdOcc ve) dicts +zonkExpr te (RecordUpd _ _) = panic "zonkExpr te:RecordUpd" + +zonkExpr te (RecordUpdOut expr ty dicts rbinds) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> + zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> + mapNF_Tc zonkIdOcc dicts `thenNF_Tc` \ new_dicts -> + zonkRbinds te rbinds `thenNF_Tc` \ new_rbinds -> + returnNF_Tc (RecordUpdOut new_expr new_ty new_dicts new_rbinds) -zonkExpr te ve (ExprWithTySig _ _) = panic "zonkExpr te ve:ExprWithTySig" -zonkExpr te ve (ArithSeqIn _) = panic "zonkExpr te ve:ArithSeqIn" +zonkExpr te (ExprWithTySig _ _) = panic "zonkExpr te:ExprWithTySig" +zonkExpr te (ArithSeqIn _) = panic "zonkExpr te:ArithSeqIn" -zonkExpr te ve (ArithSeqOut expr info) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - zonkArithSeq te ve info `thenNF_Tc` \ new_info -> +zonkExpr te (ArithSeqOut expr info) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> + zonkArithSeq te info `thenNF_Tc` \ new_info -> returnNF_Tc (ArithSeqOut new_expr new_info) -zonkExpr te ve (CCall fun args may_gc is_casm result_ty) - = mapNF_Tc (zonkExpr te ve) args `thenNF_Tc` \ new_args -> +zonkExpr te (CCall fun args may_gc is_casm result_ty) + = mapNF_Tc (zonkExpr te) args `thenNF_Tc` \ new_args -> zonkTcTypeToType te result_ty `thenNF_Tc` \ new_result_ty -> returnNF_Tc (CCall fun new_args may_gc is_casm new_result_ty) -zonkExpr te ve (HsSCC label expr) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> +zonkExpr te (HsSCC label expr) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> returnNF_Tc (HsSCC label new_expr) -zonkExpr te ve (TyLam tyvars expr) +zonkExpr te (TyLam tyvars expr) = mapNF_Tc zonkTcTyVarToTyVar tyvars `thenNF_Tc` \ new_tyvars -> let new_te = extend_te te new_tyvars in - zonkExpr new_te ve expr `thenNF_Tc` \ new_expr -> + zonkExpr new_te expr `thenNF_Tc` \ new_expr -> returnNF_Tc (TyLam new_tyvars new_expr) -zonkExpr te ve (TyApp expr tys) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> +zonkExpr te (TyApp expr tys) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> mapNF_Tc (zonkTcTypeToType te) tys `thenNF_Tc` \ new_tys -> returnNF_Tc (TyApp new_expr new_tys) -zonkExpr te ve (DictLam dicts expr) +zonkExpr te (DictLam dicts expr) = mapNF_Tc (zonkIdBndr te) dicts `thenNF_Tc` \ new_dicts -> - let - new_ve = extend_ve ve new_dicts - in - zonkExpr te new_ve expr `thenNF_Tc` \ new_expr -> + tcExtendGlobalValEnv new_dicts $ + zonkExpr te expr `thenNF_Tc` \ new_expr -> returnNF_Tc (DictLam new_dicts new_expr) -zonkExpr te ve (DictApp expr dicts) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> +zonkExpr te (DictApp expr dicts) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> + mapNF_Tc zonkIdOcc dicts `thenNF_Tc` \ new_dicts -> returnNF_Tc (DictApp new_expr new_dicts) - where - new_dicts = map (zonkIdOcc ve) dicts - -zonkExpr te ve (ClassDictLam dicts methods expr) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - returnNF_Tc (ClassDictLam new_dicts new_methods new_expr) - where - new_dicts = map (zonkIdOcc ve) dicts - new_methods = map (zonkIdOcc ve) methods - -zonkExpr te ve (Dictionary dicts methods) - = returnNF_Tc (Dictionary new_dicts new_methods) - where - new_dicts = map (zonkIdOcc ve) dicts - new_methods = map (zonkIdOcc ve) methods - -zonkExpr te ve (SingleDict name) - = returnNF_Tc (SingleDict (zonkIdOcc ve name)) ------------------------------------------------------------------------- -zonkArithSeq :: TyVarEnv Type -> IdEnv Id +zonkArithSeq :: TyVarEnv Type -> TcArithSeqInfo s -> NF_TcM s TypecheckedArithSeqInfo -zonkArithSeq te ve (From e) - = zonkExpr te ve e `thenNF_Tc` \ new_e -> +zonkArithSeq te (From e) + = zonkExpr te e `thenNF_Tc` \ new_e -> returnNF_Tc (From new_e) -zonkArithSeq te ve (FromThen e1 e2) - = zonkExpr te ve e1 `thenNF_Tc` \ new_e1 -> - zonkExpr te ve e2 `thenNF_Tc` \ new_e2 -> +zonkArithSeq te (FromThen e1 e2) + = zonkExpr te e1 `thenNF_Tc` \ new_e1 -> + zonkExpr te e2 `thenNF_Tc` \ new_e2 -> returnNF_Tc (FromThen new_e1 new_e2) -zonkArithSeq te ve (FromTo e1 e2) - = zonkExpr te ve e1 `thenNF_Tc` \ new_e1 -> - zonkExpr te ve e2 `thenNF_Tc` \ new_e2 -> +zonkArithSeq te (FromTo e1 e2) + = zonkExpr te e1 `thenNF_Tc` \ new_e1 -> + zonkExpr te e2 `thenNF_Tc` \ new_e2 -> returnNF_Tc (FromTo new_e1 new_e2) -zonkArithSeq te ve (FromThenTo e1 e2 e3) - = zonkExpr te ve e1 `thenNF_Tc` \ new_e1 -> - zonkExpr te ve e2 `thenNF_Tc` \ new_e2 -> - zonkExpr te ve e3 `thenNF_Tc` \ new_e3 -> +zonkArithSeq te (FromThenTo e1 e2 e3) + = zonkExpr te e1 `thenNF_Tc` \ new_e1 -> + zonkExpr te e2 `thenNF_Tc` \ new_e2 -> + zonkExpr te e3 `thenNF_Tc` \ new_e3 -> returnNF_Tc (FromThenTo new_e1 new_e2 new_e3) ------------------------------------------------------------------------- -zonkQuals :: TyVarEnv Type -> IdEnv Id - -> [TcQual s] -> NF_TcM s ([TypecheckedQual], IdEnv Id) +zonkStmts :: TyVarEnv Type + -> [TcStmt s] -> NF_TcM s ([TypecheckedStmt], TcEnv s) -zonkQuals te ve [] - = returnNF_Tc ([], ve) +zonkStmts te [] = tcGetEnv `thenNF_Tc` \ env -> + returnNF_Tc ([], env) -zonkQuals te ve (GeneratorQual pat expr : quals) - = zonkPat te ve pat `thenNF_Tc` \ (new_pat, ids) -> - zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - let - new_ve = extend_ve ve ids - in - zonkQuals te new_ve quals `thenNF_Tc` \ (new_quals, final_ve) -> - returnNF_Tc (GeneratorQual new_pat new_expr : new_quals, final_ve) +zonkStmts te [ReturnStmt expr] + = zonkExpr te expr `thenNF_Tc` \ new_expr -> + tcGetEnv `thenNF_Tc` \ env -> + returnNF_Tc ([ReturnStmt new_expr], env) -zonkQuals te ve (FilterQual expr : quals) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - zonkQuals te ve quals `thenNF_Tc` \ (new_quals, final_ve) -> - returnNF_Tc (FilterQual new_expr : new_quals, final_ve) +zonkStmts te (ExprStmt expr locn : stmts) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> + zonkStmts te stmts `thenNF_Tc` \ (new_stmts, new_env) -> + returnNF_Tc (ExprStmt new_expr locn : new_stmts, new_env) -zonkQuals te ve (LetQual binds : quals) - = zonkBinds te ve binds `thenNF_Tc` \ (new_binds, new_ve) -> - zonkQuals te new_ve quals `thenNF_Tc` \ (new_quals, final_ve) -> - returnNF_Tc (LetQual new_binds : new_quals, final_ve) +zonkStmts te (GuardStmt expr locn : stmts) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> + zonkStmts te stmts `thenNF_Tc` \ (new_stmts, new_env) -> + returnNF_Tc (GuardStmt new_expr locn : new_stmts, new_env) -------------------------------------------------------------------------- -zonkStmts :: TyVarEnv Type -> IdEnv Id - -> [TcStmt s] -> NF_TcM s [TypecheckedStmt] - -zonkStmts te ve [] = returnNF_Tc [] - -zonkStmts te ve [ExprStmt expr locn] - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - returnNF_Tc [ExprStmt new_expr locn] - -zonkStmts te ve (ExprStmtOut expr locn a b : stmts) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - zonkTcTypeToType te a `thenNF_Tc` \ new_a -> - zonkTcTypeToType te b `thenNF_Tc` \ new_b -> - zonkStmts te ve stmts `thenNF_Tc` \ new_stmts -> - returnNF_Tc (ExprStmtOut new_expr locn new_a new_b : new_stmts) - -zonkStmts te ve (LetStmt binds : stmts) - = zonkBinds te ve binds `thenNF_Tc` \ (new_binds, new_ve) -> - zonkStmts te new_ve stmts `thenNF_Tc` \ new_stmts -> - returnNF_Tc (LetStmt new_binds : new_stmts) - -zonkStmts te ve (BindStmtOut pat expr locn a b : stmts) - = zonkPat te ve pat `thenNF_Tc` \ (new_pat, ids) -> - zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - zonkTcTypeToType te a `thenNF_Tc` \ new_a -> - zonkTcTypeToType te b `thenNF_Tc` \ new_b -> - let - new_ve = extend_ve ve ids - in - zonkStmts te new_ve stmts `thenNF_Tc` \ new_stmts -> - returnNF_Tc (BindStmtOut new_pat new_expr locn new_a new_b : new_stmts) +zonkStmts te (LetStmt binds : stmts) + = zonkBinds te binds `thenNF_Tc` \ (new_binds, new_env) -> + tcSetEnv new_env $ + zonkStmts te stmts `thenNF_Tc` \ (new_stmts, new_env2) -> + returnNF_Tc (LetStmt new_binds : new_stmts, new_env2) + +zonkStmts te (BindStmt pat expr locn : stmts) + = zonkPat te pat `thenNF_Tc` \ (new_pat, ids) -> + zonkExpr te expr `thenNF_Tc` \ new_expr -> + tcExtendGlobalValEnv (bagToList ids) $ + zonkStmts te stmts `thenNF_Tc` \ (new_stmts, new_env) -> + returnNF_Tc (BindStmt new_pat new_expr locn : new_stmts, new_env) ------------------------------------------------------------------------- -zonkRbinds :: TyVarEnv Type -> IdEnv Id +zonkRbinds :: TyVarEnv Type -> TcRecordBinds s -> NF_TcM s TypecheckedRecordBinds -zonkRbinds te ve rbinds +zonkRbinds te rbinds = mapNF_Tc zonk_rbind rbinds where zonk_rbind (field, expr, pun) - = zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - returnNF_Tc (zonkIdOcc ve field, new_expr, pun) + = zonkExpr te expr `thenNF_Tc` \ new_expr -> + zonkIdOcc field `thenNF_Tc` \ new_field -> + returnNF_Tc (new_field, new_expr, pun) \end{code} %************************************************************************ @@ -610,77 +572,84 @@ zonkRbinds te ve rbinds %************************************************************************ \begin{code} -zonkPat :: TyVarEnv Type -> IdEnv Id - -> TcPat s -> NF_TcM s (TypecheckedPat, [Id]) +zonkPat :: TyVarEnv Type + -> TcPat s -> NF_TcM s (TypecheckedPat, Bag Id) -zonkPat te ve (WildPat ty) +zonkPat te (WildPat ty) = zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> - returnNF_Tc (WildPat new_ty, []) + returnNF_Tc (WildPat new_ty, emptyBag) -zonkPat te ve (VarPat v) +zonkPat te (VarPat v) = zonkIdBndr te v `thenNF_Tc` \ new_v -> - returnNF_Tc (VarPat new_v, [new_v]) + returnNF_Tc (VarPat new_v, unitBag new_v) -zonkPat te ve (LazyPat pat) - = zonkPat te ve pat `thenNF_Tc` \ (new_pat, ids) -> +zonkPat te (LazyPat pat) + = zonkPat te pat `thenNF_Tc` \ (new_pat, ids) -> returnNF_Tc (LazyPat new_pat, ids) -zonkPat te ve (AsPat n pat) +zonkPat te (AsPat n pat) = zonkIdBndr te n `thenNF_Tc` \ new_n -> - zonkPat te ve pat `thenNF_Tc` \ (new_pat, ids) -> - returnNF_Tc (AsPat new_n new_pat, new_n:ids) + zonkPat te pat `thenNF_Tc` \ (new_pat, ids) -> + returnNF_Tc (AsPat new_n new_pat, new_n `consBag` ids) -zonkPat te ve (ConPat n ty pats) +zonkPat te (ConPat n ty pats) = zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> - zonkPats te ve pats `thenNF_Tc` \ (new_pats, ids) -> + zonkPats te pats `thenNF_Tc` \ (new_pats, ids) -> returnNF_Tc (ConPat n new_ty new_pats, ids) -zonkPat te ve (ConOpPat pat1 op pat2 ty) - = zonkPat te ve pat1 `thenNF_Tc` \ (new_pat1, ids1) -> - zonkPat te ve pat2 `thenNF_Tc` \ (new_pat2, ids2) -> +zonkPat te (ConOpPat pat1 op pat2 ty) + = zonkPat te pat1 `thenNF_Tc` \ (new_pat1, ids1) -> + zonkPat te pat2 `thenNF_Tc` \ (new_pat2, ids2) -> zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> - returnNF_Tc (ConOpPat new_pat1 op new_pat2 new_ty, ids1 ++ ids2) + returnNF_Tc (ConOpPat new_pat1 op new_pat2 new_ty, ids1 `unionBags` ids2) -zonkPat te ve (ListPat ty pats) +zonkPat te (ListPat ty pats) = zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> - zonkPats te ve pats `thenNF_Tc` \ (new_pats, ids) -> + zonkPats te pats `thenNF_Tc` \ (new_pats, ids) -> returnNF_Tc (ListPat new_ty new_pats, ids) -zonkPat te ve (TuplePat pats) - = zonkPats te ve pats `thenNF_Tc` \ (new_pats, ids) -> +zonkPat te (TuplePat pats) + = zonkPats te pats `thenNF_Tc` \ (new_pats, ids) -> returnNF_Tc (TuplePat new_pats, ids) -zonkPat te ve (RecPat n ty rpats) +zonkPat te (RecPat n ty rpats) = zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> mapAndUnzipNF_Tc zonk_rpat rpats `thenNF_Tc` \ (new_rpats, ids_s) -> - returnNF_Tc (RecPat n new_ty new_rpats, concat ids_s) + returnNF_Tc (RecPat n new_ty new_rpats, unionManyBags ids_s) where zonk_rpat (f, pat, pun) - = zonkPat te ve pat `thenNF_Tc` \ (new_pat, ids) -> + = zonkPat te pat `thenNF_Tc` \ (new_pat, ids) -> returnNF_Tc ((f, new_pat, pun), ids) -zonkPat te ve (LitPat lit ty) +zonkPat te (LitPat lit ty) = zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> - returnNF_Tc (LitPat lit new_ty, []) + returnNF_Tc (LitPat lit new_ty, emptyBag) -zonkPat te ve (NPat lit ty expr) +zonkPat te (NPat lit ty expr) = zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> - zonkExpr te ve expr `thenNF_Tc` \ new_expr -> - returnNF_Tc (NPat lit new_ty new_expr, []) + zonkExpr te expr `thenNF_Tc` \ new_expr -> + returnNF_Tc (NPat lit new_ty new_expr, emptyBag) -zonkPat te ve (DictPat ds ms) +zonkPat te (NPlusKPat n k ty e1 e2) + = zonkIdBndr te n `thenNF_Tc` \ new_n -> + zonkTcTypeToType te ty `thenNF_Tc` \ new_ty -> + zonkExpr te e1 `thenNF_Tc` \ new_e1 -> + zonkExpr te e2 `thenNF_Tc` \ new_e2 -> + returnNF_Tc (NPlusKPat new_n k new_ty new_e1 new_e2, unitBag new_n) + +zonkPat te (DictPat ds ms) = mapNF_Tc (zonkIdBndr te) ds `thenNF_Tc` \ new_ds -> mapNF_Tc (zonkIdBndr te) ms `thenNF_Tc` \ new_ms -> - returnNF_Tc (DictPat new_ds new_ms, new_ds ++ new_ms) - + returnNF_Tc (DictPat new_ds new_ms, + listToBag new_ds `unionBags` listToBag new_ms) -zonkPats te ve [] - = returnNF_Tc ([], []) -zonkPats te ve (pat:pats) - = zonkPat te ve pat `thenNF_Tc` \ (pat', ids1) -> - zonkPats te ve pats `thenNF_Tc` \ (pats', ids2) -> - returnNF_Tc (pat':pats', ids1 ++ ids2) +zonkPats te [] + = returnNF_Tc ([], emptyBag) +zonkPats te (pat:pats) + = zonkPat te pat `thenNF_Tc` \ (pat', ids1) -> + zonkPats te pats `thenNF_Tc` \ (pats', ids2) -> + returnNF_Tc (pat':pats', ids1 `unionBags` ids2) \end{code}