diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-02-07 14:06:12 -0700 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-02-07 14:06:12 -0700 |
commit | 480ccfd05a13ac36516c536a71203280a31b4d28 (patch) | |
tree | 4ae21bf95c9f3b4cce97a0a0473fe622fdb393eb /compat/json/compat_test.go | |
parent | 87013d526ea1b0647ef6e08758fe587cee11d854 (diff) | |
parent | 47549aa3d10808c063d45dcaa598887dadde59c5 (diff) |
Merge branch 'lukeshu/fixup'
Diffstat (limited to 'compat/json/compat_test.go')
-rw-r--r-- | compat/json/compat_test.go | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/compat/json/compat_test.go b/compat/json/compat_test.go index feb850b..203594f 100644 --- a/compat/json/compat_test.go +++ b/compat/json/compat_test.go @@ -9,10 +9,16 @@ import ( "io" "git.lukeshu.com/go/lowmemjson" - "git.lukeshu.com/go/lowmemjson/internal" + "git.lukeshu.com/go/lowmemjson/internal/jsonparse" + "git.lukeshu.com/go/lowmemjson/internal/jsonstruct" + "git.lukeshu.com/go/lowmemjson/internal/jsontest" ) -var parseTag = internal.ParseTag +var ( + parseTag = jsonstruct.ParseTag + clearCache = jsonstruct.ClearCache + cachedTypeFields = jsonstruct.IndexStruct +) type scanner = lowmemjson.ReEncoderConfig @@ -21,13 +27,13 @@ func checkValid(in []byte, scan *lowmemjson.ReEncoderConfig) error { } func isValidNumber(s string) bool { - var parser internal.Parser + var parser jsonparse.Parser for _, r := range s { if t, _ := parser.HandleRune(r); !t.IsNumber() { return false } } - if t, _ := parser.HandleEOF(); t == internal.RuneTypeError { + if t, _ := parser.HandleEOF(); t == jsonparse.RuneTypeError { return false } return true @@ -51,9 +57,9 @@ type encodeState struct { } func (es *encodeState) string(str string, _ bool) { - internal.EncodeStringFromString(&es.Buffer, str) + jsontest.EncodeStringFromString(&es.Buffer, str) } func (es *encodeState) stringBytes(str []byte, _ bool) { - internal.EncodeStringFromBytes(&es.Buffer, str) + jsontest.EncodeStringFromBytes(&es.Buffer, str) } |