diff --git a/Z-Data.cabal b/Z-Data.cabal --- a/Z-Data.cabal +++ b/Z-Data.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: Z-Data -version: 2.0.0.0 +version: 2.0.0.1 synopsis: Array, vector and text description: This package provides array, slice and text operations license: BSD-3-Clause @@ -302,7 +302,7 @@ cxx-options: -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600 else if os(osx) - extra-libraries: + extra-libraries: c++ pthread else diff --git a/Z/Data/Array/QQ.hs b/Z/Data/Array/QQ.hs --- a/Z/Data/Array/QQ.hs +++ b/Z/Data/Array/QQ.hs @@ -59,7 +59,7 @@ import Control.Monad import Data.Bits import Data.Char (ord) -import Data.Primitive.PrimArray +import Data.Primitive.PrimArray hiding (copyPtrToMutablePrimArray) import GHC.Exts import Data.Word import Data.Int diff --git a/Z/Data/Text/Base.hs b/Z/Data/Text/Base.hs --- a/Z/Data/Text/Base.hs +++ b/Z/Data/Text/Base.hs @@ -122,41 +122,41 @@ import Control.DeepSeq import Control.Exception -import Control.Monad.ST -import Control.Monad.Primitive import Control.Monad +import Control.Monad.Primitive +import Control.Monad.ST import Data.Bits -import Data.Char hiding (toLower, toUpper, toTitle) import qualified Data.CaseInsensitive as CI +import Data.Char hiding (toLower, toTitle, toUpper) import Data.Foldable (foldlM) -import Data.Hashable (Hashable(..)) +import Data.Hashable (Hashable (..)) +import Data.Int import qualified Data.List as List -import Data.Primitive.PrimArray +import Data.Primitive.PrimArray hiding (copyPtrToMutablePrimArray) import Data.Typeable -import Data.Int import Data.Word -import Foreign.C.Types (CSize(..)) +import Foreign.C.Types (CSize (..)) import GHC.Exts import GHC.Stack +import System.IO.Unsafe (unsafeDupablePerformIO) +import System.Random.Stateful (StatefulGen) import Z.Data.Array import Z.Data.ASCII (c2w, pattern DOUBLE_QUOTE) import Z.Data.Text.UTF8Codec import Z.Data.Text.UTF8Rewind -import Z.Data.Vector.Base (Bytes, PrimVector(..), c_strlen) import qualified Z.Data.Vector.Base as V +import Z.Data.Vector.Base (Bytes, PrimVector (..), c_strlen) import qualified Z.Data.Vector.Search as V -import System.Random.Stateful (StatefulGen) -import System.IO.Unsafe (unsafeDupablePerformIO) -import Prelude hiding (concat, concatMap, - elem, notElem, null, length, map, - foldl, foldl1, foldr, foldr1, - maximum, minimum, product, sum, - all, any, replicate, traverse) +import Prelude hiding (all, any, concat, concatMap, + elem, foldl, foldl1, foldr, foldr1, + length, map, maximum, minimum, + notElem, null, product, replicate, + sum, traverse) -import Test.QuickCheck.Arbitrary (Arbitrary(..), CoArbitrary(..)) -import Text.Read (Read(..)) +import Test.QuickCheck.Arbitrary (Arbitrary (..), CoArbitrary (..)) import Text.Collate hiding (collate) +import Text.Read (Read (..)) -- | 'Text' represented as UTF-8 encoded 'Bytes' -- @@ -750,7 +750,7 @@ -- | /O(n*m)/ 'cycleN' a text n times. cycleN :: Int -> Text -> Text {-# INLINE cycleN #-} -cycleN 0 _ = empty +cycleN 0 _ = empty cycleN n (Text v) = Text (V.cycleN n v) -------------------------------------------------------------------------------- diff --git a/Z/Data/Vector/Base.hs b/Z/Data/Vector/Base.hs --- a/Z/Data/Vector/Base.hs +++ b/Z/Data/Vector/Base.hs @@ -88,39 +88,39 @@ import Control.DeepSeq import Control.Exception -import qualified Control.Monad as M -import Control.Monad.ST +import qualified Control.Monad as M import Control.Monad.Primitive +import Control.Monad.ST import Data.Bits -import Data.Char (ord) -import qualified Data.Foldable as F -import Data.Kind (Type) -import Data.Hashable (Hashable(..)) -import Data.Hashable.Lifted (Hashable1(..), hashWithSalt1) -import qualified Data.List as List -import Data.List.NonEmpty (NonEmpty ((:|))) +import qualified Data.CaseInsensitive as CI +import Data.Char (ord) +import qualified Data.Foldable as F +import Data.Hashable (Hashable (..)) +import Data.Hashable.Lifted (Hashable1 (..), hashWithSalt1) +import Data.Kind (Type) +import qualified Data.List as List +import Data.List.NonEmpty (NonEmpty ((:|))) import Data.Maybe -import qualified Data.CaseInsensitive as CI -import Data.Primitive -import Data.Semigroup (Semigroup (..)) -import qualified Data.Traversable as T +import Data.Primitive hiding (copyPtrToMutablePrimArray) +import Data.Semigroup (Semigroup (..)) +import qualified Data.Traversable as T import Foreign.C import GHC.Exts import GHC.Stack import GHC.Word -import Prelude hiding (concat, concatMap, mapM, mapM_, - elem, notElem, null, length, map, - foldl, foldl1, foldr, foldr1, - maximum, minimum, product, sum, - all, any, replicate, traverse) -import Test.QuickCheck.Arbitrary (Arbitrary(..), CoArbitrary(..)) -import Test.QuickCheck.Gen (chooseInt) -import Text.Read (Read(..)) -import System.Random.Stateful (StatefulGen) -import System.IO.Unsafe (unsafeDupablePerformIO) +import Prelude hiding (all, any, concat, concatMap, + elem, foldl, foldl1, foldr, foldr1, + length, map, mapM, mapM_, maximum, + minimum, notElem, null, product, + replicate, sum, traverse) +import System.IO.Unsafe (unsafeDupablePerformIO) +import System.Random.Stateful (StatefulGen) +import Test.QuickCheck.Arbitrary (Arbitrary (..), CoArbitrary (..)) +import Test.QuickCheck.Gen (chooseInt) +import Text.Read (Read (..)) import Z.Data.Array -import Z.Data.ASCII (toLower) +import Z.Data.ASCII (toLower) -- | Typeclass for box and unboxed vectors, which are created by slicing arrays. -- @@ -489,7 +489,7 @@ let !(I# n#) = min lA lB r = I# (compareByteArrays# baA# sA# baB# sB# n#) in case r `compare` 0 of - EQ -> lA `compare` lB + EQ -> lA `compare` lB x -> x instance Prim a => Semigroup (PrimVector a) where @@ -1511,4 +1511,3 @@ foreign import ccall unsafe "hs_count_ba" c_count_ba :: ByteArray# -> Int -> Int -> Word8 -> IO Int -