e9b2bf1..master · text

git.iko.soy/text

5 files changed+18−37

unifiedsplit

Data/Text/Internal/Fusion/Common.hs+9−10 Data/Text/Lazy/Read.hs+3−3 Data/Text/Read.hs+3−3 tests/Tests/Properties.hs+1−4 tests/text-tests.cabal+2−17

Data/Text/Internal/Fusion/Common.hs+9−10

@@ -107,7 +107,7 @@ import Prelude (Bool(..), Char, Eq(..), Int, Integral, Maybe(..),

107107import qualified Data.List as L

108108import qualified Prelude as P

109109import Data.Bits (shiftL)

110−import Data.Char (isLetter, isSpace)

110+import Data.Char (isLetter)

111111import Data.Int (Int64)

112112import Data.Text.Internal.Fusion.Types

113113import Data.Text.Internal.Fusion.CaseMapping (foldMapping, lowerMapping, titleMapping,

@@ -462,16 +462,15 @@ toTitle (Stream next0 s0 len) = Stream next (CC (False :*: s0) '\0' '\0') len

462462 where

463463 next (CC (letter :*: s) '\0' _) =

464464 case next0 s of

465− Done -> Done

466− Skip s' -> Skip (CC (letter :*: s') '\0' '\0')

465+ Done -> Done

466+ Skip s' -> Skip (CC (letter :*: s') '\0' '\0')

467467 Yield c s'

468− | nonSpace -> if letter

469− then lowerMapping c (nonSpace :*: s')

470− else titleMapping c (letter' :*: s')

471− | otherwise -> Yield c (CC (letter' :*: s') '\0' '\0')

472− where nonSpace = P.not (isSpace c)

473− letter' = isLetter c

474− next (CC s a b) = Yield a (CC s b '\0')

468+ | letter' -> if letter

469+ then lowerMapping c (letter' :*: s')

470+ else titleMapping c (letter' :*: s')

471+ | otherwise -> Yield c (CC (letter' :*: s') '\0' '\0')

472+ where letter' = isLetter c

473+ next (CC s a b) = Yield a (CC s b '\0')

475474{-# INLINE [0] toTitle #-}

476475

477476data Justify i s = Just1 !i !s

Data/Text/Lazy/Read.hs+3−3

@@ -68,9 +68,9 @@ decimal txt

6868 go n d = (n * 10 + fromIntegral (digitToInt d))

6969

7070-- | Read a hexadecimal integer, consisting of an optional leading

71−-- @\"0x\"@ followed by at least one hexadecimal digit. Input is

72−-- consumed until a non-hex-digit or end of string is reached.

73−-- This function is case insensitive.

71+-- @\"0x\"@ followed by at least one decimal digit. Input is consumed

72+-- until a non-hex-digit or end of string is reached. This function

73+-- is case insensitive.

7474--

7575-- This function does not handle leading sign characters. If you need

7676-- to handle signed input, use @'signed' 'hexadecimal'@.

Data/Text/Read.hs+3−3

@@ -67,9 +67,9 @@ decimal txt

6767 go n d = (n * 10 + fromIntegral (digitToInt d))

6868

6969-- | Read a hexadecimal integer, consisting of an optional leading

70−-- @\"0x\"@ followed by at least one hexadecimal digit. Input is

71−-- consumed until a non-hex-digit or end of string is reached.

72−-- This function is case insensitive.

70+-- @\"0x\"@ followed by at least one decimal digit. Input is consumed

71+-- until a non-hex-digit or end of string is reached. This function

72+-- is case insensitive.

7373--

7474-- This function does not handle leading sign characters. If you need

7575-- to handle signed input, use @'signed' 'hexadecimal'@.

tests/Tests/Properties.hs+1−4

@@ -326,8 +326,6 @@ t_toUpper_upper t = p (T.toUpper t) >= p t

326326 where p = T.length . T.filter isUpper

327327tl_toUpper_upper t = p (TL.toUpper t) >= p t

328328 where p = TL.length . TL.filter isUpper

329−t_toTitle_title t = all (<= 1) (caps t)

330− where caps = fmap (T.length . T.filter isUpper) . T.words . T.toTitle

331329

332330justifyLeft k c xs = xs ++ L.replicate (k - length xs) c

333331justifyRight m n xs = L.replicate (m - length xs) n ++ xs

@@ -1032,8 +1030,7 @@ tests =

10321030 testProperty "tl_toLower_lower" tl_toLower_lower,

10331031 testProperty "t_toUpper_length" t_toUpper_length,

10341032 testProperty "t_toUpper_upper" t_toUpper_upper,

1035− testProperty "tl_toUpper_upper" tl_toUpper_upper,

1036− testProperty "t_toTitle_title" t_toTitle_title

1033+ testProperty "tl_toUpper_upper" tl_toUpper_upper

10371034 ],

10381035

10391036 testGroup "justification" [

tests/text-tests.cabal+2−17

@@ -20,11 +20,6 @@ flag hpc

2020 default: False

2121 manual: True

2222

23−flag bytestring-builder

24− description: Depend on the bytestring-builder package for backwards compatibility.

25− default: False

26− manual: False

27−

2823executable text-tests

2924 main-is: Tests.hs

3025

@@ -53,6 +48,7 @@ executable text-tests

5348 HUnit >= 1.2,

5449 QuickCheck >= 2.7,

5550 base == 4.*,

51+ bytestring,

5652 deepseq,

5753 directory,

5854 quickcheck-unicode,

@@ -62,12 +58,6 @@ executable text-tests

6258 test-framework-quickcheck2 >= 0.2,

6359 text-tests

6460

65− if flag(bytestring-builder)

66− build-depends: bytestring >= 0.9 && < 0.10.4,

67− bytestring-builder >= 0.10.4

68− else

69− build-depends: bytestring >= 0.10.4

70−

7161executable text-tests-stdio

7262 main-is: Tests/IO.hs

7363

@@ -147,12 +137,7 @@ library

147137 array,

148138 base == 4.*,

149139 binary,

140+ bytestring,

150141 deepseq,

151142 ghc-prim,

152143 integer-gmp

153−

154− if flag(bytestring-builder)

155− build-depends: bytestring >= 0.9 && < 0.10.4,

156− bytestring-builder >= 0.10.4

157− else

158− build-depends: bytestring >= 0.10.4