Skip to content

Commit 82d75b5

Browse files
newhoggynewhoggy
committed
Update dependencies. Use BSD license
1 parent f3e21bb commit 82d75b5

File tree

20 files changed

+135
-114
lines changed

20 files changed

+135
-114
lines changed

‎LICENSE‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1-
MIT License
1+
Copyright John Ky (c) 2016
22

3-
Copyright (c) 2016 John Ky
3+
All rights reserved.
44

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
117

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
1410

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
11+
* Redistributions in binary form must reproduce the above
12+
copyright notice, this list of conditions and the following
13+
disclaimer in the documentation and/or other materials provided
14+
with the distribution.
15+
16+
* Neither the name of Author name here nor the names of other
17+
contributors may be used to endorse or promote products derived
18+
from this software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎app/Main.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
module Main where
66

77
import qualified Data.ByteString as BS
8+
import qualified Data.DList as DL
9+
import Data.Function
810
import qualified Data.Vector.Storable as DVS
911
import Data.Word
12+
import HaskellWorks.Data.BalancedParens.Simple
1013
import HaskellWorks.Data.Bits.BitShown
1114
import HaskellWorks.Data.FromByteString
1215
import HaskellWorks.Data.Json.Succinct.Cursor
1316
import HaskellWorks.Data.Json.LightJson
1417
import HaskellWorks.Data.Json.LoadCursor
1518
import HaskellWorks.Data.Micro
1619
import HaskellWorks.Data.MQuery
17-
import HaskellWorks.Data.Succinct.BalancedParens.Simple
1820
import HaskellWorks.Diagnostics.Time
1921
import Control.Monad
20-
import qualified Data.DList as DL
21-
import Data.Function
2222

2323
readJson :: String -> IO (JsonCursor BS.ByteString (BitShown (DVS.Vector Word64)) (SimpleBalancedParens (DVS.Vector Word64)))
2424
readJson path = do

‎bench/Main.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import Data.Conduit
1111
import qualified Data.Vector.Storable as DVS
1212
import Data.Word
1313
import Foreign
14+
import HaskellWorks.Data.BalancedParens.Simple
1415
import HaskellWorks.Data.Bits.BitShown
1516
import HaskellWorks.Data.Conduit.List
1617
import HaskellWorks.Data.FromByteString
1718
import HaskellWorks.Data.Json.Conduit
1819
import HaskellWorks.Data.Json.Conduit.Blank
1920
import HaskellWorks.Data.Json.Succinct.Cursor
20-
import HaskellWorks.Data.Succinct.BalancedParens.Simple
2121
import System.IO.MMap
2222

2323
setupEnvJson :: FilePath -> IO BS.ByteString

‎hw-json.cabal‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: hw-json
2-
version: 0.3.0.0
3-
synopsis: Conduits for tokenizing streams.
2+
version: 0.4.0.0
3+
synopsis: Memory efficient JSON parser
44
description: Please see README.md
55
homepage: http://github.com/haskell-works/hw-json#readme
6-
license: MIT
6+
license: BSD3
77
license-file: LICENSE
88
author: John Ky
99
maintainer: [email protected]
@@ -33,14 +33,16 @@ executable hw-json-example
3333
, containers
3434
, criterion
3535
, dlist
36+
, hw-balancedparens >= 0.0.0.1
3637
, hw-bits >= 0.3.0.0
3738
, hw-conduit
3839
, hw-diagnostics
3940
, hw-json
4041
, hw-mquery >= 0.1.0.0
4142
, hw-parser
42-
, hw-prim >= 0.3.0.5
43-
, hw-rankselect >= 0.4.0.0
43+
, hw-prim >= 0.4.0.0
44+
, hw-rankselect >= 0.6.0.0
45+
, hw-rankselect-base >= 0.1.0.0
4446
, mmap
4547
, mono-traversable
4648
, resourcet
@@ -85,13 +87,15 @@ library
8587
, conduit
8688
, containers
8789
, dlist
90+
, hw-balancedparens >= 0.0.0.1
8891
, hw-bits >= 0.3.0.0
8992
, hw-conduit
9093
, hw-diagnostics
9194
, hw-mquery >= 0.1.0.0
9295
, hw-parser
93-
, hw-prim >= 0.3.0.5
94-
, hw-rankselect >= 0.4.0.0
96+
, hw-prim >= 0.4.0.0
97+
, hw-rankselect >= 0.6.0.0
98+
, hw-rankselect-base >= 0.1.0.0
9599
, mmap
96100
, mono-traversable
97101
, resourcet
@@ -119,11 +123,13 @@ test-suite hw-json-test
119123
, containers
120124
, conduit
121125
, hspec
122-
, hw-bits
126+
, hw-balancedparens >= 0.0.0.1
127+
, hw-bits >= 0.3.0.0
123128
, hw-conduit
124129
, hw-json
125-
, hw-prim >= 0.3.0.5
126-
, hw-rankselect >= 0.0.0.5
130+
, hw-prim >= 0.4.0.0
131+
, hw-rankselect >= 0.6.0.0
132+
, hw-rankselect-base >= 0.1.0.0
127133
, mmap
128134
, parsec
129135
, QuickCheck
@@ -147,11 +153,13 @@ benchmark bench
147153
, bytestring
148154
, conduit
149155
, criterion
150-
, hw-bits
156+
, hw-balancedparens >= 0.0.0.1
157+
, hw-bits >= 0.3.0.0
151158
, hw-conduit
152159
, hw-json
153-
, hw-prim >= 0.3.0.5
154-
, hw-rankselect >= 0.0.0.5
160+
, hw-prim >= 0.4.0.0
161+
, hw-rankselect >= 0.6.0.0
162+
, hw-rankselect-base >= 0.1.0.0
155163
, mmap
156164
, resourcet
157165
, vector

