Simon Peyton Jones pushed to branch wip/spj-reinstallable-base at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Builtin/Names.hs
    ... ... @@ -213,6 +213,7 @@ basicKnownKeyTable
    213 213
         , (mkTcOcc "Bounded",      boundedClassKey)
    
    214 214
         , (mkTcOcc "Enum",         enumClassKey)
    
    215 215
         , (mkTcOcc "Integral",     integralClassKey)
    
    216
    +    , (mkTcOcc "Real",         realClassKey)
    
    216 217
         , (mkTcOcc "Data",         dataClassKey)
    
    217 218
         , (mkTcOcc "Ix",           ixClassKey)
    
    218 219
         , (mkTcOcc "Alternative",  alternativeClassKey)
    

  • libraries/base/src/GHC/KnownKeyNames.hs
    ... ... @@ -29,7 +29,7 @@ module GHC.KnownKeyNames
    29 29
         , (<>), mappend
    
    30 30
     
    
    31 31
         -- Numbers
    
    32
    -    , Num, Integral
    
    32
    +    , Num, Integral, Real
    
    33 33
         , (-), negate, fromInteger, fromRational
    
    34 34
         , mkRationalBase2, mkRationalBase10
    
    35 35
     
    
    ... ... @@ -64,10 +64,10 @@ import GHC.Internal.OverloadedLabels( fromLabel )
    64 64
     import GHC.Internal.Records( HasField, getField )
    
    65 65
     import qualified GHC.Internal.IsList as IL
    
    66 66
     
    
    67
    -
    
    68 67
     {- Note [Known-key names and IsList]
    
    69 68
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    70
    -Very annoyingly both Foldable and isList
    
    69
    +Very annoyingly both the classes Foldable and IsList have a method `toList`.
    
    70
    +we can't have two known-key names with the same OccName.
    
    71 71
     -}
    
    72 72
     
    
    73 73
     isList_toList :: IL.IsList l => l -> [IL.Item l]