Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
-
d29800e0
by Teo Camarasu at 2026-03-06T06:28:46-05:00
6 changed files:
- libraries/base/src/GHC/Unicode.hs
- libraries/ghc-internal/ghc-internal.cabal.in
- − libraries/ghc-internal/src/GHC/Internal/Data/Version.hs-boot
- libraries/ghc-internal/src/GHC/Internal/Unicode.hs
- libraries/ghc-internal/src/GHC/Internal/Unicode/Version.hs
- libraries/ghc-internal/tools/ucd2haskell/exe/UCD2Haskell/ModuleGenerators.hs
Changes:
| ... | ... | @@ -44,3 +44,4 @@ module GHC.Unicode |
| 44 | 44 | ) where
|
| 45 | 45 | |
| 46 | 46 | import GHC.Internal.Unicode
|
| 47 | +import GHC.Internal.Unicode.Version |
| ... | ... | @@ -316,6 +316,7 @@ Library |
| 316 | 316 | GHC.Internal.TypeNats
|
| 317 | 317 | GHC.Internal.TypeNats.Internal
|
| 318 | 318 | GHC.Internal.Unicode
|
| 319 | + GHC.Internal.Unicode.Version
|
|
| 319 | 320 | GHC.Internal.Weak
|
| 320 | 321 | GHC.Internal.Weak.Finalize
|
| 321 | 322 | GHC.Internal.Word
|
| ... | ... | @@ -381,7 +382,6 @@ Library |
| 381 | 382 | GHC.Internal.Unicode.Char.UnicodeData.SimpleLowerCaseMapping
|
| 382 | 383 | GHC.Internal.Unicode.Char.UnicodeData.SimpleTitleCaseMapping
|
| 383 | 384 | GHC.Internal.Unicode.Char.UnicodeData.SimpleUpperCaseMapping
|
| 384 | - GHC.Internal.Unicode.Version
|
|
| 385 | 385 | GHC.Internal.System.Environment.ExecutablePath
|
| 386 | 386 | |
| 387 | 387 |
| 1 | -{-# LANGUAGE NoImplicitPrelude #-}
|
|
| 2 | - |
|
| 3 | -module GHC.Internal.Data.Version
|
|
| 4 | - ( Version
|
|
| 5 | - , makeVersion
|
|
| 6 | - ) where
|
|
| 7 | - |
|
| 8 | -import GHC.Internal.Types
|
|
| 9 | - |
|
| 10 | - |
|
| 11 | --- The generated module GHC.Internal.Unicode.Version depends on
|
|
| 12 | --- GHC.Internal.Base.build via built-in list syntax, and its only
|
|
| 13 | --- import is this hs-boot file, so until someone fixes the generator,
|
|
| 14 | --- this import has to stay here to ensure sound build ordering. See also
|
|
| 15 | --- W1 of Note [Tracking dependencies on primitives] in GHC.Internal.Base.
|
|
| 16 | -import GHC.Internal.Base ()
|
|
| 17 | - |
|
| 18 | -data Version
|
|
| 19 | - |
|
| 20 | -makeVersion :: [Int] -> Version |
| ... | ... | @@ -20,7 +20,6 @@ |
| 20 | 20 | -----------------------------------------------------------------------------
|
| 21 | 21 | |
| 22 | 22 | module GHC.Internal.Unicode (
|
| 23 | - unicodeVersion,
|
|
| 24 | 23 | GeneralCategory (..), generalCategory,
|
| 25 | 24 | isAscii, isLatin1, isControl,
|
| 26 | 25 | isAsciiUpper, isAsciiLower,
|
| ... | ... | @@ -36,7 +35,6 @@ import GHC.Internal.Real |
| 36 | 35 | import GHC.Internal.Enum ( Enum (..), Bounded (..) )
|
| 37 | 36 | import GHC.Internal.Ix ( Ix (..) )
|
| 38 | 37 | import GHC.Internal.Num
|
| 39 | -import GHC.Internal.Unicode.Version
|
|
| 40 | 38 | import qualified GHC.Internal.Unicode.Char.DerivedCoreProperties as DCP
|
| 41 | 39 | import qualified GHC.Internal.Unicode.Char.UnicodeData.GeneralCategory as GC
|
| 42 | 40 | import qualified GHC.Internal.Unicode.Char.UnicodeData.SimpleLowerCaseMapping as C
|
| ... | ... | @@ -15,7 +15,7 @@ module GHC.Internal.Unicode.Version |
| 15 | 15 | (unicodeVersion)
|
| 16 | 16 | where
|
| 17 | 17 | |
| 18 | -import {-# SOURCE #-} GHC.Internal.Data.Version
|
|
| 18 | +import GHC.Internal.Data.Version
|
|
| 19 | 19 | |
| 20 | 20 | -- | Version of Unicode standard used by @base@:
|
| 21 | 21 | -- [17.0.0](https://www.unicode.org/versions/Unicode17.0.0/).
|
| ... | ... | @@ -144,7 +144,7 @@ genUnicodeVersion outdir = do |
| 144 | 144 | , "(unicodeVersion)"
|
| 145 | 145 | , "where"
|
| 146 | 146 | , ""
|
| 147 | - , "import {-# SOURCE #-} GHC.Internal.Data.Version"
|
|
| 147 | + , "import GHC.Internal.Data.Version"
|
|
| 148 | 148 | , ""
|
| 149 | 149 | , "-- | Version of Unicode standard used by @base@:"
|
| 150 | 150 | , "-- [" <> BB.string7 version <> "](https://www.unicode.org/versions/Unicode" <> BB.string7 version <> "/)."
|