[Git][ghc/ghc][wip/spj-reinstallable-base] More [skip ci]

30 Mar 2026


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


Commits:
545fa306 by Simon Peyton Jones at 2026-03-30T17:49:23+01:00
More [skip ci]

- - - - -


6 changed files:

- compiler/GHC/Builtin/Names.hs
- libraries/base/src/Data/List.hs
- libraries/base/src/GHC/KnownKeyNames.hs
- libraries/base/src/GHC/Stats.hs
- libraries/base/src/System/Exit.hs
- libraries/base/src/System/IO/OS.hs


Changes:

=====================================
compiler/GHC/Builtin/Names.hs
=====================================
@@ -263,7 +263,8 @@ basicKnownKeyTable
     , (mkTcOcc "HasField",   hasFieldClassKey)
     , (mkVarOcc "fromLabel", fromLabelClassOpKey)
     , (mkVarOcc "getField",  getFieldClassOpKey)
-    , (mkVarOcc "setField",  setFieldClassOpKey)
+    -- setField is not yet defined in ghc-internal
+    -- , (mkVarOcc "setField",  setFieldClassOpKey)
 
     -- FromList
     , (mkVarOcc "fromList",   fromListClassOpKey)


=====================================
libraries/base/src/Data/List.hs
=====================================
@@ -193,7 +193,7 @@ import GHC.Internal.Int (Int)
 import GHC.Internal.Num ((-))
 import GHC.List (build)
 import qualified Data.List.NubOrdSet as NubOrdSet
-import GHC.Internal.Num( Num ) -- For -frebindable-known-key-names (defaulting)
+import GHC.Internal.Num( Num, fromInteger ) -- For -frebindable-known-key-names (defaulting)
 
 inits1, tails1 :: [a] -> [NonEmpty a]
 


=====================================
libraries/base/src/GHC/KnownKeyNames.hs
=====================================
@@ -1,3 +1,5 @@
+{-# LANGUAGE Trustworthy #-}
+
 -- |
 --
 -- Module      :  GHC.KnownKeyNames
@@ -12,18 +14,28 @@ module GHC.KnownKeyNames
     ( Rational
     , Eq, (==)
     , Ord, Show
-    , Num, (-), negate
-    , Integral
+    , Ix
     , Enum, Bounded
     , Foldable, Traversable
-    , IsString
+    , Data
     , Functor, fmap
     , Monad, (>>), (>>=), return, fail, guard, mfix, join
     , Applicative, mzip, (<*>)
+    , Alternative
+    , Semigroup, Monoid
     , (<>), mappend
 
+    -- Numbers
+    , Num, Integral
+    , (-), negate, fromInteger, fromRational
+
+    -- Strings
+    , IsString
+    , fromString
+
     -- Records and lists
-    , fromlabel, getField, setField
+    , HasField
+    , fromLabel, getField
     , fromList, fromListN, toList
 
     -- Arrows
@@ -35,11 +47,15 @@ module GHC.KnownKeyNames
 
 import Prelude
 import Data.String( IsString )
-import GHC.Internal.Base( join )
+import GHC.Internal.Base( Alternative, join, thenIO, bindIO, returnIO )
+import GHC.Internal.Ix( Ix )
+import GHC.Internal.Data.Data( Data )
+import GHC.Internal.Data.String( fromString )
+import GHC.Internal.Real( mkRationalBase2, mkRationalBase10 )
 import GHC.Internal.Control.Monad( guard )
-import GHC.Internal.Control.Monad.Fix( mfix )
+import GHC.Internal.Control.Monad.Fix( mfix, loop )
 import GHC.Internal.Control.Monad.Zip( mzip )
 import GHC.Internal.Control.Arrow( arr, (>>>), first, app, (|||) )
 import GHC.Internal.OverloadedLabels( fromLabel )
-import GHC.Internal.Records( getField, setField )
+import GHC.Internal.Records( HasField, getField )
 import GHC.Internal.IsList( fromList, fromListN, toList )


=====================================
libraries/base/src/GHC/Stats.hs
=====================================
@@ -43,6 +43,7 @@ import qualified GHC.Internal.Stats as Internal
 import GHC.Generics (Generic)
 import Data.Word (Word64,Word32)
 import Data.Int (Int64)
+import Prelude( (>>=), (>>) ) -- For known-key names
 
 -- | Time values from the RTS, using a fixed resolution of nanoseconds.
 type RtsTime = Int64


=====================================
libraries/base/src/System/Exit.hs
=====================================
@@ -35,6 +35,7 @@ import Data.String (String)
 import Data.Eq ((/=))
 import System.IO (IO, hPutStrLn, stderr)
 import GHC.Internal.Num( Num ) -- For -frebindable-known-key-names (defaulting)
+import GHC.Internal.Num( fromInteger ) -- For known-key names
 
 -- ---------------------------------------------------------------------------
 -- exitWith


=====================================
libraries/base/src/System/IO/OS.hs
=====================================
@@ -23,6 +23,8 @@ module System.IO.OS
 )
 where
 
+import GHC.KnownKeyNames
+
 import Control.Monad (return)
 import Control.Concurrent.MVar (MVar)
 import Control.Exception (mask)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/545fa3065669fb33613a5762d06dbb74...

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/545fa3065669fb33613a5762d06dbb74...
You're receiving this email because of your account on gitlab.haskell.org.

    

Simon Peyton Jones (＠simonpj)

tags

participants (1)