master...e9b2bf1 · text

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

since splitsnapshots

unifiedsplit

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

107import qualified Data.List as L

108import qualified Prelude as P

109import Data.Bits (shiftL)

110−import Data.Char (isLetter)

110+import Data.Char (isLetter, isSpace)

111import Data.Int (Int64)

112import Data.Text.Internal.Fusion.Types

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

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

462 where

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

464 case next0 s of

465− Done -> Done

465+ Done -> Done

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

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

467 Yield c s'

468− | letter' -> if letter

468+ | nonSpace -> if letter

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

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

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

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

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

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

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

472− where letter' = isLetter c

473+ letter' = isLetter c

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

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

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

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

475

476

476data Justify i s = Just1 !i !s

477data Justify i s = Just1 !i !s

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

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

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

69

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

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

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

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

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

73−-- is case insensitive.

73+-- This function is case insensitive.

74--

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

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

Data/Text/Read.hs+3−3

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

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

68

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

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

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

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

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

72−-- is case insensitive.

72+-- This function is case insensitive.

73--

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

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

tests/Tests/Properties.hs+4−1

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

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

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

328 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

329

331

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

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

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

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

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

1030 testProperty "tl_toLower_lower" tl_toLower_lower,

1032 testProperty "tl_toLower_lower" tl_toLower_lower,

1031 testProperty "t_toUpper_length" t_toUpper_length,

1033 testProperty "t_toUpper_length" t_toUpper_length,

1032 testProperty "t_toUpper_upper" t_toUpper_upper,

1034 testProperty "t_toUpper_upper" t_toUpper_upper,

1033− testProperty "tl_toUpper_upper" tl_toUpper_upper

1035+ testProperty "tl_toUpper_upper" tl_toUpper_upper,

1036+ testProperty "t_toTitle_title" t_toTitle_title

1034 ],

1037 ],

1035

1038

1036 testGroup "justification" [

1039 testGroup "justification" [

tests/text-tests.cabal+17−2

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

20 default: False

21 manual: True

22

23+flag bytestring-builder

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

25+ default: False

26+ manual: False

27+

23executable text-tests

28executable text-tests

24 main-is: Tests.hs

29 main-is: Tests.hs

25

30

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

48 HUnit >= 1.2,

53 HUnit >= 1.2,

49 QuickCheck >= 2.7,

54 QuickCheck >= 2.7,

50 base == 4.*,

55 base == 4.*,

51− bytestring,

52 deepseq,

56 deepseq,

53 directory,

57 directory,

54 quickcheck-unicode,

58 quickcheck-unicode,

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

58 test-framework-quickcheck2 >= 0.2,

62 test-framework-quickcheck2 >= 0.2,

59 text-tests

63 text-tests

60

64

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+

61executable text-tests-stdio

71executable text-tests-stdio

62 main-is: Tests/IO.hs

72 main-is: Tests/IO.hs

63

73

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

137 array,

147 array,

138 base == 4.*,

148 base == 4.*,

139 binary,

149 binary,

140− bytestring,

141 deepseq,

150 deepseq,

142 ghc-prim,

151 ghc-prim,

143 integer-gmp

152 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