Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • compiler/GHC/Builtin/Names.hs
    ... ... @@ -405,26 +405,18 @@ basicKnownKeyNames
    405 405
             naturalQuotName,
    
    406 406
             naturalRemName,
    
    407 407
             naturalAndName,
    
    408
    -        naturalAndNotName,
    
    409 408
             naturalOrName,
    
    410 409
             naturalXorName,
    
    411 410
             naturalTestBitName,
    
    412 411
             naturalBitName,
    
    413 412
             naturalGcdName,
    
    414 413
             naturalLcmName,
    
    415
    -        naturalLog2Name,
    
    416
    -        naturalLogBaseWordName,
    
    417
    -        naturalLogBaseName,
    
    418
    -        naturalPowModName,
    
    419
    -        naturalSizeInBaseName,
    
    420 414
     
    
    421 415
             bignatEqName,
    
    422 416
     
    
    423 417
             -- Float/Double
    
    424 418
             integerToFloatName,
    
    425 419
             integerToDoubleName,
    
    426
    -        naturalToFloatName,
    
    427
    -        naturalToDoubleName,
    
    428 420
             rationalToFloatName,
    
    429 421
             rationalToDoubleName,
    
    430 422
     
    
    ... ... @@ -1150,18 +1142,12 @@ integerFromNaturalName
    1150 1142
        , naturalQuotName
    
    1151 1143
        , naturalRemName
    
    1152 1144
        , naturalAndName
    
    1153
    -   , naturalAndNotName
    
    1154 1145
        , naturalOrName
    
    1155 1146
        , naturalXorName
    
    1156 1147
        , naturalTestBitName
    
    1157 1148
        , naturalBitName
    
    1158 1149
        , naturalGcdName
    
    1159 1150
        , naturalLcmName
    
    1160
    -   , naturalLog2Name
    
    1161
    -   , naturalLogBaseWordName
    
    1162
    -   , naturalLogBaseName
    
    1163
    -   , naturalPowModName
    
    1164
    -   , naturalSizeInBaseName
    
    1165 1151
        , bignatEqName
    
    1166 1152
        , bignatCompareName
    
    1167 1153
        , bignatCompareWordName
    
    ... ... @@ -1190,18 +1176,12 @@ naturalQuotRemName = bnnVarQual "naturalQuotRem#" naturalQuotRe
    1190 1176
     naturalQuotName           = bnnVarQual "naturalQuot"               naturalQuotIdKey
    
    1191 1177
     naturalRemName            = bnnVarQual "naturalRem"                naturalRemIdKey
    
    1192 1178
     naturalAndName            = bnnVarQual "naturalAnd"                naturalAndIdKey
    
    1193
    -naturalAndNotName         = bnnVarQual "naturalAndNot"             naturalAndNotIdKey
    
    1194 1179
     naturalOrName             = bnnVarQual "naturalOr"                 naturalOrIdKey
    
    1195 1180
     naturalXorName            = bnnVarQual "naturalXor"                naturalXorIdKey
    
    1196 1181
     naturalTestBitName        = bnnVarQual "naturalTestBit#"           naturalTestBitIdKey
    
    1197 1182
     naturalBitName            = bnnVarQual "naturalBit#"               naturalBitIdKey
    
    1198 1183
     naturalGcdName            = bnnVarQual "naturalGcd"                naturalGcdIdKey
    
    1199 1184
     naturalLcmName            = bnnVarQual "naturalLcm"                naturalLcmIdKey
    
    1200
    -naturalLog2Name           = bnnVarQual "naturalLog2#"              naturalLog2IdKey
    
    1201
    -naturalLogBaseWordName    = bnnVarQual "naturalLogBaseWord#"       naturalLogBaseWordIdKey
    
    1202
    -naturalLogBaseName        = bnnVarQual "naturalLogBase#"           naturalLogBaseIdKey
    
    1203
    -naturalPowModName         = bnnVarQual "naturalPowMod"             naturalPowModIdKey
    
    1204
    -naturalSizeInBaseName     = bnnVarQual "naturalSizeInBase#"        naturalSizeInBaseIdKey
    
    1205 1185
     
    
    1206 1186
     integerFromNaturalName    = bniVarQual "integerFromNatural"        integerFromNaturalIdKey
    
    1207 1187
     integerToNaturalClampName = bniVarQual "integerToNaturalClamp"     integerToNaturalClampIdKey
    
    ... ... @@ -1272,12 +1252,9 @@ realFloatClassName = clsQual gHC_INTERNAL_FLOAT (fsLit "RealFloat") realFloatCla
    1272 1252
     
    
    1273 1253
     -- other GHC.Internal.Float functions
    
    1274 1254
     integerToFloatName, integerToDoubleName,
    
    1275
    -  naturalToFloatName, naturalToDoubleName,
    
    1276 1255
       rationalToFloatName, rationalToDoubleName :: Name
    
    1277 1256
     integerToFloatName   = varQual gHC_INTERNAL_FLOAT (fsLit "integerToFloat#") integerToFloatIdKey
    
    1278 1257
     integerToDoubleName  = varQual gHC_INTERNAL_FLOAT (fsLit "integerToDouble#") integerToDoubleIdKey
    
    1279
    -naturalToFloatName   = varQual gHC_INTERNAL_FLOAT (fsLit "naturalToFloat#") naturalToFloatIdKey
    
    1280
    -naturalToDoubleName  = varQual gHC_INTERNAL_FLOAT (fsLit "naturalToDouble#") naturalToDoubleIdKey
    
    1281 1258
     rationalToFloatName  = varQual gHC_INTERNAL_FLOAT (fsLit "rationalToFloat") rationalToFloatIdKey
    
    1282 1259
     rationalToDoubleName = varQual gHC_INTERNAL_FLOAT (fsLit "rationalToDouble") rationalToDoubleIdKey
    
    1283 1260
     
    
    ... ... @@ -2333,11 +2310,9 @@ considerAccessibleIdKey = mkPreludeMiscIdUnique 125
    2333 2310
     noinlineIdKey           = mkPreludeMiscIdUnique 126
    
    2334 2311
     noinlineConstraintIdKey = mkPreludeMiscIdUnique 127
    
    2335 2312
     
    
    2336
    -integerToFloatIdKey, integerToDoubleIdKey, naturalToFloatIdKey, naturalToDoubleIdKey :: Unique
    
    2313
    +integerToFloatIdKey, integerToDoubleIdKey :: Unique
    
    2337 2314
     integerToFloatIdKey    = mkPreludeMiscIdUnique 128
    
    2338 2315
     integerToDoubleIdKey   = mkPreludeMiscIdUnique 129
    
    2339
    -naturalToFloatIdKey    = mkPreludeMiscIdUnique 130
    
    2340
    -naturalToDoubleIdKey   = mkPreludeMiscIdUnique 131
    
    2341 2316
     
    
    2342 2317
     rationalToFloatIdKey, rationalToDoubleIdKey :: Unique
    
    2343 2318
     rationalToFloatIdKey   = mkPreludeMiscIdUnique 132
    
    ... ... @@ -2561,18 +2536,12 @@ integerFromNaturalIdKey
    2561 2536
        , naturalQuotIdKey
    
    2562 2537
        , naturalRemIdKey
    
    2563 2538
        , naturalAndIdKey
    
    2564
    -   , naturalAndNotIdKey
    
    2565 2539
        , naturalOrIdKey
    
    2566 2540
        , naturalXorIdKey
    
    2567 2541
        , naturalTestBitIdKey
    
    2568 2542
        , naturalBitIdKey
    
    2569 2543
        , naturalGcdIdKey
    
    2570 2544
        , naturalLcmIdKey
    
    2571
    -   , naturalLog2IdKey
    
    2572
    -   , naturalLogBaseWordIdKey
    
    2573
    -   , naturalLogBaseIdKey
    
    2574
    -   , naturalPowModIdKey
    
    2575
    -   , naturalSizeInBaseIdKey
    
    2576 2545
        , bignatEqIdKey
    
    2577 2546
        , bignatCompareIdKey
    
    2578 2547
        , bignatCompareWordIdKey
    
    ... ... @@ -2627,18 +2596,12 @@ naturalQuotRemIdKey = mkPreludeMiscIdUnique 669
    2627 2596
     naturalQuotIdKey           = mkPreludeMiscIdUnique 670
    
    2628 2597
     naturalRemIdKey            = mkPreludeMiscIdUnique 671
    
    2629 2598
     naturalAndIdKey            = mkPreludeMiscIdUnique 672
    
    2630
    -naturalAndNotIdKey         = mkPreludeMiscIdUnique 673
    
    2631 2599
     naturalOrIdKey             = mkPreludeMiscIdUnique 674
    
    2632 2600
     naturalXorIdKey            = mkPreludeMiscIdUnique 675
    
    2633 2601
     naturalTestBitIdKey        = mkPreludeMiscIdUnique 676
    
    2634 2602
     naturalBitIdKey            = mkPreludeMiscIdUnique 677
    
    2635 2603
     naturalGcdIdKey            = mkPreludeMiscIdUnique 678
    
    2636 2604
     naturalLcmIdKey            = mkPreludeMiscIdUnique 679
    
    2637
    -naturalLog2IdKey           = mkPreludeMiscIdUnique 680
    
    2638
    -naturalLogBaseWordIdKey    = mkPreludeMiscIdUnique 681
    
    2639
    -naturalLogBaseIdKey        = mkPreludeMiscIdUnique 682
    
    2640
    -naturalPowModIdKey         = mkPreludeMiscIdUnique 683
    
    2641
    -naturalSizeInBaseIdKey     = mkPreludeMiscIdUnique 684
    
    2642 2605
     
    
    2643 2606
     bignatEqIdKey              = mkPreludeMiscIdUnique 691
    
    2644 2607
     bignatCompareIdKey         = mkPreludeMiscIdUnique 692