Wolfgang Jeltsch pushed to branch wip/jeltsch/known-key-removals/type-representations at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • compiler/GHC/Builtin/Names.hs
    ... ... @@ -222,12 +222,11 @@ basicKnownKeyNames
    222 222
     
    
    223 223
             -- Type representation types
    
    224 224
             trModuleTyConName, trModuleDataConName,
    
    225
    -        trNameTyConName, trNameSDataConName, trNameDDataConName,
    
    225
    +        trNameSDataConName,
    
    226 226
             trTyConTyConName, trTyConDataConName,
    
    227 227
     
    
    228 228
             -- Typeable
    
    229 229
             typeableClassName,
    
    230
    -        typeRepTyConName,
    
    231 230
             someTypeRepTyConName,
    
    232 231
             someTypeRepDataConName,
    
    233 232
             kindRepTyConName,
    
    ... ... @@ -237,13 +236,10 @@ basicKnownKeyNames
    237 236
             kindRepFunDataConName,
    
    238 237
             kindRepTYPEDataConName,
    
    239 238
             kindRepTypeLitSDataConName,
    
    240
    -        kindRepTypeLitDDataConName,
    
    241
    -        typeLitSortTyConName,
    
    242 239
             typeLitSymbolDataConName,
    
    243 240
             typeLitNatDataConName,
    
    244 241
             typeLitCharDataConName,
    
    245 242
             typeRepIdName,
    
    246
    -        mkTrTypeName,
    
    247 243
             mkTrConName,
    
    248 244
             mkTrAppCheckedName,
    
    249 245
             mkTrFunName,
    
    ... ... @@ -1307,17 +1303,13 @@ ixClassName = clsQual gHC_INTERNAL_IX (fsLit "Ix") ixClassKey
    1307 1303
     -- Typeable representation types
    
    1308 1304
     trModuleTyConName
    
    1309 1305
       , trModuleDataConName
    
    1310
    -  , trNameTyConName
    
    1311 1306
       , trNameSDataConName
    
    1312
    -  , trNameDDataConName
    
    1313 1307
       , trTyConTyConName
    
    1314 1308
       , trTyConDataConName
    
    1315 1309
       :: Name
    
    1316 1310
     trModuleTyConName     = tcQual gHC_TYPES          (fsLit "Module")         trModuleTyConKey
    
    1317 1311
     trModuleDataConName   = dcQual gHC_TYPES          (fsLit "Module")         trModuleDataConKey
    
    1318
    -trNameTyConName       = tcQual gHC_TYPES          (fsLit "TrName")         trNameTyConKey
    
    1319 1312
     trNameSDataConName    = dcQual gHC_TYPES          (fsLit "TrNameS")        trNameSDataConKey
    
    1320
    -trNameDDataConName    = dcQual gHC_TYPES          (fsLit "TrNameD")        trNameDDataConKey
    
    1321 1313
     trTyConTyConName      = tcQual gHC_TYPES          (fsLit "TyCon")          trTyConTyConKey
    
    1322 1314
     trTyConDataConName    = dcQual gHC_TYPES          (fsLit "TyCon")          trTyConDataConKey
    
    1323 1315
     
    
    ... ... @@ -1328,7 +1320,6 @@ kindRepTyConName
    1328 1320
       , kindRepFunDataConName
    
    1329 1321
       , kindRepTYPEDataConName
    
    1330 1322
       , kindRepTypeLitSDataConName
    
    1331
    -  , kindRepTypeLitDDataConName
    
    1332 1323
       :: Name
    
    1333 1324
     kindRepTyConName      = tcQual gHC_TYPES          (fsLit "KindRep")        kindRepTyConKey
    
    1334 1325
     kindRepTyConAppDataConName = dcQual gHC_TYPES     (fsLit "KindRepTyConApp") kindRepTyConAppDataConKey
    
    ... ... @@ -1337,24 +1328,19 @@ kindRepAppDataConName = dcQual gHC_TYPES (fsLit "KindRepApp") kindR
    1337 1328
     kindRepFunDataConName = dcQual gHC_TYPES          (fsLit "KindRepFun")     kindRepFunDataConKey
    
    1338 1329
     kindRepTYPEDataConName = dcQual gHC_TYPES         (fsLit "KindRepTYPE")    kindRepTYPEDataConKey
    
    1339 1330
     kindRepTypeLitSDataConName = dcQual gHC_TYPES     (fsLit "KindRepTypeLitS") kindRepTypeLitSDataConKey
    
    1340
    -kindRepTypeLitDDataConName = dcQual gHC_TYPES     (fsLit "KindRepTypeLitD") kindRepTypeLitDDataConKey
    
    1341 1331
     
    
    1342
    -typeLitSortTyConName
    
    1343
    -  , typeLitSymbolDataConName
    
    1332
    +typeLitSymbolDataConName
    
    1344 1333
       , typeLitNatDataConName
    
    1345 1334
       , typeLitCharDataConName
    
    1346 1335
       :: Name
    
    1347
    -typeLitSortTyConName     = tcQual gHC_TYPES       (fsLit "TypeLitSort")    typeLitSortTyConKey
    
    1348 1336
     typeLitSymbolDataConName = dcQual gHC_TYPES       (fsLit "TypeLitSymbol")  typeLitSymbolDataConKey
    
    1349 1337
     typeLitNatDataConName    = dcQual gHC_TYPES       (fsLit "TypeLitNat")     typeLitNatDataConKey
    
    1350 1338
     typeLitCharDataConName   = dcQual gHC_TYPES       (fsLit "TypeLitChar")    typeLitCharDataConKey
    
    1351 1339
     
    
    1352 1340
     -- Class Typeable, and functions for constructing `Typeable` dictionaries
    
    1353 1341
     typeableClassName
    
    1354
    -  , typeRepTyConName
    
    1355 1342
       , someTypeRepTyConName
    
    1356 1343
       , someTypeRepDataConName
    
    1357
    -  , mkTrTypeName
    
    1358 1344
       , mkTrConName
    
    1359 1345
       , mkTrAppCheckedName
    
    1360 1346
       , mkTrFunName
    
    ... ... @@ -1365,11 +1351,9 @@ typeableClassName
    1365 1351
       , trGhcPrimModuleName
    
    1366 1352
       :: Name
    
    1367 1353
     typeableClassName     = clsQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "Typeable")       typeableClassKey
    
    1368
    -typeRepTyConName      = tcQual  gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "TypeRep")        typeRepTyConKey
    
    1369 1354
     someTypeRepTyConName   = tcQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "SomeTypeRep")    someTypeRepTyConKey
    
    1370 1355
     someTypeRepDataConName = dcQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "SomeTypeRep")    someTypeRepDataConKey
    
    1371 1356
     typeRepIdName         = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "typeRep#")       typeRepIdKey
    
    1372
    -mkTrTypeName          = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrType")       mkTrTypeKey
    
    1373 1357
     mkTrConName           = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrCon")        mkTrConKey
    
    1374 1358
     mkTrAppCheckedName    = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrAppChecked") mkTrAppCheckedKey
    
    1375 1359
     mkTrFunName           = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrFun")        mkTrFunKey
    
    ... ... @@ -1940,13 +1924,11 @@ pluginTyConKey, frontendPluginTyConKey :: Unique
    1940 1924
     pluginTyConKey                          = mkPreludeTyConUnique 102
    
    1941 1925
     frontendPluginTyConKey                  = mkPreludeTyConUnique 103
    
    1942 1926
     
    
    1943
    -trTyConTyConKey, trModuleTyConKey, trNameTyConKey,
    
    1944
    -  kindRepTyConKey, typeLitSortTyConKey :: Unique
    
    1927
    +trTyConTyConKey, trModuleTyConKey,
    
    1928
    +  kindRepTyConKey :: Unique
    
    1945 1929
     trTyConTyConKey                         = mkPreludeTyConUnique 104
    
    1946 1930
     trModuleTyConKey                        = mkPreludeTyConUnique 105
    
    1947
    -trNameTyConKey                          = mkPreludeTyConUnique 106
    
    1948 1931
     kindRepTyConKey                         = mkPreludeTyConUnique 107
    
    1949
    -typeLitSortTyConKey                     = mkPreludeTyConUnique 108
    
    1950 1932
     
    
    1951 1933
     -- Generics (Unique keys)
    
    1952 1934
     v1TyConKey, u1TyConKey, par1TyConKey, rec1TyConKey,
    
    ... ... @@ -2026,8 +2008,7 @@ callStackTyConKey :: Unique
    2026 2008
     callStackTyConKey = mkPreludeTyConUnique 191
    
    2027 2009
     
    
    2028 2010
     -- Typeables
    
    2029
    -typeRepTyConKey, someTypeRepTyConKey, someTypeRepDataConKey :: Unique
    
    2030
    -typeRepTyConKey       = mkPreludeTyConUnique 192
    
    2011
    +someTypeRepTyConKey, someTypeRepDataConKey :: Unique
    
    2031 2012
     someTypeRepTyConKey   = mkPreludeTyConUnique 193
    
    2032 2013
     someTypeRepDataConKey = mkPreludeTyConUnique 194
    
    2033 2014
     
    
    ... ... @@ -2166,12 +2147,11 @@ srcLocDataConKey :: Unique
    2166 2147
     srcLocDataConKey                        = mkPreludeDataConUnique 37
    
    2167 2148
     
    
    2168 2149
     trTyConDataConKey, trModuleDataConKey,
    
    2169
    -  trNameSDataConKey, trNameDDataConKey,
    
    2150
    +  trNameSDataConKey,
    
    2170 2151
       trGhcPrimModuleKey :: Unique
    
    2171 2152
     trTyConDataConKey                       = mkPreludeDataConUnique 41
    
    2172 2153
     trModuleDataConKey                      = mkPreludeDataConUnique 43
    
    2173 2154
     trNameSDataConKey                       = mkPreludeDataConUnique 45
    
    2174
    -trNameDDataConKey                       = mkPreludeDataConUnique 46
    
    2175 2155
     trGhcPrimModuleKey                      = mkPreludeDataConUnique 47
    
    2176 2156
     
    
    2177 2157
     typeErrorTextDataConKey,
    
    ... ... @@ -2246,7 +2226,7 @@ vecElemDataConKeys = map mkPreludeDataConUnique [96..105]
    2246 2226
     -- Typeable things
    
    2247 2227
     kindRepTyConAppDataConKey, kindRepVarDataConKey, kindRepAppDataConKey,
    
    2248 2228
         kindRepFunDataConKey, kindRepTYPEDataConKey,
    
    2249
    -    kindRepTypeLitSDataConKey, kindRepTypeLitDDataConKey
    
    2229
    +    kindRepTypeLitSDataConKey
    
    2250 2230
         :: Unique
    
    2251 2231
     kindRepTyConAppDataConKey = mkPreludeDataConUnique 106
    
    2252 2232
     kindRepVarDataConKey      = mkPreludeDataConUnique 107
    
    ... ... @@ -2254,7 +2234,6 @@ kindRepAppDataConKey = mkPreludeDataConUnique 108
    2254 2234
     kindRepFunDataConKey      = mkPreludeDataConUnique 109
    
    2255 2235
     kindRepTYPEDataConKey     = mkPreludeDataConUnique 110
    
    2256 2236
     kindRepTypeLitSDataConKey = mkPreludeDataConUnique 111
    
    2257
    -kindRepTypeLitDDataConKey = mkPreludeDataConUnique 112
    
    2258 2237
     
    
    2259 2238
     typeLitSymbolDataConKey, typeLitNatDataConKey, typeLitCharDataConKey :: Unique
    
    2260 2239
     typeLitSymbolDataConKey   = mkPreludeDataConUnique 113
    
    ... ... @@ -2497,7 +2476,6 @@ proxyHashKey = mkPreludeMiscIdUnique 502
    2497 2476
     
    
    2498 2477
     -- Used to make `Typeable` dictionaries
    
    2499 2478
     mkTyConKey
    
    2500
    -  , mkTrTypeKey
    
    2501 2479
       , mkTrConKey
    
    2502 2480
       , mkTrAppCheckedKey
    
    2503 2481
       , mkTrFunKey
    
    ... ... @@ -2507,7 +2485,6 @@ mkTyConKey
    2507 2485
       , typeRepIdKey
    
    2508 2486
       :: Unique
    
    2509 2487
     mkTyConKey            = mkPreludeMiscIdUnique 503
    
    2510
    -mkTrTypeKey           = mkPreludeMiscIdUnique 504
    
    2511 2488
     mkTrConKey            = mkPreludeMiscIdUnique 505
    
    2512 2489
     mkTrAppCheckedKey     = mkPreludeMiscIdUnique 506
    
    2513 2490
     typeNatTypeRepKey     = mkPreludeMiscIdUnique 507