From a6cd78ec94f76feba180fa75e942bb5cdeae115f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 16 Feb 2023 21:05:24 -0700 Subject: Move string-encoding to an internal/jsonstring package --- encode_escape.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'encode_escape.go') diff --git a/encode_escape.go b/encode_escape.go index ab0d9c1..0054e72 100644 --- a/encode_escape.go +++ b/encode_escape.go @@ -6,6 +6,8 @@ package lowmemjson import ( "unicode/utf8" + + "git.lukeshu.com/go/lowmemjson/internal/jsonstring" ) // BackslashEscapeMode identifies one of the three ways that a @@ -17,12 +19,12 @@ import ( // single-character) // // - as a long Unicode `\uXXXX` backslash sequence -type BackslashEscapeMode uint8 +type BackslashEscapeMode = jsonstring.BackslashEscapeMode const ( - BackslashEscapeNone BackslashEscapeMode = iota - BackslashEscapeShort - BackslashEscapeUnicode + BackslashEscapeNone = jsonstring.BackslashEscapeNone + BackslashEscapeShort = jsonstring.BackslashEscapeShort + BackslashEscapeUnicode = jsonstring.BackslashEscapeUnicode ) // A BackslashEscaper controls how a ReEncoder emits a character in a -- cgit v1.2.3-2-g168b From 2b7fff828e29b63ae08a871b4b1e74784fab29e5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 16 Feb 2023 19:06:46 -0700 Subject: Clean up the hex handling --- encode_escape.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'encode_escape.go') diff --git a/encode_escape.go b/encode_escape.go index 0054e72..97da6e9 100644 --- a/encode_escape.go +++ b/encode_escape.go @@ -5,6 +5,7 @@ package lowmemjson import ( + "fmt" "unicode/utf8" "git.lukeshu.com/go/lowmemjson/internal/jsonstring" @@ -27,6 +28,27 @@ const ( BackslashEscapeUnicode = jsonstring.BackslashEscapeUnicode ) +func hexToInt(c byte) rune { + switch { + case '0' <= c && c <= '9': + return rune(c) - '0' + case 'a' <= c && c <= 'f': + return rune(c) - 'a' + 10 + case 'A' <= c && c <= 'F': + return rune(c) - 'A' + 10 + default: + panic(fmt.Errorf("should not happen: invalid hex char: %q", c)) + } +} + +func hexToRune(a, b, c, d byte) rune { + return 0 | + hexToInt(a)<<12 | + hexToInt(b)<<8 | + hexToInt(c)<<4 | + hexToInt(d)<<0 +} + // A BackslashEscaper controls how a ReEncoder emits a character in a // JSON string. The `rune` argument is the character being // considered, and the `BackslashEscapeMode` argument is how it was -- cgit v1.2.3-2-g168b