diff options
author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-10-11 12:35:28 +0200 |
---|---|---|
committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-10-11 12:35:31 +0200 |
commit | 1942fd6a8414d5664f3c9f6d1e6e39ca5265ef21 (patch) | |
tree | f73fc001fe036dd4e53210d8d7b3ac1ab85642a8 /libraries/base/Text | |
parent | 034b2035d6099c8a253bb1fbd1864001a27b44d6 (diff) | |
download | haskell-1942fd6a8414d5664f3c9f6d1e6e39ca5265ef21.tar.gz |
Refactor to avoid need for `Unicode.hs-boot`
This avoids the import-cycle caused by the import of `Foreign.C.Types`
by using `Int` instead of `CInt` for the Unicode classification
functions. This refactoring also allows to remove a couple of
`fromIntegral`s.
Reviewed By: rwbarton, ekmett
Differential Revision: https://phabricator.haskell.org/D328
Diffstat (limited to 'libraries/base/Text')
-rw-r--r-- | libraries/base/Text/ParserCombinators/ReadP.hs | 2 | ||||
-rw-r--r-- | libraries/base/Text/Read/Lex.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libraries/base/Text/ParserCombinators/ReadP.hs b/libraries/base/Text/ParserCombinators/ReadP.hs index 4de0908b23..034411d6bf 100644 --- a/libraries/base/Text/ParserCombinators/ReadP.hs +++ b/libraries/base/Text/ParserCombinators/ReadP.hs @@ -72,7 +72,7 @@ module Text.ParserCombinators.ReadP ) where -import {-# SOURCE #-} GHC.Unicode ( isSpace ) +import GHC.Unicode ( isSpace ) import GHC.List ( replicate, null ) import GHC.Base hiding ( many ) diff --git a/libraries/base/Text/Read/Lex.hs b/libraries/base/Text/Read/Lex.hs index cdbcf4ad1d..74cf9508e6 100644 --- a/libraries/base/Text/Read/Lex.hs +++ b/libraries/base/Text/Read/Lex.hs @@ -39,7 +39,7 @@ import GHC.Base import GHC.Char import GHC.Num( Num(..), Integer ) import GHC.Show( Show(..) ) -import {-# SOURCE #-} GHC.Unicode ( isSpace, isAlpha, isAlphaNum ) +import GHC.Unicode( isSpace, isAlpha, isAlphaNum ) import GHC.Real( Rational, (%), fromIntegral, toInteger, (^) ) import GHC.List |