‎packages.list‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
hw-balancedparens
12
hw-bits
3+
hw-int
24
hw-conduit
35
hw-diagnostics
6+
hw-excess
47
hw-mquery
58
hw-parser
69
hw-prim
710
hw-rankselect
11+
hw-rankselect-base
812
hw-string-parse

‎src/HaskellWorks/Data/Json/LightJson.hs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@
1010
module HaskellWorks.Data.Json.LightJson where
1111

1212
import Control.Arrow
13-
import qualified Data.Attoparsec.ByteString.Char8 as ABC
14-
import qualified Data.ByteString.Char8 as BSC
15-
import qualified Data.ByteString as BS
16-
import qualified Data.DList as DL
17-
import qualified Data.List as L
13+
import qualified Data.Attoparsec.ByteString.Char8 as ABC
14+
import qualified Data.ByteString.Char8 as BSC
15+
import qualified Data.ByteString as BS
16+
import qualified Data.DList as DL
17+
import qualified Data.List as L
1818
import Data.String
1919
import Data.Word
2020
import Data.Word8
2121
import HaskellWorks.Data.AtLeastSize
2222
import HaskellWorks.Data.Bits.BitWise
23+
import qualified HaskellWorks.Data.BalancedParens as BP
2324
import HaskellWorks.Data.Drop
2425
import HaskellWorks.Data.Entry
2526
import HaskellWorks.Data.Json.CharLike
@@ -29,11 +30,10 @@ import HaskellWorks.Data.Micro
2930
import HaskellWorks.Data.Mini
3031
import HaskellWorks.Data.MQuery
3132
import HaskellWorks.Data.Positioning
33+
import HaskellWorks.Data.RankSelect.Base.Rank0
34+
import HaskellWorks.Data.RankSelect.Base.Rank1
35+
import HaskellWorks.Data.RankSelect.Base.Select1
3236
import HaskellWorks.Data.Row
33-
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
34-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank0
35-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank1
36-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Select1
3737
import HaskellWorks.Data.TreeCursor
3838
import HaskellWorks.Data.Uncons
3939
import Prelude hiding (drop)

‎src/HaskellWorks/Data/Json/Load.hs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ import Data.Word
2626
import Foreign.ForeignPtr
2727
import Foreign.Ptr
2828
import Foreign.Storable
29+
import HaskellWorks.Data.BalancedParens.RangeMinMax
30+
import HaskellWorks.Data.BalancedParens.RangeMinMax2
31+
import HaskellWorks.Data.BalancedParens.Simple
2932
import HaskellWorks.Data.Bits.BitShown
3033
import HaskellWorks.Data.Decode
3134
import HaskellWorks.Data.FromByteString
@@ -35,12 +38,9 @@ import HaskellWorks.Data.Json.Succinct.Cursor
3538
import HaskellWorks.Data.Json.Succinct.Index
3639
import HaskellWorks.Data.Json.Succinct.PartialIndex
3740
import HaskellWorks.Data.Json.Value
38-
import HaskellWorks.Data.Succinct.BalancedParens.RangeMinMax
39-
import HaskellWorks.Data.Succinct.BalancedParens.RangeMinMax2
40-
import HaskellWorks.Data.Succinct.BalancedParens.Simple
41-
import HaskellWorks.Data.Succinct.RankSelect.Binary.CsPoppy
42-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512
43-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512S
41+
import HaskellWorks.Data.RankSelect.CsPoppy
42+
import HaskellWorks.Data.RankSelect.Poppy512
43+
import HaskellWorks.Data.RankSelect.Poppy512S
4444
import HaskellWorks.Diagnostics.Time
4545
import System.IO
4646
import System.IO.MMap

