diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,30 @@ -MIT License +Copyright John Ky (c) 2016 -Copyright (c) 2016 John Ky +All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Author name here nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/app/Main.hs b/app/Main.hs --- a/app/Main.hs +++ b/app/Main.hs @@ -5,8 +5,11 @@ module Main where import qualified Data.ByteString as BS +import qualified Data.DList as DL +import Data.Function import qualified Data.Vector.Storable as DVS import Data.Word +import HaskellWorks.Data.BalancedParens.Simple import HaskellWorks.Data.Bits.BitShown import HaskellWorks.Data.FromByteString import HaskellWorks.Data.Json.Succinct.Cursor @@ -14,11 +17,8 @@ import HaskellWorks.Data.Json.LoadCursor import HaskellWorks.Data.Micro import HaskellWorks.Data.MQuery -import HaskellWorks.Data.Succinct.BalancedParens.Simple import HaskellWorks.Diagnostics.Time import Control.Monad -import qualified Data.DList as DL -import Data.Function readJson :: String -> IO (JsonCursor BS.ByteString (BitShown (DVS.Vector Word64)) (SimpleBalancedParens (DVS.Vector Word64))) readJson path = do diff --git a/bench/Main.hs b/bench/Main.hs --- a/bench/Main.hs +++ b/bench/Main.hs @@ -11,13 +11,13 @@ import qualified Data.Vector.Storable as DVS import Data.Word import Foreign +import HaskellWorks.Data.BalancedParens.Simple import HaskellWorks.Data.Bits.BitShown import HaskellWorks.Data.Conduit.List import HaskellWorks.Data.FromByteString import HaskellWorks.Data.Json.Conduit import HaskellWorks.Data.Json.Conduit.Blank import HaskellWorks.Data.Json.Succinct.Cursor -import HaskellWorks.Data.Succinct.BalancedParens.Simple import System.IO.MMap setupEnvJson :: FilePath -> IO BS.ByteString diff --git a/hw-json.cabal b/hw-json.cabal --- a/hw-json.cabal +++ b/hw-json.cabal @@ -1,9 +1,9 @@ name: hw-json -version: 0.3.0.0 -synopsis: Conduits for tokenizing streams. +version: 0.4.0.0 +synopsis: Memory efficient JSON parser description: Please see README.md homepage: http://github.com/haskell-works/hw-json#readme -license: MIT +license: BSD3 license-file: LICENSE author: John Ky maintainer: newhoggy@gmail.com @@ -33,14 +33,15 @@ , containers , criterion , dlist + , hw-balancedparens >= 0.0.0.1 , hw-bits >= 0.3.0.0 , hw-conduit , hw-diagnostics , hw-json , hw-mquery >= 0.1.0.0 , hw-parser - , hw-prim >= 0.3.0.5 - , hw-rankselect >= 0.5.0.0 + , hw-prim >= 0.4.0.0 + , hw-rankselect >= 0.6.0.0 , hw-rankselect-base >= 0.1.0.0 , mmap , mono-traversable @@ -86,13 +87,14 @@ , conduit , containers , dlist + , hw-balancedparens >= 0.0.0.1 , hw-bits >= 0.3.0.0 , hw-conduit , hw-diagnostics , hw-mquery >= 0.1.0.0 , hw-parser - , hw-prim >= 0.3.0.5 - , hw-rankselect >= 0.5.0.0 + , hw-prim >= 0.4.0.0 + , hw-rankselect >= 0.6.0.0 , hw-rankselect-base >= 0.1.0.0 , mmap , mono-traversable @@ -121,11 +123,12 @@ , containers , conduit , hspec - , hw-bits + , hw-balancedparens >= 0.0.0.1 + , hw-bits >= 0.3.0.0 , hw-conduit , hw-json - , hw-prim >= 0.3.0.5 - , hw-rankselect >= 0.5.0.0 + , hw-prim >= 0.4.0.0 + , hw-rankselect >= 0.6.0.0 , hw-rankselect-base >= 0.1.0.0 , mmap , parsec @@ -150,11 +153,12 @@ , bytestring , conduit , criterion - , hw-bits + , hw-balancedparens >= 0.0.0.1 + , hw-bits >= 0.3.0.0 , hw-conduit , hw-json - , hw-prim >= 0.3.0.5 - , hw-rankselect >= 0.5.0.0 + , hw-prim >= 0.4.0.0 + , hw-rankselect >= 0.6.0.0 , hw-rankselect-base >= 0.1.0.0 , mmap , resourcet diff --git a/src/HaskellWorks/Data/Json/LightJson.hs b/src/HaskellWorks/Data/Json/LightJson.hs --- a/src/HaskellWorks/Data/Json/LightJson.hs +++ b/src/HaskellWorks/Data/Json/LightJson.hs @@ -20,6 +20,7 @@ import Data.Word8 import HaskellWorks.Data.AtLeastSize import HaskellWorks.Data.Bits.BitWise +import qualified HaskellWorks.Data.BalancedParens as BP import HaskellWorks.Data.Drop import HaskellWorks.Data.Entry import HaskellWorks.Data.Json.CharLike @@ -33,7 +34,6 @@ import HaskellWorks.Data.RankSelect.Base.Rank1 import HaskellWorks.Data.RankSelect.Base.Select1 import HaskellWorks.Data.Row -import qualified HaskellWorks.Data.Succinct.BalancedParens as BP import HaskellWorks.Data.TreeCursor import HaskellWorks.Data.Uncons import Prelude hiding (drop) diff --git a/src/HaskellWorks/Data/Json/Load.hs b/src/HaskellWorks/Data/Json/Load.hs --- a/src/HaskellWorks/Data/Json/Load.hs +++ b/src/HaskellWorks/Data/Json/Load.hs @@ -26,6 +26,9 @@ import Foreign.ForeignPtr import Foreign.Ptr import Foreign.Storable +import HaskellWorks.Data.BalancedParens.RangeMinMax +import HaskellWorks.Data.BalancedParens.RangeMinMax2 +import HaskellWorks.Data.BalancedParens.Simple import HaskellWorks.Data.Bits.BitShown import HaskellWorks.Data.Decode import HaskellWorks.Data.FromByteString @@ -35,12 +38,9 @@ import HaskellWorks.Data.Json.Succinct.Index import HaskellWorks.Data.Json.Succinct.PartialIndex import HaskellWorks.Data.Json.Value -import HaskellWorks.Data.Succinct.BalancedParens.RangeMinMax -import HaskellWorks.Data.Succinct.BalancedParens.RangeMinMax2 -import HaskellWorks.Data.Succinct.BalancedParens.Simple -import HaskellWorks.Data.Succinct.RankSelect.Binary.CsPoppy -import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512 -import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512S +import HaskellWorks.Data.RankSelect.CsPoppy +import HaskellWorks.Data.RankSelect.Poppy512 +import HaskellWorks.Data.RankSelect.Poppy512S import HaskellWorks.Diagnostics.Time import System.IO import System.IO.MMap diff --git a/src/HaskellWorks/Data/Json/LoadCursor.hs b/src/HaskellWorks/Data/Json/LoadCursor.hs --- a/src/HaskellWorks/Data/Json/LoadCursor.hs +++ b/src/HaskellWorks/Data/Json/LoadCursor.hs @@ -24,6 +24,9 @@ import Foreign.ForeignPtr import Foreign.Ptr import Foreign.Storable +import HaskellWorks.Data.BalancedParens.RangeMinMax +import HaskellWorks.Data.BalancedParens.RangeMinMax2 +import HaskellWorks.Data.BalancedParens.Simple import HaskellWorks.Data.Bits.BitShown import HaskellWorks.Data.Decode import HaskellWorks.Data.FromByteString @@ -31,12 +34,9 @@ import HaskellWorks.Data.Json.Succinct.Cursor import HaskellWorks.Data.Json.Succinct.Index import HaskellWorks.Data.Json.Value -import HaskellWorks.Data.Succinct.BalancedParens.RangeMinMax -import HaskellWorks.Data.Succinct.BalancedParens.RangeMinMax2 -import HaskellWorks.Data.Succinct.BalancedParens.Simple -import HaskellWorks.Data.Succinct.RankSelect.Binary.CsPoppy -import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512 -import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512S +import HaskellWorks.Data.RankSelect.CsPoppy +import HaskellWorks.Data.RankSelect.Poppy512 +import HaskellWorks.Data.RankSelect.Poppy512S import HaskellWorks.Diagnostics.Time import System.IO import System.IO.MMap diff --git a/src/HaskellWorks/Data/Json/PartialValue.hs b/src/HaskellWorks/Data/Json/PartialValue.hs --- a/src/HaskellWorks/Data/Json/PartialValue.hs +++ b/src/HaskellWorks/Data/Json/PartialValue.hs @@ -26,6 +26,7 @@ import qualified Data.ByteString as BS import qualified Data.DList as DL import HaskellWorks.Data.AtLeastSize +import qualified HaskellWorks.Data.BalancedParens as BP import HaskellWorks.Data.Bits.BitWise import HaskellWorks.Data.Entry import HaskellWorks.Data.Micro @@ -38,7 +39,6 @@ import HaskellWorks.Data.RankSelect.Base.Rank1 import HaskellWorks.Data.RankSelect.Base.Select1 import HaskellWorks.Data.Row -import qualified HaskellWorks.Data.Succinct.BalancedParens as BP import Text.PrettyPrint.ANSI.Leijen data JsonPartialValue diff --git a/src/HaskellWorks/Data/Json/Succinct/Cursor/BalancedParens.hs b/src/HaskellWorks/Data/Json/Succinct/Cursor/BalancedParens.hs --- a/src/HaskellWorks/Data/Json/Succinct/Cursor/BalancedParens.hs +++ b/src/HaskellWorks/Data/Json/Succinct/Cursor/BalancedParens.hs @@ -13,10 +13,10 @@ import Data.Conduit import qualified Data.Vector.Storable as DVS import Data.Word +import HaskellWorks.Data.BalancedParens as BP import HaskellWorks.Data.Conduit.List import HaskellWorks.Data.Json.Conduit import HaskellWorks.Data.Json.Succinct.Cursor.BlankedJson -import HaskellWorks.Data.Succinct.BalancedParens as BP newtype JsonBalancedParens a = JsonBalancedParens a diff --git a/src/HaskellWorks/Data/Json/Succinct/Cursor/InterestBits.hs b/src/HaskellWorks/Data/Json/Succinct/Cursor/InterestBits.hs --- a/src/HaskellWorks/Data/Json/Succinct/Cursor/InterestBits.hs +++ b/src/HaskellWorks/Data/Json/Succinct/Cursor/InterestBits.hs @@ -18,7 +18,7 @@ import HaskellWorks.Data.FromByteString import HaskellWorks.Data.Json.Conduit import HaskellWorks.Data.Json.Succinct.Cursor.BlankedJson -import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512 +import HaskellWorks.Data.RankSelect.Poppy512 newtype JsonInterestBits a = JsonInterestBits a diff --git a/src/HaskellWorks/Data/Json/Succinct/Cursor/Internal.hs b/src/HaskellWorks/Data/Json/Succinct/Cursor/Internal.hs --- a/src/HaskellWorks/Data/Json/Succinct/Cursor/Internal.hs +++ b/src/HaskellWorks/Data/Json/Succinct/Cursor/Internal.hs @@ -16,6 +16,7 @@ import qualified Data.Vector.Storable as DVS import Data.Word import Foreign.ForeignPtr +import qualified HaskellWorks.Data.BalancedParens as BP import HaskellWorks.Data.Bits.BitShown import HaskellWorks.Data.FromByteString import HaskellWorks.Data.FromForeignRegion @@ -26,8 +27,7 @@ import HaskellWorks.Data.RankSelect.Base.Rank0 import HaskellWorks.Data.RankSelect.Base.Rank1 import HaskellWorks.Data.RankSelect.Base.Select1 -import qualified HaskellWorks.Data.Succinct.BalancedParens as BP -import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512 +import HaskellWorks.Data.RankSelect.Poppy512 import HaskellWorks.Data.TreeCursor data JsonCursor t v w = JsonCursor diff --git a/src/HaskellWorks/Data/Json/Succinct/Index.hs b/src/HaskellWorks/Data/Json/Succinct/Index.hs --- a/src/HaskellWorks/Data/Json/Succinct/Index.hs +++ b/src/HaskellWorks/Data/Json/Succinct/Index.hs @@ -10,6 +10,7 @@ import Control.Monad import qualified Data.ByteString as BS import qualified Data.List as L +import qualified HaskellWorks.Data.BalancedParens as BP import HaskellWorks.Data.Bits.BitWise import HaskellWorks.Data.Decode import HaskellWorks.Data.Drop @@ -19,7 +20,6 @@ import HaskellWorks.Data.RankSelect.Base.Rank0 import HaskellWorks.Data.RankSelect.Base.Rank1 import HaskellWorks.Data.RankSelect.Base.Select1 -import qualified HaskellWorks.Data.Succinct.BalancedParens as BP import HaskellWorks.Data.TreeCursor import HaskellWorks.Data.Uncons import Prelude hiding (drop) diff --git a/src/HaskellWorks/Data/Json/Succinct/PartialIndex.hs b/src/HaskellWorks/Data/Json/Succinct/PartialIndex.hs --- a/src/HaskellWorks/Data/Json/Succinct/PartialIndex.hs +++ b/src/HaskellWorks/Data/Json/Succinct/PartialIndex.hs @@ -10,6 +10,7 @@ import Control.Arrow import qualified Data.ByteString as BS import qualified Data.List as L +import qualified HaskellWorks.Data.BalancedParens as BP import HaskellWorks.Data.Bits.BitWise import HaskellWorks.Data.Drop import HaskellWorks.Data.Json.CharLike @@ -18,7 +19,6 @@ import HaskellWorks.Data.RankSelect.Base.Rank0 import HaskellWorks.Data.RankSelect.Base.Rank1 import HaskellWorks.Data.RankSelect.Base.Select1 -import qualified HaskellWorks.Data.Succinct.BalancedParens as BP import HaskellWorks.Data.TreeCursor import HaskellWorks.Data.Uncons import Prelude hiding (drop) diff --git a/src/HaskellWorks/Data/Json/Type.hs b/src/HaskellWorks/Data/Json/Type.hs --- a/src/HaskellWorks/Data/Json/Type.hs +++ b/src/HaskellWorks/Data/Json/Type.hs @@ -10,6 +10,7 @@ import qualified Data.ByteString as BS import Data.Char import Data.Word8 +import qualified HaskellWorks.Data.BalancedParens as BP import HaskellWorks.Data.Bits.BitWise import HaskellWorks.Data.Drop import HaskellWorks.Data.Json.Succinct @@ -17,7 +18,6 @@ import HaskellWorks.Data.RankSelect.Base.Rank0 import HaskellWorks.Data.RankSelect.Base.Rank1 import HaskellWorks.Data.RankSelect.Base.Select1 -import qualified HaskellWorks.Data.Succinct.BalancedParens as BP import Prelude hiding (drop) {-# ANN module ("HLint: Reduce duplication" :: String) #-} diff --git a/test/HaskellWorks/Data/Json/CorpusSpec.hs b/test/HaskellWorks/Data/Json/CorpusSpec.hs --- a/test/HaskellWorks/Data/Json/CorpusSpec.hs +++ b/test/HaskellWorks/Data/Json/CorpusSpec.hs @@ -15,10 +15,10 @@ import qualified Data.ByteString as BS import qualified Data.Vector.Storable as DVS import Data.Word +import HaskellWorks.Data.BalancedParens.Simple import HaskellWorks.Data.Bits.BitShown import HaskellWorks.Data.Bits.FromBitTextByteString import HaskellWorks.Data.Json.Succinct.Cursor as C -import HaskellWorks.Data.Succinct.BalancedParens.Simple import Test.Hspec import HaskellWorks.Data.FromByteString diff --git a/test/HaskellWorks/Data/Json/Succinct/CursorSpec.hs b/test/HaskellWorks/Data/Json/Succinct/CursorSpec.hs --- a/test/HaskellWorks/Data/Json/Succinct/CursorSpec.hs +++ b/test/HaskellWorks/Data/Json/Succinct/CursorSpec.hs @@ -16,6 +16,8 @@ import Data.String import qualified Data.Vector.Storable as DVS import Data.Word +import HaskellWorks.Data.BalancedParens.BalancedParens +import HaskellWorks.Data.BalancedParens.Simple import HaskellWorks.Data.Bits.BitShow import HaskellWorks.Data.Bits.BitShown import HaskellWorks.Data.Bits.BitWise @@ -26,9 +28,7 @@ import HaskellWorks.Data.RankSelect.Base.Rank0 import HaskellWorks.Data.RankSelect.Base.Rank1 import HaskellWorks.Data.RankSelect.Base.Select1 -import HaskellWorks.Data.Succinct.BalancedParens.BalancedParens -import HaskellWorks.Data.Succinct.BalancedParens.Simple -import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512 +import HaskellWorks.Data.RankSelect.Poppy512 import qualified HaskellWorks.Data.TreeCursor as TC import Test.Hspec diff --git a/test/HaskellWorks/Data/Json/TypeSpec.hs b/test/HaskellWorks/Data/Json/TypeSpec.hs --- a/test/HaskellWorks/Data/Json/TypeSpec.hs +++ b/test/HaskellWorks/Data/Json/TypeSpec.hs @@ -16,6 +16,8 @@ import Data.String import qualified Data.Vector.Storable as DVS import Data.Word +import HaskellWorks.Data.BalancedParens.BalancedParens +import HaskellWorks.Data.BalancedParens.Simple import HaskellWorks.Data.Bits.BitShown import HaskellWorks.Data.Bits.BitWise import HaskellWorks.Data.FromForeignRegion @@ -25,9 +27,7 @@ import HaskellWorks.Data.RankSelect.Base.Rank0 import HaskellWorks.Data.RankSelect.Base.Rank1 import HaskellWorks.Data.RankSelect.Base.Select1 -import HaskellWorks.Data.Succinct.BalancedParens.BalancedParens -import HaskellWorks.Data.Succinct.BalancedParens.Simple -import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512 +import HaskellWorks.Data.RankSelect.Poppy512 import qualified HaskellWorks.Data.TreeCursor as TC import Test.Hspec diff --git a/test/HaskellWorks/Data/Json/ValueSpec.hs b/test/HaskellWorks/Data/Json/ValueSpec.hs --- a/test/HaskellWorks/Data/Json/ValueSpec.hs +++ b/test/HaskellWorks/Data/Json/ValueSpec.hs @@ -16,6 +16,8 @@ import Data.String import qualified Data.Vector.Storable as DVS import Data.Word +import HaskellWorks.Data.BalancedParens.BalancedParens +import HaskellWorks.Data.BalancedParens.Simple import HaskellWorks.Data.Bits.BitShown import HaskellWorks.Data.Bits.BitWise import HaskellWorks.Data.Decode @@ -26,9 +28,7 @@ import HaskellWorks.Data.RankSelect.Base.Rank0 import HaskellWorks.Data.RankSelect.Base.Rank1 import HaskellWorks.Data.RankSelect.Base.Select1 -import HaskellWorks.Data.Succinct.BalancedParens.BalancedParens -import HaskellWorks.Data.Succinct.BalancedParens.Simple -import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512 +import HaskellWorks.Data.RankSelect.Poppy512 import qualified HaskellWorks.Data.TreeCursor as TC import Test.Hspec