Skip to content

Scan until next special char (", \, \0, \c, \L) and append that slice once. #25498

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

Open
planetis-m wants to merge 3 commits into
base: devel
Choose a base branch
from
Open

Scan until next special char (", \, \0, \c, \L) and append that slice once. #25498

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c981f5
Add addSpan procedure for string parsing
planetis-m Feb 9, 2026
aed70cc
Fix CI for addSpan with nimvm, nimscript and js special handling
planetis-m Feb 9, 2026
381a417
Improve error handling in parsejson
planetis-m Feb 27, 2026
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
22 changes: 17 additions & 5 deletions lib/pure/parsejson.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,23 +175,34 @@ proc parseEscapedUTF16*(buf: cstring, pos: var int): int =
else:
return -1

proc addSpan(dst: var string; src: string; startPos, endPos: int) {.inline.} =
let n = endPos - startPos
if n <= 0:
return
let oldLen = dst.len
setLen(dst, oldLen + n)
copyMem(addr dst[oldLen], addr src[startPos], n)

proc parseString(my: var JsonParser): TokKind =
result = tkString
var pos = my.bufpos + 1
var spanStart = pos
if my.rawStringLiterals:
add(my.a, '"')
while true:
case my.buf[pos]
of '\0':
my.err = errQuoteExpected
addSpan(my.a, my.buf, spanStart, pos)
result = tkError
break
of '"':
addSpan(my.a, my.buf, spanStart, pos)
if my.rawStringLiterals:
add(my.a, '"')
inc(pos)
break
of '\\':
addSpan(my.a, my.buf, spanStart, pos)
if my.rawStringLiterals:
add(my.a, '\\')
case my.buf[pos+1]
Expand Down Expand Up @@ -223,19 +234,16 @@ proc parseString(my: var JsonParser): TokKind =
var pos2 = pos
var r = parseEscapedUTF16(cstring(my.buf), pos)
if r < 0:
my.err = errInvalidToken
break
# Deal with surrogates
if (r and 0xfc00) == 0xd800:
if my.buf[pos] != '\\' or my.buf[pos+1] != 'u':
my.err = errInvalidToken
break
inc(pos, 2)
var s = parseEscapedUTF16(cstring(my.buf), pos)
if (s and 0xfc00) == 0xdc00 and s > 0:
r = 0x10000 + (((r - 0xd800) shl 10) or (s - 0xdc00))
else:
my.err = errInvalidToken
Comment thread
planetis-m marked this conversation as resolved.
break
if my.rawStringLiterals:
let length = pos - pos2
Expand All @@ -251,14 +259,18 @@ proc parseString(my: var JsonParser): TokKind =
# don't bother with the error
add(my.a, my.buf[pos])
inc(pos)
spanStart = pos
of '\c':
addSpan(my.a, my.buf, spanStart, pos)
pos = lexbase.handleCR(my, pos)
add(my.a, '\c')
spanStart = pos
of '\L':
addSpan(my.a, my.buf, spanStart, pos)
pos = lexbase.handleLF(my, pos)
add(my.a, '\L')
spanStart = pos
else:
add(my.a, my.buf[pos])
inc(pos)
my.bufpos = pos # store back

Expand Down
Loading