Thanks to visit codestin.com
Credit goes to github.com

Skip to content

json: encode \b and \f like the Go 1.22 stdlib does #145

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
merged 2 commits into from
Jun 9, 2025
Merged

json: encode \b and \f like the Go 1.22 stdlib does #145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9855f32
go.mod: upgrade to 1.23 (oldest supported by Go project)
extemporalgenome Jun 9, 2025
953e0aa
json: encode \b and \f like the Go 1.22 stdlib does
extemporalgenome Jun 9, 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
Prev Previous commit
json: encode \b and \f like the Go 1.22 stdlib does 
https://go-review.googlesource.com/c/go/+/521675
  • Loading branch information
@extemporalgenome
extemporalgenome committed Jun 9, 2025
commit 953e0aab1bd450291a81cf180e8274c3dd7ab777
25 changes: 2 additions & 23 deletions json/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,30 +158,9 @@ func (e encoder) encodeString(b []byte, p unsafe.Pointer) ([]byte, error) {
}

switch c {
case '\\', '"':
case '\\', '"', '\b', '\f', '\n', '\r', '\t':
b = append(b, s[i:j]...)
b = append(b, '\\', c)
i = j + 1
j = j + 1
continue

case '\n':
b = append(b, s[i:j]...)
b = append(b, '\\', 'n')
i = j + 1
j = j + 1
continue

case '\r':
b = append(b, s[i:j]...)
b = append(b, '\\', 'r')
i = j + 1
j = j + 1
continue

case '\t':
b = append(b, s[i:j]...)
b = append(b, '\\', 't')
b = append(b, '\\', escapeByteRepr(c))
i = j + 1
j = j + 1
continue
Expand Down
4 changes: 2 additions & 2 deletions json/golang_encode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,11 +685,11 @@ var encodeStringTests = []struct {
{"\x05", `"\u0005"`},
{"\x06", `"\u0006"`},
{"\x07", `"\u0007"`},
{"\x08", `"\u0008"`},
{"\x08", `"\b"`},
{"\x09", `"\t"`},
{"\x0a", `"\n"`},
{"\x0b", `"\u000b"`},
{"\x0c", `"\u000c"`},
{"\x0c", `"\f"`},
{"\x0d", `"\r"`},
{"\x0e", `"\u000e"`},
{"\x0f", `"\u000f"`},
Expand Down
19 changes: 19 additions & 0 deletions json/string.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,25 @@ func escapeIndex(s string, escapeHTML bool) int {
return -1
}

func escapeByteRepr(b byte) byte {
switch b {
case '\\', '"':
return b
case '\b':
return 'b'
case '\f':
return 'f'
case '\n':
return 'n'
case '\r':
return 'r'
case '\t':
return 't'
}

return 0
}

// below return a mask that can be used to determine if any of the bytes
// in `n` are below `b`. If a byte's MSB is set in the mask then that byte was
// below `b`. The result is only valid if `b`, and each byte in `n`, is below
Expand Down