diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2016-02-18 11:25:38 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2016-02-18 11:35:06 +0000 |
| commit | b5292557dcf2e3844b4837172230575d40a8917e (patch) | |
| tree | 82533d296b35b1553898a1380a43a0ba91efb77a /compiler/main | |
| parent | 01449eb552daa082e46ceaaf8481708ee73dc2ad (diff) | |
| download | haskell-b5292557dcf2e3844b4837172230575d40a8917e.tar.gz | |
(Another) minor refactoring of substitutions
No change in functionality here, but greater clarity:
* In FamInstEnv.FlattenEnv, kill off the fi_in_scope field
We are already maintaining an in-scope set in the fe_subst field,
so it's silly do to it twice.
(This isn't strictly connected to the rest of this patch, but
the nomenclature changes below affect the same code, so I put
them together.)
* TyCoRep.extendTCVSubst used to take a TyVar or a CoVar and work
out what to do, but in fact we almost always know which of the
two we are doing. So:
- define extendTvSubst, extendCvSubst
- and use them
* Similar renamings in TyCoRep:
- extendTCvSubstList --> extendTvSubstList
- extendTCvSubstBinder --> extendTvSubstBinder
- extendTCvSubstAndInScope --> extendTvSubstAndInScope
* Add Type.extendTvSubstWithClone, extendCvSubstWithClone
* Similar nomenclature changes in Subst, SimplEnv, Specialise
* Kill off TyCoRep.substTelescope (never used)
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/GhcPlugins.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/main/GhcPlugins.hs b/compiler/main/GhcPlugins.hs index 2aef9b3510..2af2da8e7a 100644 --- a/compiler/main/GhcPlugins.hs +++ b/compiler/main/GhcPlugins.hs @@ -54,7 +54,7 @@ import Packages -- Important GHC types import Module import Type hiding {- conflict with CoreSubst -} - ( substTy, extendTCvSubst, extendTCvSubstList, isInScope ) + ( substTy, extendTvSubst, extendTvSubstList, isInScope ) import Coercion hiding {- conflict with CoreSubst -} ( substCo ) import TyCon |