Merge pull request #22 from lpsmith/compat

Latest compat work. Thanks @lpsmith the code has become a lot smaller, which I like. One thing I noticed is that we should add a big disclaimer to the documentation pointing people to the proper bytestring builder, which they should use in new projects.
meiersi · Jan 30, 2015 · 722de5d · 722de5d
2 parents f482409 + 1869752
commit 722de5d
Show file tree

Hide file tree

Showing 28 changed files with 26 additions and 120 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/Blaze/ByteString/Builder.hs b/Blaze/ByteString/Builder.hs
@@ -6,7 +6,7 @@
 -- Module:      Blaze.ByteString.Builder
 -- Copyright:   (c) 2013 Leon P Smith
 -- License:     BSD3
--- Maintainer:  Leon P Smith <leon@melding-monads.com>
+-- Maintainer:  Simon Meier <iridcode@gmail.com>
 -- Stability:   experimental
 --
 -- "Blaze.ByteString.Builder" is the main module, which you should import as a user

diff --git a/Blaze/ByteString/Builder/ByteString.hs b/Blaze/ByteString/Builder/ByteString.hs
@@ -3,7 +3,7 @@
 -- Module:      Blaze.ByteString.Builder.ByteString
 -- Copyright:   (c) 2013 Leon P Smith
 -- License:     BSD3
--- Maintainer:  Leon P Smith <leon@melding-monads.com>
+-- Maintainer:  Simon Meier <iridcode@gmail.com>
 -- Stability:   experimental
 --
 -- 'Write's and 'B.Builder's for strict and lazy bytestrings.

diff --git a/Blaze/ByteString/Builder/Char/Utf8.hs b/Blaze/ByteString/Builder/Char/Utf8.hs
@@ -3,7 +3,7 @@
 -- Module:      Blaze.ByteString.Builder.Char.Utf8
 -- Copyright:   (c) 2013 Leon P Smith
 -- License:     BSD3
--- Maintainer:  Leon P Smith <leon@melding-monads.com>
+-- Maintainer:  Simon Meier <iridcode@gmail.com>
 -- Stability:   experimental
 --
 -- 'Write's and 'Builder's for serializing Unicode characters using the UTF-8

diff --git a/Blaze/ByteString/Builder/Char8.hs b/Blaze/ByteString/Builder/Char8.hs
@@ -3,7 +3,7 @@
 -- Module:      Blaze.ByteString.Builder.Char8
 -- Copyright:   (c) 2013 Leon P Smith
 -- License:     BSD3
--- Maintainer:  Leon P Smith <leon@melding-monads.com>
+-- Maintainer:  Simon Meier <iridcode@gmail.com>
 -- Stability:   experimental
 --
 -- //Note:// This package is intended for low-level use like implementing

diff --git a/Blaze/ByteString/Builder/Compat/Write.hs b/Blaze/ByteString/Builder/Compat/Write.hs
@@ -3,7 +3,7 @@
 -- Module:      Blaze.ByteString.Builder.Compat.Write
 -- Copyright:   (c) 2013 Leon P Smith
 -- License:     BSD3
--- Maintainer:  Leon P Smith <leon@melding-monads.com>
+-- Maintainer:  Simon Meier <iridcode@gmail.com>
 -- Stability:   experimental
 --
 -- Conversions from the new Prims to the old Writes.
@@ -21,11 +21,9 @@ import Data.ByteString.Builder.Prim.Internal
 import Blaze.ByteString.Builder.Internal.Write
 
 writePrimFixed :: FixedPrim a -> a -> Write
