diff options
| author | Bartosz Nitka <niteria@gmail.com> | 2016-01-26 11:59:37 -0800 |
|---|---|---|
| committer | Bartosz Nitka <niteria@gmail.com> | 2016-01-27 07:17:19 -0800 |
| commit | 5dcae88bd0df440abe78c3d793d21aca6236fc25 (patch) | |
| tree | 4170ca2e8a500c03c1923071dcd5aa052c533cdd /compiler/iface/BuildTyCl.hs | |
| parent | 00cbbab3362578df44851442408a8b91a2a769fa (diff) | |
| download | haskell-5dcae88bd0df440abe78c3d793d21aca6236fc25.tar.gz | |
Rename "open" subst functions
This is the renaming that @simonpj requested:
```
· zipOpenTCvSubst -> zipTvSubst (It only deals with tyvars)
· zipOpenTCvSubstCoVars -> zipCvSubst (it only deals with
covars)
· zipOpenTCvSubstBinders -> zipTyBinderSubst (it only deals
with TyBinders, not covars)
```
plus the `mk` variant.
Test Plan: ./validate
Reviewers: simonpj, goldfire, austin, bgamari
Subscribers: thomie, simonpj
Differential Revision: https://phabricator.haskell.org/D1853
GHC Trac Issues: #11371
Diffstat (limited to 'compiler/iface/BuildTyCl.hs')
| -rw-r--r-- | compiler/iface/BuildTyCl.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/iface/BuildTyCl.hs b/compiler/iface/BuildTyCl.hs index 1b4017abdc..bde9019ce1 100644 --- a/compiler/iface/BuildTyCl.hs +++ b/compiler/iface/BuildTyCl.hs @@ -157,7 +157,7 @@ mkDataConStupidTheta tycon arg_tys univ_tvs | null stupid_theta = [] -- The common case | otherwise = filter in_arg_tys stupid_theta where - tc_subst = zipOpenTCvSubst (tyConTyVars tycon) (mkTyVarTys univ_tvs) + tc_subst = zipTvSubst (tyConTyVars tycon) (mkTyVarTys univ_tvs) stupid_theta = substTheta tc_subst (tyConStupidTheta tycon) -- Start by instantiating the master copy of the -- stupid theta, taken from the TyCon @@ -205,8 +205,8 @@ buildPatSyn src_name declared_infix matcher@(matcher_id,_) builder (ex_tvs1, prov_theta1, cont_tau) = tcSplitSigmaTy cont_sigma (arg_tys1, _) = tcSplitFunTys cont_tau twiddle = char '~' - subst = zipOpenTCvSubst (univ_tvs1 ++ ex_tvs1) - (mkTyVarTys (univ_tvs ++ ex_tvs)) + subst = zipTvSubst (univ_tvs1 ++ ex_tvs1) + (mkTyVarTys (univ_tvs ++ ex_tvs)) ------------------------------------------------------ type TcMethInfo = (Name, Type, Maybe (DefMethSpec Type)) |