Marge Bot pushed to branch master 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,
    
    ... ... @@ -1292,17 +1288,13 @@ ixClassName = clsQual gHC_INTERNAL_IX (fsLit "Ix") ixClassKey
    1292 1288
     -- Typeable representation types
    
    1293 1289
     trModuleTyConName
    
    1294 1290
       , trModuleDataConName
    
    1295
    -  , trNameTyConName
    
    1296 1291
       , trNameSDataConName
    
    1297
    -  , trNameDDataConName
    
    1298 1292
       , trTyConTyConName
    
    1299 1293
       , trTyConDataConName
    
    1300 1294
       :: Name
    
    1301 1295
     trModuleTyConName     = tcQual gHC_TYPES          (fsLit "Module")         trModuleTyConKey
    
    1302 1296
     trModuleDataConName   = dcQual gHC_TYPES          (fsLit "Module")         trModuleDataConKey
    
    1303
    -trNameTyConName       = tcQual gHC_TYPES          (fsLit "TrName")         trNameTyConKey
    
    1304 1297
     trNameSDataConName    = dcQual gHC_TYPES          (fsLit "TrNameS")        trNameSDataConKey
    
    1305
    -trNameDDataConName    = dcQual gHC_TYPES          (fsLit "TrNameD")        trNameDDataConKey
    
    1306 1298
     trTyConTyConName      = tcQual gHC_TYPES          (fsLit "TyCon")          trTyConTyConKey
    
    1307 1299
     trTyConDataConName    = dcQual gHC_TYPES          (fsLit "TyCon")          trTyConDataConKey
    
    1308 1300
     
    
    ... ... @@ -1313,7 +1305,6 @@ kindRepTyConName
    1313 1305
       , kindRepFunDataConName
    
    1314 1306
       , kindRepTYPEDataConName
    
    1315 1307
       , kindRepTypeLitSDataConName
    
    1316
    -  , kindRepTypeLitDDataConName
    
    1317 1308
       :: Name
    
    1318 1309
     kindRepTyConName      = tcQual gHC_TYPES          (fsLit "KindRep")        kindRepTyConKey
    
    1319 1310
     kindRepTyConAppDataConName = dcQual gHC_TYPES     (fsLit "KindRepTyConApp") kindRepTyConAppDataConKey
    
    ... ... @@ -1322,24 +1313,19 @@ kindRepAppDataConName = dcQual gHC_TYPES (fsLit "KindRepApp") kindR
    1322 1313
     kindRepFunDataConName = dcQual gHC_TYPES          (fsLit "KindRepFun")     kindRepFunDataConKey
    
    1323 1314
     kindRepTYPEDataConName = dcQual gHC_TYPES         (fsLit "KindRepTYPE")    kindRepTYPEDataConKey
    
    1324 1315
     kindRepTypeLitSDataConName = dcQual gHC_TYPES     (fsLit "KindRepTypeLitS") kindRepTypeLitSDataConKey
    
    1325
    -kindRepTypeLitDDataConName = dcQual gHC_TYPES     (fsLit "KindRepTypeLitD") kindRepTypeLitDDataConKey
    
    1326 1316
     
    
    1327
    -typeLitSortTyConName
    
    1328
    -  , typeLitSymbolDataConName
    
    1317
    +typeLitSymbolDataConName
    
    1329 1318
       , typeLitNatDataConName
    
    1330 1319
       , typeLitCharDataConName
    
    1331 1320
       :: Name
    
    1332
    -typeLitSortTyConName     = tcQual gHC_TYPES       (fsLit "TypeLitSort")    typeLitSortTyConKey
    
    1333 1321
     typeLitSymbolDataConName = dcQual gHC_TYPES       (fsLit "TypeLitSymbol")  typeLitSymbolDataConKey
    
    1334 1322
     typeLitNatDataConName    = dcQual gHC_TYPES       (fsLit "TypeLitNat")     typeLitNatDataConKey
    
    1335 1323
     typeLitCharDataConName   = dcQual gHC_TYPES       (fsLit "TypeLitChar")    typeLitCharDataConKey
    
    1336 1324
     
    
    1337 1325
     -- Class Typeable, and functions for constructing `Typeable` dictionaries
    
    1338 1326
     typeableClassName
    
    1339
    -  , typeRepTyConName
    
    1340 1327
       , someTypeRepTyConName
    
    1341 1328
       , someTypeRepDataConName
    
    1342
    -  , mkTrTypeName
    
    1343 1329
       , mkTrConName
    
    1344 1330
       , mkTrAppCheckedName
    
    1345 1331
       , mkTrFunName
    
    ... ... @@ -1350,11 +1336,9 @@ typeableClassName
    1350 1336
       , trGhcPrimModuleName
    
    1351 1337
       :: Name
    
    1352 1338
     typeableClassName     = clsQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "Typeable")       typeableClassKey
    
    1353
    -typeRepTyConName      = tcQual  gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "TypeRep")        typeRepTyConKey
    
    1354 1339
     someTypeRepTyConName   = tcQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "SomeTypeRep")    someTypeRepTyConKey
    
    1355 1340
     someTypeRepDataConName = dcQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "SomeTypeRep")    someTypeRepDataConKey
    
    1356 1341
     typeRepIdName         = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "typeRep#")       typeRepIdKey
    
    1357
    -mkTrTypeName          = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrType")       mkTrTypeKey
    
    1358 1342
     mkTrConName           = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrCon")        mkTrConKey
    
    1359 1343
     mkTrAppCheckedName    = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrAppChecked") mkTrAppCheckedKey
    
    1360 1344
     mkTrFunName           = varQual gHC_INTERNAL_TYPEABLE_INTERNAL (fsLit "mkTrFun")        mkTrFunKey
    
    ... ... @@ -1915,13 +1899,11 @@ pluginTyConKey, frontendPluginTyConKey :: Unique
    1915 1899
     pluginTyConKey                          = mkPreludeTyConUnique 102
    
    1916 1900
     frontendPluginTyConKey                  = mkPreludeTyConUnique 103
    
    1917 1901
     
    
    1918
    -trTyConTyConKey, trModuleTyConKey, trNameTyConKey,
    
    1919
    -  kindRepTyConKey, typeLitSortTyConKey :: Unique
    
    1902
    +trTyConTyConKey, trModuleTyConKey,
    
    1903
    +  kindRepTyConKey :: Unique
    
    1920 1904
     trTyConTyConKey                         = mkPreludeTyConUnique 104
    
    1921 1905
     trModuleTyConKey                        = mkPreludeTyConUnique 105
    
    1922
    -trNameTyConKey                          = mkPreludeTyConUnique 106
    
    1923 1906
     kindRepTyConKey                         = mkPreludeTyConUnique 107
    
    1924
    -typeLitSortTyConKey                     = mkPreludeTyConUnique 108
    
    1925 1907
     
    
    1926 1908
     -- Generics (Unique keys)
    
    1927 1909
     v1TyConKey, u1TyConKey, par1TyConKey, rec1TyConKey,
    
    ... ... @@ -1990,8 +1972,7 @@ callStackTyConKey :: Unique
    1990 1972
     callStackTyConKey = mkPreludeTyConUnique 191
    
    1991 1973
     
    
    1992 1974
     -- Typeables
    
    1993
    -typeRepTyConKey, someTypeRepTyConKey, someTypeRepDataConKey :: Unique
    
    1994
    -typeRepTyConKey       = mkPreludeTyConUnique 192
    
    1975
    +someTypeRepTyConKey, someTypeRepDataConKey :: Unique
    
    1995 1976
     someTypeRepTyConKey   = mkPreludeTyConUnique 193
    
    1996 1977
     someTypeRepDataConKey = mkPreludeTyConUnique 194
    
    1997 1978
     
    
    ... ... @@ -2130,12 +2111,11 @@ srcLocDataConKey :: Unique
    2130 2111
     srcLocDataConKey                        = mkPreludeDataConUnique 37
    
    2131 2112
     
    
    2132 2113
     trTyConDataConKey, trModuleDataConKey,
    
    2133
    -  trNameSDataConKey, trNameDDataConKey,
    
    2114
    +  trNameSDataConKey,
    
    2134 2115
       trGhcPrimModuleKey :: Unique
    
    2135 2116
     trTyConDataConKey                       = mkPreludeDataConUnique 41
    
    2136 2117
     trModuleDataConKey                      = mkPreludeDataConUnique 43
    
    2137 2118
     trNameSDataConKey                       = mkPreludeDataConUnique 45
    
    2138
    -trNameDDataConKey                       = mkPreludeDataConUnique 46
    
    2139 2119
     trGhcPrimModuleKey                      = mkPreludeDataConUnique 47
    
    2140 2120
     
    
    2141 2121
     typeErrorTextDataConKey,
    
    ... ... @@ -2210,7 +2190,7 @@ vecElemDataConKeys = map mkPreludeDataConUnique [96..105]
    2210 2190
     -- Typeable things
    
    2211 2191
     kindRepTyConAppDataConKey, kindRepVarDataConKey, kindRepAppDataConKey,
    
    2212 2192
         kindRepFunDataConKey, kindRepTYPEDataConKey,
    
    2213
    -    kindRepTypeLitSDataConKey, kindRepTypeLitDDataConKey
    
    2193
    +    kindRepTypeLitSDataConKey
    
    2214 2194
         :: Unique
    
    2215 2195
     kindRepTyConAppDataConKey = mkPreludeDataConUnique 106
    
    2216 2196
     kindRepVarDataConKey      = mkPreludeDataConUnique 107
    
    ... ... @@ -2218,7 +2198,6 @@ kindRepAppDataConKey = mkPreludeDataConUnique 108
    2218 2198
     kindRepFunDataConKey      = mkPreludeDataConUnique 109
    
    2219 2199
     kindRepTYPEDataConKey     = mkPreludeDataConUnique 110
    
    2220 2200
     kindRepTypeLitSDataConKey = mkPreludeDataConUnique 111
    
    2221
    -kindRepTypeLitDDataConKey = mkPreludeDataConUnique 112
    
    2222 2201
     
    
    2223 2202
     typeLitSymbolDataConKey, typeLitNatDataConKey, typeLitCharDataConKey :: Unique
    
    2224 2203
     typeLitSymbolDataConKey   = mkPreludeDataConUnique 113
    
    ... ... @@ -2461,7 +2440,6 @@ proxyHashKey = mkPreludeMiscIdUnique 502
    2461 2440
     
    
    2462 2441
     -- Used to make `Typeable` dictionaries
    
    2463 2442
     mkTyConKey
    
    2464
    -  , mkTrTypeKey
    
    2465 2443
       , mkTrConKey
    
    2466 2444
       , mkTrAppCheckedKey
    
    2467 2445
       , mkTrFunKey
    
    ... ... @@ -2471,7 +2449,6 @@ mkTyConKey
    2471 2449
       , typeRepIdKey
    
    2472 2450
       :: Unique
    
    2473 2451
     mkTyConKey            = mkPreludeMiscIdUnique 503
    
    2474
    -mkTrTypeKey           = mkPreludeMiscIdUnique 504
    
    2475 2452
     mkTrConKey            = mkPreludeMiscIdUnique 505
    
    2476 2453
     mkTrAppCheckedKey     = mkPreludeMiscIdUnique 506
    
    2477 2454
     typeNatTypeRepKey     = mkPreludeMiscIdUnique 507