-writePrimFixed fe a = Write (size fe) (Poke wio)
-  where wio op = do
-           runF fe a op
-           return $! (op `plusPtr` size fe)
+writePrimFixed fe a = exactWrite (size fe) (runF fe a)
+{-# INLINE writePrimFixed #-}
 
 writePrimBounded :: BoundedPrim a -> a -> Write
-writePrimBounded be a = Write (sizeBound be) (Poke wio)
-  where wio = runB be a
+writePrimBounded be a = boundedWrite (sizeBound be) (Poke (runB be a))
+{-# INLINE writePrimBounded #-}
diff --git a/Blaze/ByteString/Builder/Html/Utf8.hs b/Blaze/ByteString/Builder/Html/Utf8.hs
@@ -8,7 +8,7 @@
 -- Module:      Blaze.ByteString.Builder.Html.Utf8
 -- Copyright:   (c) 2013 Leon P Smith
 -- License:     BSD3
--- Maintainer:  Leon P Smith <leon@melding-monads.com>
+-- Maintainer:  Simon Meier <iridcode@gmail.com>
 -- Stability:   experimental
 --
 -- 'Write's and 'Builder's for serializing HTML escaped and UTF-8 encoded
@@ -67,7 +67,7 @@ charUtf8HtmlEscaped =
     condB (== '<' ) (fixed4 ('&',('l',('t',';')))) $        -- &lt;
     condB (== '>' ) (fixed4 ('&',('g',('t',';')))) $        -- &gt;
     condB (== '&' ) (fixed5 ('&',('a',('m',('p',';'))))) $  -- &amp;
-    condB (== '"' ) (fixed5 ('&',('#',('3',('4',';'))))) $  -- &#34;
+    condB (== '"' ) (fixed6 ('&',('q',('u',('o',('t',';')))))) $  -- &#quot;
     condB (== '\'') (fixed5 ('&',('#',('3',('9',';'))))) $  -- &#39;
     condB (\c -> c >= ' ' || c == '\t' || c == '\n' || c == '\r')
           (P.liftFixedToBounded P.char7) $
@@ -81,6 +81,10 @@ charUtf8HtmlEscaped =
     fixed5 x = P.liftFixedToBounded $ const x >$<
       P.char7 >*< P.char7 >*< P.char7 >*< P.char7 >*< P.char7
 
+    {-# INLINE fixed6 #-}
+    fixed6 x = P.liftFixedToBounded $ const x >$<
+      P.char7 >*< P.char7 >*< P.char7 >*< P.char7 >*< P.char7 >*< P.char7
+
 -- | /O(n)/. Serialize a HTML escaped Unicode 'String' using the UTF-8
 -- encoding.
 --

diff --git a/Blaze/ByteString/Builder/Int.hs b/Blaze/ByteString/Builder/Int.hs
@@ -3,7 +3,7 @@
 -- Module:      Blaze.ByteString.Builder.Int
 -- Copyright:   (c) 2013 Leon P Smith
 -- License:     BSD3
--- Maintainer:  Leon P Smith <leon@melding-monads.com>
+-- Maintainer:  Simon Meier <iridcode@gmail.com>
 -- Stability:   experimental
 --
 -- 'Write's and 'Builder's for serializing integers.

diff --git a/Blaze/ByteString/Builder/Internal/Write.hs b/Blaze/ByteString/Builder/Internal/Write.hs
@@ -6,7 +6,7 @@
 --               (c) 2010 Jasper van der Jeugt
 -- License     : BSD3-style (see LICENSE)
 --
--- Maintainer  : Leon P Smith <leon@melding-monads.com>
+-- Maintainer  : Simon Meier <iridcode@gmail.com>
 -- Stability   : experimental
 -- Portability : tested on GHC only
 --
@@ -145,7 +145,7 @@ instance Monoid Write where
 {-# INLINE pokeN #-}
 pokeN :: Int
        -> (Ptr Word8 -> IO ()) -> Poke
-pokeN size io = Poke $ \op -> io op >> return (op `plusPtr` size)
+pokeN size io = Poke $ \op -> io op >> (return $! (op `plusPtr` size))
 
 
 -- | @exactWrite size io@ creates a bounded write that can later be converted to

diff --git a/Blaze/ByteString/Builder/Word.hs b/Blaze/ByteString/Builder/Word.hs
@@ -3,7 +3,7 @@
 -- Module:      Blaze.ByteString.Builder.Word
 -- Copyright:   (c) 2013 Leon P Smith
 -- License:     BSD3
--- Maintainer:  Leon P Smith <leon@melding-monads.com>
+-- Maintainer:  Simon Meier <iridcode@gmail.com>
 -- Stability:   experimental
 --
 -- 'Write's and 'Builder's for serializing words.

diff --git a/Data/ByteString/Builder.hs b/Data/ByteString/Builder.hs
diff --git a/Data/ByteString/Builder/ASCII.hs b/Data/ByteString/Builder/ASCII.hs
diff --git a/Data/ByteString/Builder/Extra.hs b/Data/ByteString/Builder/Extra.hs
diff --git a/Data/ByteString/Builder/Internal.hs b/Data/ByteString/Builder/Internal.hs
diff --git a/Data/ByteString/Builder/Prim.hs b/Data/ByteString/Builder/Prim.hs
diff --git a/Data/ByteString/Builder/Prim/ASCII.hs b/Data/ByteString/Builder/Prim/ASCII.hs
diff --git a/Data/ByteString/Builder/Prim/Binary.hs b/Data/ByteString/Builder/Prim/Binary.hs
diff --git a/Data/ByteString/Builder/Prim/Internal.hs b/Data/ByteString/Builder/Prim/Internal.hs
diff --git a/Data/ByteString/Builder/Prim/Internal/Base16.hs b/Data/ByteString/Builder/Prim/Internal/Base16.hs
diff --git a/Data/ByteString/Builder/Prim/Internal/Floating.hs b/Data/ByteString/Builder/Prim/Internal/Floating.hs
diff --git a/Data/ByteString/Builder/Prim/Internal/UncheckedShifts.hs b/Data/ByteString/Builder/Prim/Internal/UncheckedShifts.hs
diff --git a/Data/ByteString/Short.hs b/Data/ByteString/Short.hs
diff --git a/Data/ByteString/Short/Internal.hs b/Data/ByteString/Short/Internal.hs
diff --git a/Setup.hs b/Setup.hs
@@ -1,40 +1,2 @@
 import Distribution.Simple
-import Distribution.Simple.Setup
-import Distribution.Simple.LocalBuildInfo
-import Distribution.PackageDescription
-import Distribution.Version
-
--- This checks the direct dependency of the bytestring package being
--- compiled against to set the bytestring_has_itoa_c and
--- bytestring_has_builder flags accordingly.
-
-main = defaultMainWithHooks simpleUserHooks {
-    confHook = \pkg flags ->
-      if null (configConstraints flags)
-      then do
-        confHook simpleUserHooks pkg flags
-      else do
-        let bytestring_version =
-                case [ versionBranch v
-                     | (Dependency pkg ver)  <- configConstraints flags
-                     , pkg == PackageName "bytestring"
-                     , (Just v) <- [isSpecificVersion ver] ]
-                  of
-                     [v] -> v
-                     vs   -> error ("error detecting bytestring version  "  ++ show vs)
-
-        let has_itoa_c  = ( FlagName "bytestring_has_itoa_c"
-                          , bytestring_version >= [0,10]      )
-
-        let has_builder = ( FlagName "bytestring_has_builder"
-                          , bytestring_version >= [0,10,4]   )
-
-        let update fs gs =
-                 fs ++ [ g | g <- gs, not $ any (\f -> fst f == fst g) fs]
-
-        let flags' = flags { configConfigurationsFlags =
-                                update [has_itoa_c, has_builder]
-                                       (configConfigurationsFlags flags) }
-
-        confHook simpleUserHooks pkg flags'
-  }
+main = defaultMain
diff --git a/blaze-builder.cabal b/blaze-builder.cabal
@@ -27,7 +27,7 @@ Bug-Reports:         http://github.com/meiersi/blaze-builder/issues
 Stability:           Experimental
 
 Category:            Data
-Build-type:          Custom
+Build-type:          Simple
 Cabal-version:       >= 1.8
 
 Extra-source-files:
@@ -55,15 +55,7 @@ Source-repository head
   Type: git
   Location: https://github.com/meiersi/blaze-builder.git
 
--- Note that these flags are set by Setup.hs
-
-Flag bytestring_has_itoa_c
-  default: True
-  manual: True
-
-Flag bytestring_has_builder
-  default: True
-  manual: True
+-- Note that this flag is set by Setup.hs
 
 Library
   ghc-options:       -Wall
@@ -81,35 +73,12 @@ Library
                      Blaze.ByteString.Builder.Internal.Write
 
   build-depends:     base == 4.* ,
-                     bytestring >= 0.9 && < 1.0 ,
+                     bytestring >= 0.9 && < 1.0,
                      deepseq,
-                     text >= 0.10 && < 0.13
-
-  if !flag(bytestring_has_itoa_c)
-      c-sources: cbits/itoa.c
-
-
-  if !flag(bytestring_has_builder)
-      c-sources: cbits/fpstring.c
-      exposed-modules:
-                         Data.ByteString.Builder
-                         Data.ByteString.Builder.Extra
-                         Data.ByteString.Builder.Prim
-
-                         -- perhaps only exposed temporarily
-                         Data.ByteString.Builder.Internal
-                         Data.ByteString.Builder.Prim.Internal
-
-                         Data.ByteString.Short
-                         Data.ByteString.Short.Internal
+                     text >= 0.10
 
-      other-modules:
-                         Data.ByteString.Builder.ASCII
-                         Data.ByteString.Builder.Prim.Binary
-                         Data.ByteString.Builder.Prim.ASCII
-                         Data.ByteString.Builder.Prim.Internal.Floating
-                         Data.ByteString.Builder.Prim.Internal.UncheckedShifts
-                         Data.ByteString.Builder.Prim.Internal.Base16
+  if impl(ghc < 7.8)
+     build-depends:  bytestring-builder
 
 test-suite test
   type:           exitcode-stdio-1.0

diff --git a/bytestring b/bytestring
diff --git a/cbits/fpstring.c b/cbits/fpstring.c
diff --git a/cbits/itoa.c b/cbits/itoa.c