Refactor decomposition and composition.

composewell · Jun 19, 2022 · 6c484c8 · 6c484c8
1 parent 916ea7c
commit 6c484c8
Show file tree

Hide file tree

Showing 5 changed files with 284 additions and 229 deletions.
diff --git a/Data/Text/Normalize.hs b/Data/Text/Normalize.hs
@@ -16,7 +16,6 @@ module Data.Text.Normalize
       NormalizationMode(..)
     -- * Normalization API
     , normalize
-    , normalizeQC
     ) where
 
 import Data.Text (Text)
@@ -25,9 +24,8 @@ import Data.Unicode.Types (NormalizationMode(..))
 -- Internal modules
 import Data.Unicode.Internal.NormalizeStream
     ( DecomposeMode(..)
-    , normalizeQC
     , stream
-    , unstream
+    , unstreamD
     , unstreamC
     )
 
@@ -36,7 +34,7 @@ import Data.Unicode.Internal.NormalizeStream
 normalize :: NormalizationMode -> Text -> Text
 normalize mode =
     case mode of
-      NFD  -> (unstream Canonical) . stream
-      NFKD -> (unstream Kompat) . stream
-      NFC  -> (unstreamC Canonical) . stream
-      NFKC -> (unstreamC Kompat) . stream
+      NFD  -> unstreamD Canonical . stream
+      NFKD -> unstreamD Kompat    . stream
+      NFC  -> unstreamC Canonical . stream
+      NFKC -> unstreamC Kompat    . stream