‎src/HaskellWorks/Data/Json/LoadCursor.hs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ import Data.Word
2424
import Foreign.ForeignPtr
2525
import Foreign.Ptr
2626
import Foreign.Storable
27+
import HaskellWorks.Data.BalancedParens.RangeMinMax
28+
import HaskellWorks.Data.BalancedParens.RangeMinMax2
29+
import HaskellWorks.Data.BalancedParens.Simple
2730
import HaskellWorks.Data.Bits.BitShown
2831
import HaskellWorks.Data.Decode
2932
import HaskellWorks.Data.FromByteString
3033
import HaskellWorks.Data.FromForeignRegion
3134
import HaskellWorks.Data.Json.Succinct.Cursor
3235
import HaskellWorks.Data.Json.Succinct.Index
3336
import HaskellWorks.Data.Json.Value
34-
import HaskellWorks.Data.Succinct.BalancedParens.RangeMinMax
35-
import HaskellWorks.Data.Succinct.BalancedParens.RangeMinMax2
36-
import HaskellWorks.Data.Succinct.BalancedParens.Simple
37-
import HaskellWorks.Data.Succinct.RankSelect.Binary.CsPoppy
38-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512
39-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512S
37+
import HaskellWorks.Data.RankSelect.CsPoppy
38+
import HaskellWorks.Data.RankSelect.Poppy512
39+
import HaskellWorks.Data.RankSelect.Poppy512S
4040
import HaskellWorks.Diagnostics.Time
4141
import System.IO
4242
import System.IO.MMap

‎src/HaskellWorks/Data/Json/PartialValue.hs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ module HaskellWorks.Data.Json.PartialValue
2222
) where
2323

2424
import Control.Arrow
25-
import qualified Data.Attoparsec.ByteString.Char8 as ABC
26-
import qualified Data.ByteString as BS
27-
import qualified Data.DList as DL
25+
import qualified Data.Attoparsec.ByteString.Char8 as ABC
26+
import qualified Data.ByteString as BS
27+
import qualified Data.DList as DL
2828
import HaskellWorks.Data.AtLeastSize
29+
import qualified HaskellWorks.Data.BalancedParens as BP
2930
import HaskellWorks.Data.Bits.BitWise
3031
import HaskellWorks.Data.Entry
3132
import HaskellWorks.Data.Micro
@@ -34,10 +35,9 @@ import HaskellWorks.Data.MQuery
3435
import HaskellWorks.Data.Json.Succinct.Cursor
3536
import HaskellWorks.Data.Json.Succinct.PartialIndex
3637
import HaskellWorks.Data.Json.Value.Internal
37-
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
38-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank0
39-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank1
40-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Select1
38+
import HaskellWorks.Data.RankSelect.Base.Rank0
39+
import HaskellWorks.Data.RankSelect.Base.Rank1
40+
import HaskellWorks.Data.RankSelect.Base.Select1
4141
import HaskellWorks.Data.Row
4242
import Text.PrettyPrint.ANSI.Leijen
4343

‎src/HaskellWorks/Data/Json/Succinct/Cursor/BalancedParens.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import qualified Data.ByteString as BS
1313
import Data.Conduit
1414
import qualified Data.Vector.Storable as DVS
1515
import Data.Word
16+
import HaskellWorks.Data.BalancedParens as BP
1617
import HaskellWorks.Data.Conduit.List
1718
import HaskellWorks.Data.Json.Conduit
1819
import HaskellWorks.Data.Json.Succinct.Cursor.BlankedJson
19-
import HaskellWorks.Data.Succinct.BalancedParens as BP
2020

2121
newtype JsonBalancedParens a = JsonBalancedParens a
2222

0 commit comments

Comments
 (0)