diff --git a/app/App/Commands/CountAeson.hs b/app/App/Commands/CountAeson.hs --- a/app/App/Commands/CountAeson.hs +++ b/app/App/Commands/CountAeson.hs @@ -13,6 +13,8 @@ import qualified App.Commands.Types as Z import qualified Data.Aeson as J +import qualified Data.Aeson.Key as J +import qualified Data.Aeson.KeyMap as J import qualified Data.ByteString.Lazy as LBS import qualified Data.HashMap.Strict as SHM import qualified System.IO as IO @@ -27,7 +29,7 @@ let lbsLines = LBS.split 10 lbs let count :: Int = sum $ flip fmap lbsLines $ \lbsLine -> case J.decode lbsLine of - Just (J.Object v) -> if SHM.member expression v then 1 else 0 + Just (J.Object v) -> if J.member (J.fromText expression) v then 1 else 0 _ -> 0 IO.putStrLn $ "Count: " <> show count diff --git a/hw-json.cabal b/hw-json.cabal --- a/hw-json.cabal +++ b/hw-json.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: hw-json -version: 1.3.2.2 +version: 1.3.2.3 synopsis: Memory efficient JSON parser description: Memory efficient JSON parser. Please see README.md category: Data @@ -9,10 +9,10 @@ bug-reports: https://github.com/haskell-works/hw-json/issues author: John Ky maintainer: newhoggy@gmail.com -copyright: 2016-2020 John Ky +copyright: 2016-2021 John Ky license: BSD-3-Clause license-file: LICENSE -tested-with: GHC == 8.10.2, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4 +tested-with: GHC == 9.2.2, GHC == 9.0.2, GHC == 8.10.7, GHC == 8.8.4, GHC == 8.6.5 build-type: Simple extra-source-files: README.md corpus/5000B.json @@ -39,19 +39,19 @@ common base { build-depends: base >= 4.11 && < 5 } -common aeson { build-depends: aeson >= 1.4.3.0 && < 1.6 } +common aeson { build-depends: aeson >= 2.0 && < 2.1 } common ansi-wl-pprint { build-depends: ansi-wl-pprint >= 0.6.8.2 && < 0.7 } common array { build-depends: array >= 0.5 && < 0.6 } -common attoparsec { build-depends: attoparsec >= 0.13 && < 0.14 } +common attoparsec { build-depends: attoparsec >= 0.13 && < 0.15 } common bits-extra { build-depends: bits-extra >= 0.0.1.3 && < 0.1 } -common bytestring { build-depends: bytestring >= 0.10.6 && < 0.11 } +common bytestring { build-depends: bytestring >= 0.10.6 && < 0.12 } common criterion { build-depends: criterion >= 1.4 && < 1.6 } common directory { build-depends: directory >= 1.3 && < 1.4 } -common dlist { build-depends: dlist >= 0.8 && < 0.9 } -common doctest { build-depends: doctest >= 0.16.2 && < 0.17 } +common dlist { build-depends: dlist >= 0.8 && < 1.1 } +common doctest { build-depends: doctest >= 0.16.2 && < 0.21 } common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 } -common generic-lens { build-depends: generic-lens >= 1.2.0.1 && < 2.1 } -common hedgehog { build-depends: hedgehog >= 0.6 && < 1.1 } +common generic-lens { build-depends: generic-lens >= 1.2.0.1 && < 2.3 } +common hedgehog { build-depends: hedgehog >= 0.6 && < 1.2 } common hspec { build-depends: hspec >= 2.4 && < 3 } common hw-balancedparens { build-depends: hw-balancedparens >= 0.3.0.0 && < 0.5 } common hw-bits { build-depends: hw-bits >= 0.7.0.5 && < 0.8 } @@ -65,12 +65,12 @@ common hw-rankselect { build-depends: hw-rankselect >= 0.13 && < 0.14 } common hw-rankselect-base { build-depends: hw-rankselect-base >= 0.3.2.1 && < 0.4 } common hw-simd { build-depends: hw-simd >= 0.1.1.2 && < 0.2 } -common lens { build-depends: lens >= 4 && < 5 } +common lens { build-depends: lens >= 4 && < 6 } common mmap { build-depends: mmap >= 0.5 && < 0.6 } -common optparse-applicative { build-depends: optparse-applicative >= 0.14 && < 0.17 } +common optparse-applicative { build-depends: optparse-applicative >= 0.14 && < 0.18 } common scientific { build-depends: scientific >= 0.3.6.2 && < 0.4 } -common text { build-depends: text >= 1.2 && < 1.3 } -common transformers { build-depends: transformers >= 0.4 && < 0.6 } +common text { build-depends: text >= 1.2 && < 2.1 } +common transformers { build-depends: transformers >= 0.4 && < 0.7 } common unordered-containers { build-depends: unordered-containers >= 0.2 && < 0.3 } common vector { build-depends: vector >= 0.12 && < 0.13 } common word8 { build-depends: word8 >= 0.1 && < 0.2 }