From 67b78f25f76b8ca43d837fb8055ca8e2b06c7d02 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Aug 2022 21:25:06 -0600 Subject: Get borrowed_scanner_test.go passing [ci-skip] --- reencode.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'reencode.go') diff --git a/reencode.go b/reencode.go index 92e870a..bb0dc24 100644 --- a/reencode.go +++ b/reencode.go @@ -79,7 +79,7 @@ func (enc *ReEncoder) Write(p []byte) (int, error) { func (enc *ReEncoder) Close() error { if enc.bufLen > 0 { - return &DecodeSyntaxError{ + return &ReEncodeSyntaxError{ Offset: enc.inputPos, Err: fmt.Errorf("%w: unflushed unicode garbage: %q", io.ErrUnexpectedEOF, enc.buf[:enc.bufLen]), } @@ -111,7 +111,10 @@ func (enc *ReEncoder) WriteRune(c rune) (n int, err error) { } t, err := enc.par.HandleRune(c) if err != nil { - enc.err = err + enc.err = &ReEncodeSyntaxError{ + Err: err, + Offset: enc.inputPos, + } return 0, enc.err } @@ -178,7 +181,7 @@ func (enc *ReEncoder) handleRune(c rune, t RuneType) error { case RuneTypeObjectEnd, RuneTypeArrayEnd: enc.curIndent-- switch enc.lastNonSpace { - case RuneTypeObjectBeg, RuneTypeArrayEnd: + case RuneTypeObjectBeg, RuneTypeArrayBeg: // collapse default: if err := enc.emitNlIndent(); err != nil { -- cgit v1.2.3-2-g168b