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

Commits:

1 changed file:

Changes:

  • compiler/GHC/Builtin/Names.hs
    ... ... @@ -517,12 +517,9 @@ basicKnownKeyNames
    517 517
     
    
    518 518
     genericTyConNames :: [Name]
    
    519 519
     genericTyConNames = [
    
    520
    -    v1TyConName, u1TyConName, par1TyConName, rec1TyConName,
    
    521
    -    k1TyConName, m1TyConName, sumTyConName, prodTyConName,
    
    522
    -    compTyConName, rTyConName, dTyConName,
    
    523
    -    cTyConName, sTyConName, rec0TyConName,
    
    524
    -    d1TyConName, c1TyConName, s1TyConName,
    
    525
    -    repTyConName, rep1TyConName, uRecTyConName,
    
    520
    +    v1TyConName, u1TyConName, par1TyConName, rec1TyConName, sumTyConName,
    
    521
    +    prodTyConName, compTyConName, rec0TyConName, d1TyConName, c1TyConName,
    
    522
    +    s1TyConName, repTyConName, rep1TyConName,
    
    526 523
         uAddrTyConName, uCharTyConName, uDoubleTyConName,
    
    527 524
         uFloatTyConName, uIntTyConName, uWordTyConName,
    
    528 525
         prefixIDataConName, infixIDataConName, leftAssociativeDataConName,
    
    ... ... @@ -939,11 +936,8 @@ voidTyConName = tcQual gHC_INTERNAL_BASE (fsLit "Void") voidTyConKey
    939 936
     
    
    940 937
     -- Generics (types)
    
    941 938
     v1TyConName, u1TyConName, par1TyConName, rec1TyConName,
    
    942
    -  k1TyConName, m1TyConName, sumTyConName, prodTyConName,
    
    943
    -  compTyConName, rTyConName, dTyConName,
    
    944
    -  cTyConName, sTyConName, rec0TyConName,
    
    945
    -  d1TyConName, c1TyConName, s1TyConName,
    
    946
    -  repTyConName, rep1TyConName, uRecTyConName,
    
    939
    +  sumTyConName, prodTyConName, compTyConName, rec0TyConName, d1TyConName,
    
    940
    +  c1TyConName, s1TyConName, repTyConName, rep1TyConName,
    
    947 941
       uAddrTyConName, uCharTyConName, uDoubleTyConName,
    
    948 942
       uFloatTyConName, uIntTyConName, uWordTyConName,
    
    949 943
       prefixIDataConName, infixIDataConName, leftAssociativeDataConName,
    
    ... ... @@ -958,18 +952,11 @@ v1TyConName = tcQual gHC_INTERNAL_GENERICS (fsLit "V1") v1TyConKey
    958 952
     u1TyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "U1") u1TyConKey
    
    959 953
     par1TyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "Par1") par1TyConKey
    
    960 954
     rec1TyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "Rec1") rec1TyConKey
    
    961
    -k1TyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "K1") k1TyConKey
    
    962
    -m1TyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "M1") m1TyConKey
    
    963 955
     
    
    964 956
     sumTyConName    = tcQual gHC_INTERNAL_GENERICS (fsLit ":+:") sumTyConKey
    
    965 957
     prodTyConName   = tcQual gHC_INTERNAL_GENERICS (fsLit ":*:") prodTyConKey
    
    966 958
     compTyConName   = tcQual gHC_INTERNAL_GENERICS (fsLit ":.:") compTyConKey
    
    967 959
     
    
    968
    -rTyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "R") rTyConKey
    
    969
    -dTyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "D") dTyConKey
    
    970
    -cTyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "C") cTyConKey
    
    971
    -sTyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "S") sTyConKey
    
    972
    -
    
    973 960
     rec0TyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "Rec0") rec0TyConKey
    
    974 961
     d1TyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "D1") d1TyConKey
    
    975 962
     c1TyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "C1") c1TyConKey
    
    ... ... @@ -978,7 +965,6 @@ s1TyConName = tcQual gHC_INTERNAL_GENERICS (fsLit "S1") s1TyConKey
    978 965
     repTyConName  = tcQual gHC_INTERNAL_GENERICS (fsLit "Rep")  repTyConKey
    
    979 966
     rep1TyConName = tcQual gHC_INTERNAL_GENERICS (fsLit "Rep1") rep1TyConKey
    
    980 967
     
    
    981
    -uRecTyConName      = tcQual gHC_INTERNAL_GENERICS (fsLit "URec") uRecTyConKey
    
    982 968
     uAddrTyConName     = tcQual gHC_INTERNAL_GENERICS (fsLit "UAddr") uAddrTyConKey
    
    983 969
     uCharTyConName     = tcQual gHC_INTERNAL_GENERICS (fsLit "UChar") uCharTyConKey
    
    984 970
     uDoubleTyConName   = tcQual gHC_INTERNAL_GENERICS (fsLit "UDouble") uDoubleTyConKey
    
    ... ... @@ -1950,11 +1936,8 @@ typeLitSortTyConKey = mkPreludeTyConUnique 108
    1950 1936
     
    
    1951 1937
     -- Generics (Unique keys)
    
    1952 1938
     v1TyConKey, u1TyConKey, par1TyConKey, rec1TyConKey,
    
    1953
    -  k1TyConKey, m1TyConKey, sumTyConKey, prodTyConKey,
    
    1954
    -  compTyConKey, rTyConKey, dTyConKey,
    
    1955
    -  cTyConKey, sTyConKey, rec0TyConKey,
    
    1956
    -  d1TyConKey, c1TyConKey, s1TyConKey,
    
    1957
    -  repTyConKey, rep1TyConKey, uRecTyConKey,
    
    1939
    +  sumTyConKey, prodTyConKey, compTyConKey, rec0TyConKey,
    
    1940
    +  d1TyConKey, c1TyConKey, s1TyConKey, repTyConKey, rep1TyConKey,
    
    1958 1941
       uAddrTyConKey, uCharTyConKey, uDoubleTyConKey,
    
    1959 1942
       uFloatTyConKey, uIntTyConKey, uWordTyConKey :: Unique
    
    1960 1943
     
    
    ... ... @@ -1962,18 +1945,11 @@ v1TyConKey = mkPreludeTyConUnique 135
    1962 1945
     u1TyConKey    = mkPreludeTyConUnique 136
    
    1963 1946
     par1TyConKey  = mkPreludeTyConUnique 137
    
    1964 1947
     rec1TyConKey  = mkPreludeTyConUnique 138
    
    1965
    -k1TyConKey    = mkPreludeTyConUnique 139
    
    1966
    -m1TyConKey    = mkPreludeTyConUnique 140
    
    1967 1948
     
    
    1968 1949
     sumTyConKey   = mkPreludeTyConUnique 141
    
    1969 1950
     prodTyConKey  = mkPreludeTyConUnique 142
    
    1970 1951
     compTyConKey  = mkPreludeTyConUnique 143
    
    1971 1952
     
    
    1972
    -rTyConKey = mkPreludeTyConUnique 144
    
    1973
    -dTyConKey = mkPreludeTyConUnique 146
    
    1974
    -cTyConKey = mkPreludeTyConUnique 147
    
    1975
    -sTyConKey = mkPreludeTyConUnique 148
    
    1976
    -
    
    1977 1953
     rec0TyConKey  = mkPreludeTyConUnique 149
    
    1978 1954
     d1TyConKey    = mkPreludeTyConUnique 151
    
    1979 1955
     c1TyConKey    = mkPreludeTyConUnique 152
    
    ... ... @@ -1982,7 +1958,6 @@ s1TyConKey = mkPreludeTyConUnique 153
    1982 1958
     repTyConKey  = mkPreludeTyConUnique 155
    
    1983 1959
     rep1TyConKey = mkPreludeTyConUnique 156
    
    1984 1960
     
    
    1985
    -uRecTyConKey    = mkPreludeTyConUnique 157
    
    1986 1961
     uAddrTyConKey   = mkPreludeTyConUnique 158
    
    1987 1962
     uCharTyConKey   = mkPreludeTyConUnique 159
    
    1988 1963
     uDoubleTyConKey = mkPreludeTyConUnique 160