From 75a59f2b56982bc753d594a5af375b23ef786fdf Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 30 Jan 2023 16:54:15 -0700 Subject: decode: Tidy up DecodeObject and DecodeArray --- decode.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/decode.go b/decode.go index a7536f5..7ae723c 100644 --- a/decode.go +++ b/decode.go @@ -878,9 +878,11 @@ func DecodeObject(r io.RuneScanner, decodeKey, decodeVal func(io.RuneScanner) er defer dec.posStackPop() l := dec.limitingScanner() if err := decodeKey(l); err != nil { + // TODO: Find a better Go type to use than `nil`. dec.panicType("string", nil, err) } if _, _, err := l.ReadRune(); err != io.EOF { + // TODO: Find a better Go type to use than `nil`. dec.panicType("string", nil, fmt.Errorf("did not consume entire string")) } }, @@ -890,13 +892,15 @@ func DecodeObject(r io.RuneScanner, decodeKey, decodeVal func(io.RuneScanner) er t := dec.peekRuneType() l := dec.limitingScanner() if err := decodeVal(l); err != nil { + // TODO: Find a better Go type to use than `nil`. dec.panicType(t.JSONType(), nil, err) } if _, _, err := l.ReadRune(); err != io.EOF { + // TODO: Find a better Go type to use than `nil`. dec.panicType(t.JSONType(), nil, fmt.Errorf("did not consume entire %s", t.JSONType())) } }) - return err + return nil } func (dec *Decoder) decodeObject(gTyp reflect.Type, decodeKey, decodeVal func()) { @@ -954,13 +958,15 @@ func DecodeArray(r io.RuneScanner, decodeMember func(r io.RuneScanner) error) (e t := dec.peekRuneType() l := dec.limitingScanner() if err := decodeMember(l); err != nil { + // TODO: Find a better Go type to use than `nil`. dec.panicType(t.JSONType(), nil, err) } if _, _, err := l.ReadRune(); err != io.EOF { + // TODO: Find a better Go type to use than `nil`. dec.panicType(t.JSONType(), nil, fmt.Errorf("did not consume entire %s", t.JSONType())) } }) - return + return nil } func (dec *Decoder) decodeArray(gTyp reflect.Type, decodeMember func()) { -- cgit v1.2.3-2-g168b