Skip to content

Remove dollar operator to fix GHC 9.6 build #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewthad merged 4 commits into from
Jul 14, 2025
Merged

Remove dollar operator to fix GHC 9.6 build #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d14db3d
Remove dollar operator to fix GHC 9.6 build
andrewthad Jul 14, 2025
fd8b101
Stop building with GHC 9.4 in CI
andrewthad Jul 14, 2025
6dfa3a8
Build with GHC 9.8.1 instead of 9.8.4 in CI
andrewthad Jul 14, 2025
1018b92
Correct tested-with
andrewthad Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Revision history for json-syntax

## 0.3.0.1 -- 2025-07-14
## 0.3.0.2 -- 2025-07-14

* Switch from ShortText to Text. In many cases, this makes it possible for the
resulting Value to share the input byte array instead of allocating additional
Expand Down
4 changes: 2 additions & 2 deletions json-syntax.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: json-syntax
version: 0.3.0.1
version: 0.3.0.2
synopsis: High-performance JSON parser and encoder
description:
This library parses JSON into a @Value@ type that is consistent with the
Expand Down Expand Up @@ -28,7 +28,7 @@ extra-doc-files:
CHANGELOG.md
README.md

tested-with: GHC ==9.4.8 || ==9.6.3 || ==9.8.1
tested-with: GHC ==9.6.3 || ==9.8.1

common build-settings
default-language: Haskell2010
Expand Down
17 changes: 8 additions & 9 deletions src/Json.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ import Control.Monad.ST (ST, runST)
import Control.Monad.ST.Run (runSmallArrayST)
import Control.Monad.Trans.Class (lift)
import Control.Monad.Trans.Except (except, runExceptT)
import Data.Bits (unsafeShiftR, (.&.), (.|.), xor)
import Data.Bits (unsafeShiftR, (.&.), (.|.))
import Data.Builder.ST (Builder)
import Data.Bytes.Chunks (Chunks)
import Data.Bytes.Parser (Parser)
Expand All @@ -94,12 +94,12 @@ import Data.Number.Scientific (Scientific)
import Data.Primitive (Array, ByteArray (ByteArray), MutableByteArray, Prim, PrimArray, SmallArray)
import Data.Text.Internal (Text(Text))
import Data.Text.Short (ShortText)
import GHC.Exts (Char (C#), Int (I#), chr#, gtWord#, ltWord#, word2Int#, minusWord#)
import GHC.Exts (Int#, ByteArray#, word8ToWord#, word16ToWord#)
import GHC.Exts (Char (C#), Int (I#), ltWord#, minusWord#)
import GHC.Exts (Int#, ByteArray#, word8ToWord#)
import GHC.Exts (RuntimeRep(IntRep,TupleRep,BoxedRep), Levity(Unlifted))
import GHC.Exts (and#, xor#)
import GHC.Int (Int16, Int32, Int64, Int8)
import GHC.Word (Word16(W16#), Word32, Word64, Word8(W8#), Word(W#))
import GHC.Word (Word16, Word32, Word64, Word8(W8#), Word(W#))

import qualified Data.Builder.ST as B
import qualified Data.ByteString.Short.Internal as BSS
Expand All @@ -115,11 +115,9 @@ import qualified Data.List as List
import qualified Data.Number.Scientific as SCI
import qualified Data.Primitive as PM
import qualified Data.Primitive.Contiguous as Contiguous
import qualified Data.Text
import qualified Data.Text.Short as TS
import qualified Data.Text.Short.Unsafe as TS
import qualified Prelude
import qualified Data.Bytes.Parser.Rebindable as RB

{- | The JSON syntax tree described by the ABNF in RFC 7159. Notable
design decisions include:
Expand Down Expand Up @@ -552,9 +550,10 @@ copyAndEscape# !maxLen =
0x22 ->
(P.effect (PM.unsafeFreezeByteArray =<< PM.resizeMutableByteArray dst ix))
`P.bindFromLiftedToByteArrayIntInt` \str ->
P.pureByteArrayIntInt $ case byteArrayToShortByteString str of
BSS.SBS str' -> -- error ("Escaped string: " ++ Data.Text.unpack (Text (ByteArray str') 0 (I# ix#)))
(# str', 0#, ix# #)
P.pureByteArrayIntInt
( case byteArrayToShortByteString str of
BSS.SBS str' -> (# str', 0#, ix# #)
)
_ | theCharW >= 0x20, theCharW < 127 ->
(P.effect (PM.writeByteArray dst ix theCharW))
`P.bindFromLiftedToByteArrayIntInt` \_ ->
Expand Down