Merge pull request #76 from Bodigrim/text-2.0

Support text-2.0

Author: Bodigrim

Data/Unicode/Internal/NormalizeStream.hs

@@ -1,5 +1,6 @@
 {-# OPTIONS_GHC -funbox-strict-fields #-}
 {-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE TupleSections #-}
 -- |
@@ -22,21 +23,28 @@ module Data.Unicode.Internal.NormalizeStream
     )
     where
 
-import Data.Bits (shiftR)
 import Data.Char (chr, ord)
 import GHC.ST (ST(..))
 import GHC.Types (SPEC(..))
 
 import qualified Data.Text.Array as A
 import qualified Unicode.Char as UC
 
+#if MIN_VERSION_text(2,0,0)
+import Data.Text.Internal.Fusion (stream)
+#else
+import Data.Bits (shiftR)
+import Data.Text.Internal.Unsafe.Char (unsafeChr)
+import Data.Text.Internal.Fusion.Size (betweenSize)
+import Data.Text.Internal.Encoding.Utf16 (chr2)
+#endif
+
 -- Internal modules
 import Data.Text.Internal (Text(..))
-import Data.Text.Internal.Fusion.Size (betweenSize, upperBound)
+import Data.Text.Internal.Fusion.Size (upperBound)
 import Data.Text.Internal.Fusion.Types (Step(..), Stream(..))
 import Data.Text.Internal.Private (runText)
-import Data.Text.Internal.Unsafe.Char (unsafeChr, unsafeWrite)
-import Data.Text.Internal.Encoding.Utf16 (chr2)
+import Data.Text.Internal.Unsafe.Char (unsafeWrite)
 
 -------------------------------------------------------------------------------
 -- Reorder buffer to hold characters till the next starter boundary
@@ -142,6 +150,7 @@ decomposeChar mode marr index reBuf ch
             n <- unsafeWrite arr j c
             return (j + n, Empty)
 
+#if !MIN_VERSION_text(2,0,0)
 -- | /O(n)/ Convert a 'Text' into a 'Stream Char'.
 stream :: Text -> Stream Char
 stream (Text arr off len) = Stream next off (betweenSize (len `shiftR` 1) len)
@@ -158,6 +167,7 @@ stream (Text arr off len) = Stream next off (betweenSize (len `shiftR` 1) len)
             n  = A.unsafeIndex arr i
             n2 = A.unsafeIndex arr (i + 1)
 {-# INLINE [0] stream #-}
+#endif
 
 -- | /O(n)/ Convert a 'Stream Char' into a decompose-normalized 'Text'.
 unstream :: UC.DecomposeMode -> Stream Char -> Text

unicode-transforms.cabal

@@ -89,7 +89,7 @@ library
 
     -- We depend on a lot of internal modules in text. We keep the upper bound
     -- inclusive of the latest stable version.
-    , text >= 1.1.1 && <= 1.2.4.1
+    , text >=1.1.1 && <=1.2.5.0 || >=2.0 && <2.1
   if flag(dev)
     ghc-options: -O0
   else
@@ -110,7 +110,7 @@ test-suite extras
       QuickCheck >=2.1 && <2.15
     , base >=4.7 && <5
     , deepseq >=1.1 && <1.5
-    , text >=1.1.1 && <1.3
+    , text
     , unicode-transforms
   if flag(dev)
     ghc-options: -O0
@@ -134,7 +134,7 @@ test-suite quickcheck
     , base >=4.7 && <5
     , deepseq >=1.1 && <1.5
     , hspec >= 2.0 && < 3
-    , text >=1.1.1 && <1.3
+    , text
     , unicode-transforms
   if flag(dev)
     ghc-options: -O0
@@ -158,7 +158,7 @@ test-suite ucd
       base >=4.7 && <5
     , getopt-generics >=0.11 && <0.14
     , split >=0.1 && <0.3
-    , text >=1.1.1 && <1.3
+    , text
     , unicode-transforms
   if flag(dev)
     ghc-options: -O0
@@ -180,7 +180,7 @@ benchmark bench
     , filepath >=1.0 && <2
     , path >=0.0.0 && <0.9
     , path-io >=0.1.0 && <1.7
-    , text >=1.1.1 && <1.3
+    , text
     , unicode-transforms
   if flag(use-gauge)
     build-depends: gauge >=0.2.0 && <0.3