Simon Peyton Jones pushed to branch wip/substitution-via-mapper at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Core/Coercion.hs
    ... ... @@ -156,7 +156,6 @@ import GHC.Types.SrcLoc
    156 156
     
    
    157 157
     import GHC.Types.Unique.FM
    
    158 158
     
    
    159
    -import GHC.Builtin.KnownKeys
    
    160 159
     import GHC.Builtin.WiredIn.Prim
    
    161 160
     
    
    162 161
     import GHC.Data.FastString
    

  • compiler/GHC/Core/Type.hs
    ... ... @@ -226,20 +226,15 @@ import GHC.Types.Basic
    226 226
     -- Many things are reexported, but not the representation!
    
    227 227
     
    
    228 228
     import GHC.Core.TyCo.Rep
    
    229
    +import GHC.Core.TyCo.Make
    
    229 230
     import GHC.Core.TyCo.Subst
    
    230 231
     import GHC.Core.TyCo.FVs
    
    231 232
     import GHC.Core.TyCon
    
    232 233
     import GHC.Core.Coercion.Axiom
    
    233 234
     
    
    234 235
     import {-# SOURCE #-} GHC.Core.Coercion
    
    235
    -   ( mkNomReflCo, mkGReflCo, mkReflCo
    
    236
    -   , mkTyConAppCo, mkAppCo
    
    237
    -   , mkForAllCo, mkFunCo2, mkAxiomCo, mkUnivCo
    
    238
    -   , mkSymCo, mkTransCo, mkSelCo, mkLRCo, mkInstCo
    
    239
    -   , mkKindCo, mkSubCo, mkFunCo, funRole
    
    240
    -   , decomposePiCos
    
    236
    +   ( isReflexiveCo
    
    241 237
        , coercionRKind, coercionType
    
    242
    -   , isReflexiveCo, seqCo
    
    243 238
        , topNormaliseNewType_maybe
    
    244 239
        )
    
    245 240
     
    
    ... ... @@ -253,9 +248,8 @@ import GHC.Builtin.WiredIn.Prim
    253 248
     import {-# SOURCE #-} GHC.Builtin.WiredIn.Types
    
    254 249
        ( charTy, naturalTy
    
    255 250
        , typeSymbolKind, liftedTypeKind, unliftedTypeKind
    
    256
    -   , constraintKind, zeroBitTypeKind
    
    257 251
        , manyDataConTy, oneDataConTy
    
    258
    -   , liftedRepTy, unliftedRepTy, zeroBitRepTy )
    
    252
    +   , liftedRepTy )
    
    259 253
     
    
    260 254
     import GHC.Types.Name( Name, hasKnownKey )
    
    261 255
     import GHC.Builtin.KnownKeys