SMP support

Author: phadej

Data/Text/Buildable.hs

@@ -20,11 +20,11 @@ module Data.Text.Buildable
 import Data.Void (Void, absurd)
 #endif
 
+import Data.Semigroup ((<>))
 import Data.Monoid (mempty)
 import Data.Int (Int8, Int16, Int32, Int64)
 import Data.Fixed (Fixed, HasResolution, showFixed)
 import Data.Ratio (Ratio, denominator, numerator)
-import Data.Text.Format.Functions ((<>))
 import Data.Text.Format.Int (decimal, hexadecimal)
 import Data.Text.Format.Types (Hex(..), Shown(..))
 import Data.Text.Lazy.Builder

Data/Text/Format.hs

@@ -35,8 +35,8 @@ module Data.Text.Format
     , shortest
     ) where
 
+import Data.Semigroup ((<>))
 import Control.Monad.IO.Class (MonadIO(liftIO))
-import Data.Text.Format.Functions ((<>))
 import Data.Text.Format.Params (Params(..))
 import Data.Text.Format.Types.Internal (Format(..), Only(..), Shown(..))
 import Data.Text.Format.Types.Internal (Hex(..))

Data/Text/Format/Functions.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE MagicHash #-}
 
 -- |
@@ -13,7 +14,7 @@
 
 module Data.Text.Format.Functions
     (
-      (<>)
+      (Data.Text.Format.Functions.<>)
     , i2d
     ) where
 
@@ -30,6 +31,7 @@ i2d (I# i#) = C# (chr# (ord# '0'# +# i#))
 -- left.
 (<>) :: Builder -> Builder -> Builder
 (<>) = mappend
+{-# DEPRECATED (<>) "Use <> from Data.Semigroup" #-}
 {-# INLINE (<>) #-}
 
 infixr 4 <>

Data/Text/Format/Int.hs

@@ -18,7 +18,8 @@ module Data.Text.Format.Int
 
 import Data.Int (Int8, Int16, Int32, Int64)
 import Data.Monoid (mempty)
-import Data.Text.Format.Functions ((<>), i2d)
+import Data.Semigroup ((<>))
+import Data.Text.Format.Functions (i2d)
 import Data.Text.Lazy.Builder
 import Data.Word (Word, Word8, Word16, Word32, Word64)
 import GHC.Base (quotInt, remInt)

Data/Text/Format/Types/Internal.hs

@@ -20,6 +20,7 @@ module Data.Text.Format.Types.Internal
     , Hex(..)
     ) where
 
+import Data.Semigroup (Semigroup (..))
 import Data.Monoid (Monoid(..))
 import Data.String (IsString(..))
 import Data.Text (Text)
@@ -46,9 +47,12 @@ import Data.Typeable (Typeable)
 newtype Format = Format { fromFormat :: Text }
     deriving (Eq, Ord, Typeable, Show)
 
+instance Semigroup Format where
+    Format a <> Format b = Format (a `mappend` b)
+
 instance Monoid Format where
-    Format a `mappend` Format b = Format (a `mappend` b)
     mempty = Format mempty
+    mappend = (<>)
 
 instance IsString Format where
     fromString = Format . fromString

text-format.cabal

@@ -1,5 +1,5 @@
 name:           text-format
-version:        0.3.1.1
+version:        0.3.2
 license:        BSD3
 license-file:   LICENSE
 homepage:       https://github.com/bos/text-format
@@ -8,14 +8,25 @@ category:       Text
 author:         Bryan O'Sullivan <[email protected]>
 maintainer:     Bryan O'Sullivan <[email protected]>
 stability:      experimental
-tested-with:    GHC == 7.0.3
 synopsis:       Text formatting
 cabal-version:  >= 1.8
 build-type:     Simple
 description:
     A text formatting library optimized for both ease of use and high
     performance.
 
+tested-with:
+  GHC == 7.0.4
+   || == 7.2.2
+   || == 7.4.2
+   || == 7.6.3
+   || == 7.8.4
+   || == 7.10.3
+   || == 8.0.2
+   || == 8.2.2
+   || == 8.4.3
+   || == 8.6.1
+
 extra-source-files:
     README.markdown
     benchmarks/Makefile
@@ -41,7 +52,8 @@ library
 
   build-depends:
     array,
-    base == 4.*,
+    base >=4.3 && <4.12,
+    integer-gmp >= 0.2,
     double-conversion >= 0.2.0.0,
     ghc-prim,
     old-locale,
@@ -57,11 +69,9 @@ library
 
   cpp-options: -DINTEGER_GMP
 
-  if impl(ghc >= 6.11)
-    build-depends: integer-gmp >= 0.2
-
-  if impl(ghc >= 6.9) && impl(ghc < 6.11)
-    build-depends: integer >= 0.1 && < 0.2
+  if !impl(ghc >= 8.0)
+    build-depends:
+      semigroups          >= 0.18.5  && < 0.19
 
 source-repository head
   type:     git