Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Builtin.hs
    ... ... @@ -453,8 +453,7 @@ standardClassKeys
    453 453
       = derivableClassKeys
    
    454 454
         ++ numericClassKeys
    
    455 455
         ++ checkKnownKeys
    
    456
    -          [ randomClassKey, randomGenClassKey
    
    457
    -          , functorClassKey
    
    456
    +          [ functorClassKey
    
    458 457
               , monadClassKey, monadPlusClassKey, monadFailClassKey
    
    459 458
               , semigroupClassKey, monoidClassKey
    
    460 459
               , isStringClassKey
    

  • compiler/GHC/Builtin/KnownKeys.hs
    ... ... @@ -143,6 +143,8 @@ knownKeyTable
    143 143
         , (mkTcOcc "Typeable",     typeableClassKey)
    
    144 144
         , (mkTcOcc "Functor",      functorClassKey)
    
    145 145
         , (mkTcOcc "Lift",         liftClassKey)
    
    146
    +    , (mkTcOcc "MonadPlus",    monadPlusClassKey)
    
    147
    +    , (mkTcOcc "MonadFail",    monadPlusClassKey)
    
    146 148
     
    
    147 149
         -- Numeric classes
    
    148 150
         , (mkTcOcc "Num",               numClassKey)
    
    ... ... @@ -159,13 +161,23 @@ knownKeyTable
    159 161
         , (mkVarOcc "toRational",       toRationalClassOpKey)
    
    160 162
         , (mkVarOcc "realToFrac",       realToFracIdKey)
    
    161 163
     
    
    164
    +    -- Int and Word
    
    165
    +    , (mkTcOcc "Int8",   int8TyConKey)
    
    166
    +    , (mkTcOcc "Int16",  int16TyConKey)
    
    167
    +    , (mkTcOcc "Int32",  int32TyConKey)
    
    168
    +    , (mkTcOcc "Int64",  int64TyConKey)
    
    169
    +    , (mkTcOcc "Word16", word16TyConKey)
    
    170
    +    , (mkTcOcc "Word32", word32TyConKey)
    
    171
    +    , (mkTcOcc "Word64", word64TyConKey)
    
    172
    +
    
    162 173
         -- FFI things
    
    163 174
         , (mkTcOcc "ConstPtr", constPtrTyConKey)
    
    175
    +    , (mkTcOcc "Ptr", ptrTyConKey)
    
    176
    +    , (mkTcOcc "FunPtr", funPtrTyConKey)
    
    164 177
     
    
    165 178
         -- Class Monad, MonadFix, MonadZip
    
    166 179
         , (mkTcOcc "Monad",        monadClassKey)
    
    167 180
         , (thenMClassOpOcc,        thenMClassOpKey)
    
    168
    -    , (bindMClassOpOcc,        bindMClassOpKey)
    
    169 181
         , (returnMClassOpOcc,      returnMClassOpKey)
    
    170 182
     
    
    171 183
         -- Class Applicative
    
    ... ... @@ -200,7 +212,9 @@ knownKeyTable
    200 212
         , (mkTcOcc "Generic1",  gen1ClassKey)
    
    201 213
     
    
    202 214
         -- Static pointers
    
    203
    -    , (mkVarOcc "makeStatic",    makeStaticKey)
    
    215
    +    , (mkVarOcc "makeStatic",     makeStaticKey)
    
    216
    +    , (mkDataOcc "StaticPtr",     staticPtrDataConKey)
    
    217
    +    , (mkDataOcc "StaticPtrInfo", staticPtrDataConKey)
    
    204 218
     
    
    205 219
         -- Stable pointers
    
    206 220
         , (mkTcOcc "StablePtr", stablePtrTyConKey)
    
    ... ... @@ -228,6 +242,11 @@ knownKeyTable
    228 242
         , (mkDataOcc ":$$:",      typeErrorVAppendDataConKey)
    
    229 243
         , (mkDataOcc "ShowType",  typeErrorShowTypeDataConKey)
    
    230 244
     
    
    245
    +    -- Known lits
    
    246
    +    , (mkTcOcc "KnownNat", knownNatClassKey)
    
    247
    +    , (mkTcOcc "KnownSymbol", knownSymbolClassKey)
    
    248
    +    , (mkTcOcc "KnownChar", knownCharClassKey)
    
    249
    +
    
    231 250
         -- Unsafe coercion proofs
    
    232 251
         , (mkVarOcc "unsafeCoerce#", unsafeCoercePrimIdKey)
    
    233 252
     
    
    ... ... @@ -241,6 +260,10 @@ knownKeyTable
    241 260
     
    
    242 261
         -- JS primitives
    
    243 262
         , (mkVarOcc "unsafeUnpackJSStringUtf8##", unsafeUnpackJSStringUtf8ShShKey)
    
    263
    +    , (mkTcOcc "JSVal",                       jsvalTyConKey)
    
    264
    +
    
    265
    +    -- Type rep
    
    266
    +    , (mkTcOcc "TyCon", trTyConTyConKey)
    
    244 267
     
    
    245 268
         -- Known-key names that have BuiltinRules in ConstantFold
    
    246 269
         , (mkVarOcc "unpackFoldrCString#",      unpackCStringFoldrIdKey)
    
    ... ... @@ -432,14 +455,11 @@ withDictClassKey = mkPreludeClassUnique 21
    432 455
     dataToTagClassKey :: KnownKey
    
    433 456
     dataToTagClassKey       = mkPreludeClassUnique 23
    
    434 457
     
    
    435
    -
    
    436 458
     monadFailClassKey :: KnownKey
    
    437 459
     monadFailClassKey       = mkPreludeClassUnique 29
    
    438 460
     
    
    439
    -monadPlusClassKey, randomClassKey, randomGenClassKey :: KnownKey
    
    440
    -monadPlusClassKey       = mkPreludeClassUnique 30
    
    441
    -randomClassKey          = mkPreludeClassUnique 31
    
    442
    -randomGenClassKey       = mkPreludeClassUnique 32
    
    461
    +monadPlusClassKey :: KnownKey
    
    462
    +monadPlusClassKey = mkPreludeClassUnique 30
    
    443 463
     
    
    444 464
     isStringClassKey :: KnownKey
    
    445 465
     isStringClassKey        = mkPreludeClassUnique 33
    
    ... ... @@ -790,9 +810,6 @@ vecCountDataConKeys = map mkPreludeDataConUnique [90..95]
    790 810
     vecElemDataConKeys :: [KnownKey]
    
    791 811
     vecElemDataConKeys = map mkPreludeDataConUnique [96..105]
    
    792 812
     
    
    793
    --- Typeable things
    
    794
    -
    
    795
    -
    
    796 813
     -- Unsafe equality
    
    797 814
     unsafeReflDataConKey :: KnownKey
    
    798 815
     unsafeReflDataConKey      = mkPreludeDataConUnique 116
    
    ... ... @@ -887,7 +904,6 @@ lazyIdKey = mkPreludeMiscIdUnique 104
    887 904
     oneShotKey                    = mkPreludeMiscIdUnique 106
    
    888 905
     runRWKey                      = mkPreludeMiscIdUnique 107
    
    889 906
     
    
    890
    -
    
    891 907
     nospecIdKey :: KnownKey
    
    892 908
     nospecIdKey                   = mkPreludeMiscIdUnique 109
    
    893 909
     
    
    ... ... @@ -916,19 +932,12 @@ coerceKey = mkPreludeMiscIdUnique 135
    916 932
     
    
    917 933
     -- Just a placeholder for unbound variables produced by the renamer:
    
    918 934
     unboundKey :: KnownKey
    
    919
    -unboundKey             = mkPreludeMiscIdUnique 136
    
    920
    -
    
    921
    -
    
    935
    +unboundKey = mkPreludeMiscIdUnique 136
    
    922 936
     
    
    923
    -bindMClassOpKey, thenMClassOpKey, returnMClassOpKey :: KnownKey
    
    924
    -bindMClassOpKey               = mkPreludeMiscIdUnique 154
    
    937
    +thenMClassOpKey, returnMClassOpKey :: KnownKey
    
    925 938
     thenMClassOpKey               = mkPreludeMiscIdUnique 155 -- (>>)
    
    926 939
     returnMClassOpKey             = mkPreludeMiscIdUnique 157
    
    927 940
     
    
    928
    --- MonadFail operations
    
    929
    -failMClassOpKey :: KnownKey
    
    930
    -failMClassOpKey = mkPreludeMiscIdUnique 159
    
    931
    -
    
    932 941
     -- Conversion functions
    
    933 942
     fromIntegralIdKey, realToFracIdKey, toIntegerClassOpKey, toRationalClassOpKey :: KnownKey
    
    934 943
     fromIntegralIdKey    = mkPreludeMiscIdUnique 190
    
    ... ... @@ -958,7 +967,6 @@ sappendClassOpKey = mkPreludeMiscIdUnique 554
    958 967
     mappendClassOpKey :: KnownKey
    
    959 968
     mappendClassOpKey = mkPreludeMiscIdUnique 556
    
    960 969
     
    
    961
    -
    
    962 970
     makeStaticKey :: KnownKey
    
    963 971
     makeStaticKey = mkPreludeMiscIdUnique 561
    
    964 972
     
    
    ... ... @@ -968,9 +976,8 @@ unsafeEqualityProofIdKey = mkPreludeMiscIdUnique 570
    968 976
     unsafeCoercePrimIdKey    = mkPreludeMiscIdUnique 571
    
    969 977
     
    
    970 978
     -- HasField class ops
    
    971
    -getFieldClassOpKey, setFieldClassOpKey :: KnownKey
    
    979
    +getFieldClassOpKey :: KnownKey
    
    972 980
     getFieldClassOpKey = mkPreludeMiscIdUnique 572
    
    973
    -setFieldClassOpKey = mkPreludeMiscIdUnique 573
    
    974 981
     
    
    975 982
     -- "Unsatisfiable" constraints
    
    976 983
     unsatisfiableIdKey :: KnownKey