From 45e21892bcd25103b589801f114c5153250baab3 Mon Sep 17 00:00:00 2001 From: Ranjeet Ranjan Date: Sun, 11 Dec 2022 00:23:43 +0530 Subject: [PATCH] Rename unicode internal modules (#2164) --- .hlint.yaml | 2 +- benchmark/Streamly/Benchmark/Unicode/Stream.hs | 2 +- .../Streamly/Internal/Unicode/{Array/Char.hs => Array.hs} | 6 +++--- core/src/Streamly/Internal/Unicode/{Char => }/Parser.hs | 4 ++-- core/src/Streamly/Internal/Unicode/String.hs | 2 +- core/src/Streamly/Unicode/Parser.hs | 2 +- core/src/Streamly/Unicode/Stream.hs | 2 +- core/streamly-core.cabal | 4 ++-- test/Streamly/Test/Unicode/Stream.hs | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename core/src/Streamly/Internal/Unicode/{Array/Char.hs => Array.hs} (94%) rename core/src/Streamly/Internal/Unicode/{Char => }/Parser.hs (98%) diff --git a/.hlint.yaml b/.hlint.yaml index 0cddd3572..8e4954744 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -33,7 +33,7 @@ - ignore: {name: "Use ++", within: Stream.Reduce} - ignore: {name: "Use ++", within: Stream.Split} - ignore: {name: "Redundant bracket", within: Stream.Split} -- ignore: {name: "Use isDigit", within: Streamly.Internal.Unicode.Char.Parser} +- ignore: {name: "Use isDigit", within: Streamly.Internal.Unicode.Parser} # Specify additional command line arguments # diff --git a/benchmark/Streamly/Benchmark/Unicode/Stream.hs b/benchmark/Streamly/Benchmark/Unicode/Stream.hs index e51d29c05..b162a3eca 100644 --- a/benchmark/Streamly/Benchmark/Unicode/Stream.hs +++ b/benchmark/Streamly/Benchmark/Unicode/Stream.hs @@ -28,7 +28,7 @@ import qualified Streamly.Data.Fold as Fold import qualified Streamly.Internal.Data.Stream.IsStream as Stream import qualified Streamly.Internal.Data.Unfold as Unfold import qualified Streamly.Internal.FileSystem.Handle as Handle -import qualified Streamly.Internal.Unicode.Array.Char as UnicodeArr +import qualified Streamly.Internal.Unicode.Array as UnicodeArr import qualified Streamly.Internal.Unicode.Stream as Unicode import Gauge hiding (env) diff --git a/core/src/Streamly/Internal/Unicode/Array/Char.hs b/core/src/Streamly/Internal/Unicode/Array.hs similarity index 94% rename from core/src/Streamly/Internal/Unicode/Array/Char.hs rename to core/src/Streamly/Internal/Unicode/Array.hs index 6edc89f82..804609aed 100644 --- a/core/src/Streamly/Internal/Unicode/Array/Char.hs +++ b/core/src/Streamly/Internal/Unicode/Array.hs @@ -1,5 +1,5 @@ -- | --- Module : Streamly.Internal.Unicode.Array.Char +-- Module : Streamly.Internal.Unicode.Array -- Copyright : (c) 2018 Composewell Technologies -- -- License : BSD-3-Clause @@ -12,7 +12,7 @@ -- This provides random access and the length of the string in O(1). Also, -- better append performance. -- -module Streamly.Internal.Unicode.Array.Char +module Streamly.Internal.Unicode.Array ( -- * Streams of Strings lines @@ -37,7 +37,7 @@ import Prelude hiding (String, lines, words, unlines, unwords) -- >>> import Prelude hiding (String, lines, words, unlines, unwords) -- >>> import qualified Streamly.Data.Stream as Stream -- >>> import qualified Streamly.Data.Fold as Fold --- >>> import qualified Streamly.Internal.Unicode.Array.Char as Unicode +-- >>> import qualified Streamly.Internal.Unicode.Array as Unicode -- | Break a string up into a stream of strings at newline characters. -- The resulting strings do not contain newlines. diff --git a/core/src/Streamly/Internal/Unicode/Char/Parser.hs b/core/src/Streamly/Internal/Unicode/Parser.hs similarity index 98% rename from core/src/Streamly/Internal/Unicode/Char/Parser.hs rename to core/src/Streamly/Internal/Unicode/Parser.hs index 6615ea78a..72d4782ae 100644 --- a/core/src/Streamly/Internal/Unicode/Char/Parser.hs +++ b/core/src/Streamly/Internal/Unicode/Parser.hs @@ -1,5 +1,5 @@ -- | --- Module : Streamly.Internal.Unicode.Char.Parser +-- Module : Streamly.Internal.Unicode.Parser -- Copyright : (c) 2021 Composewell Technologies -- License : BSD-3-Clause -- Maintainer : streamly@composewell.com @@ -10,7 +10,7 @@ -- "Streamly.Unicode.Stream" module to convert an input byte stream to a -- Unicode Char stream and then use these parsers on the Char stream. -module Streamly.Internal.Unicode.Char.Parser +module Streamly.Internal.Unicode.Parser ( -- * Generic char diff --git a/core/src/Streamly/Internal/Unicode/String.hs b/core/src/Streamly/Internal/Unicode/String.hs index ce49a5500..4fc6feaf4 100644 --- a/core/src/Streamly/Internal/Unicode/String.hs +++ b/core/src/Streamly/Internal/Unicode/String.hs @@ -47,7 +47,7 @@ import qualified Streamly.Data.Fold as Fold import qualified Streamly.Internal.Data.Parser as Parser (some, many, takeWhile1) import qualified Streamly.Data.Stream as Stream (fromList, parse) -import qualified Streamly.Internal.Unicode.Char.Parser as Parser +import qualified Streamly.Internal.Unicode.Parser as Parser -- $setup -- >>> :m diff --git a/core/src/Streamly/Unicode/Parser.hs b/core/src/Streamly/Unicode/Parser.hs index f8c9b21a9..09383acbb 100644 --- a/core/src/Streamly/Unicode/Parser.hs +++ b/core/src/Streamly/Unicode/Parser.hs @@ -52,4 +52,4 @@ module Streamly.Unicode.Parser ) where -import Streamly.Internal.Unicode.Char.Parser +import Streamly.Internal.Unicode.Parser diff --git a/core/src/Streamly/Unicode/Stream.hs b/core/src/Streamly/Unicode/Stream.hs index f64f85ecb..a393d24de 100644 --- a/core/src/Streamly/Unicode/Stream.hs +++ b/core/src/Streamly/Unicode/Stream.hs @@ -68,7 +68,7 @@ -- -- Some experimental APIs to conveniently process text using the -- @Array Char@ represenation directly can be found in --- "Streamly.Internal.Unicode.Array.Char". +-- "Streamly.Internal.Unicode.Array". -- XXX an unpinned array representation can be useful to store short and short -- lived strings in memory. diff --git a/core/streamly-core.cabal b/core/streamly-core.cabal index 6407f46fd..7437d1593 100644 --- a/core/streamly-core.cabal +++ b/core/streamly-core.cabal @@ -334,8 +334,8 @@ library -- streamly-unicode-core , Streamly.Internal.Unicode.Stream , Streamly.Internal.Unicode.String - , Streamly.Internal.Unicode.Char.Parser - , Streamly.Internal.Unicode.Array.Char + , Streamly.Internal.Unicode.Parser + , Streamly.Internal.Unicode.Array -- Filesystem/IO , Streamly.Internal.FileSystem.Handle diff --git a/test/Streamly/Test/Unicode/Stream.hs b/test/Streamly/Test/Unicode/Stream.hs index f7ec17d55..b3a6588ad 100644 --- a/test/Streamly/Test/Unicode/Stream.hs +++ b/test/Streamly/Test/Unicode/Stream.hs @@ -24,7 +24,7 @@ import qualified Streamly.Prelude as S import qualified Streamly.Internal.Data.Stream.IsStream as S import qualified Streamly.Unicode.Stream as SS import qualified Streamly.Internal.Unicode.Stream as IUS -import qualified Streamly.Internal.Unicode.Array.Char as IUA +import qualified Streamly.Internal.Unicode.Array as IUA import qualified Test.Hspec as H import Test.Hspec.QuickCheck