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

Commits:

1 changed file:

Changes:

  • compiler/GHC/Builtin/Names.hs
    ... ... @@ -339,8 +339,7 @@ basicKnownKeyNames
    339 339
             getFieldName, setFieldName,
    
    340 340
     
    
    341 341
             -- List operations
    
    342
    -        concatName, filterName, mapName,
    
    343
    -        zipName, foldrName, buildName, augmentName, appendName,
    
    342
    +        mapName, foldrName, buildName, augmentName,
    
    344 343
     
    
    345 344
             -- FFI primitive types that are not wired-in.
    
    346 345
             stablePtrTyConName, ptrTyConName, funPtrTyConName, constPtrConName,
    
    ... ... @@ -694,9 +693,8 @@ ltTag_RDR = nameRdrName ordLTDataConName
    694 693
     eqTag_RDR               = nameRdrName  ordEQDataConName
    
    695 694
     gtTag_RDR               = nameRdrName  ordGTDataConName
    
    696 695
     
    
    697
    -map_RDR, append_RDR :: RdrName
    
    696
    +map_RDR :: RdrName
    
    698 697
     map_RDR                 = nameRdrName mapName
    
    699
    -append_RDR              = nameRdrName appendName
    
    700 698
     
    
    701 699
     foldr_RDR, build_RDR, returnM_RDR, bindM_RDR, failM_RDR
    
    702 700
         :: RdrName
    
    ... ... @@ -1068,7 +1066,7 @@ considerAccessibleName = varQual gHC_INTERNAL_EXTS (fsLit "considerAccessible")
    1068 1066
     
    
    1069 1067
     -- Random GHC.Internal.Base functions
    
    1070 1068
     fromStringName, otherwiseIdName, foldrName, buildName, augmentName,
    
    1071
    -    mapName, appendName, assertName,
    
    1069
    +    mapName, assertName,
    
    1072 1070
         dollarName :: Name
    
    1073 1071
     dollarName        = varQual gHC_INTERNAL_BASE (fsLit "$")          dollarIdKey
    
    1074 1072
     otherwiseIdName   = varQual gHC_INTERNAL_BASE (fsLit "otherwise")  otherwiseIdKey
    
    ... ... @@ -1076,7 +1074,6 @@ foldrName = varQual gHC_INTERNAL_BASE (fsLit "foldr") foldrIdKey
    1076 1074
     buildName         = varQual gHC_INTERNAL_BASE (fsLit "build")      buildIdKey
    
    1077 1075
     augmentName       = varQual gHC_INTERNAL_BASE (fsLit "augment")    augmentIdKey
    
    1078 1076
     mapName           = varQual gHC_INTERNAL_BASE (fsLit "map")        mapIdKey
    
    1079
    -appendName        = varQual gHC_INTERNAL_BASE (fsLit "++")         appendIdKey
    
    1080 1077
     assertName        = varQual gHC_INTERNAL_BASE (fsLit "assert")     assertIdKey
    
    1081 1078
     fromStringName    = varQual gHC_INTERNAL_DATA_STRING (fsLit "fromString") fromStringClassOpKey
    
    1082 1079
     
    
    ... ... @@ -1409,12 +1406,6 @@ enumFromThenName = varQual gHC_INTERNAL_ENUM (fsLit "enumFromThen") enumFrom
    1409 1406
     enumFromThenToName = varQual gHC_INTERNAL_ENUM (fsLit "enumFromThenTo") enumFromThenToClassOpKey
    
    1410 1407
     boundedClassName   = clsQual gHC_INTERNAL_ENUM (fsLit "Bounded")        boundedClassKey
    
    1411 1408
     
    
    1412
    --- List functions
    
    1413
    -concatName, filterName, zipName :: Name
    
    1414
    -concatName        = varQual gHC_INTERNAL_LIST (fsLit "concat") concatIdKey
    
    1415
    -filterName        = varQual gHC_INTERNAL_LIST (fsLit "filter") filterIdKey
    
    1416
    -zipName           = varQual gHC_INTERNAL_LIST (fsLit "zip")    zipIdKey
    
    1417
    -
    
    1418 1409
     -- Overloaded lists
    
    1419 1410
     isListClassName, fromListName, fromListNName, toListName :: Name
    
    1420 1411
     isListClassName = clsQual gHC_INTERNAL_IS_LIST (fsLit "IsList")    isListClassKey
    
    ... ... @@ -2201,7 +2192,7 @@ naturalNBDataConKey = mkPreludeDataConUnique 124
    2201 2192
     ************************************************************************
    
    2202 2193
     -}
    
    2203 2194
     
    
    2204
    -wildCardKey, absentErrorIdKey, absentConstraintErrorIdKey, augmentIdKey, appendIdKey,
    
    2195
    +wildCardKey, absentErrorIdKey, absentConstraintErrorIdKey, augmentIdKey,
    
    2205 2196
         buildIdKey, foldrIdKey, recSelErrorIdKey,
    
    2206 2197
         seqIdKey, eqStringIdKey,
    
    2207 2198
         noMethodBindingErrorIdKey, nonExhaustiveGuardsErrorIdKey,
    
    ... ... @@ -2218,7 +2209,6 @@ wildCardKey = mkPreludeMiscIdUnique 0 -- See Note [WildCard
    2218 2209
     absentErrorIdKey               = mkPreludeMiscIdUnique  1
    
    2219 2210
     absentConstraintErrorIdKey     = mkPreludeMiscIdUnique  2
    
    2220 2211
     augmentIdKey                   = mkPreludeMiscIdUnique  3
    
    2221
    -appendIdKey                    = mkPreludeMiscIdUnique  4
    
    2222 2212
     buildIdKey                     = mkPreludeMiscIdUnique  5
    
    2223 2213
     foldrIdKey                     = mkPreludeMiscIdUnique  6
    
    2224 2214
     recSelErrorIdKey               = mkPreludeMiscIdUnique  7
    
    ... ... @@ -2247,13 +2237,9 @@ divIntIdKey = mkPreludeMiscIdUnique 26
    2247 2237
     modIntIdKey                   = mkPreludeMiscIdUnique 27
    
    2248 2238
     cstringLengthIdKey            = mkPreludeMiscIdUnique 28
    
    2249 2239
     
    
    2250
    -concatIdKey, filterIdKey, zipIdKey,
    
    2251
    -    bindIOIdKey, returnIOIdKey, newStablePtrIdKey,
    
    2240
    +bindIOIdKey, returnIOIdKey, newStablePtrIdKey,
    
    2252 2241
         printIdKey, nullAddrIdKey, voidArgIdKey,
    
    2253 2242
         otherwiseIdKey, assertIdKey :: Unique
    
    2254
    -concatIdKey                   = mkPreludeMiscIdUnique 31
    
    2255
    -filterIdKey                   = mkPreludeMiscIdUnique 32
    
    2256
    -zipIdKey                      = mkPreludeMiscIdUnique 33
    
    2257 2243
     bindIOIdKey                   = mkPreludeMiscIdUnique 34
    
    2258 2244
     returnIOIdKey                 = mkPreludeMiscIdUnique 35
    
    2259 2245
     newStablePtrIdKey             = mkPreludeMiscIdUnique 36