Move string-encoding to an internal/jsonstring package

1 files changed, 15 insertions, 13 deletions

diff --git a/reencode.go b/reencode.go
index d19dc1a..f100275 100644
--- a/reencode.go
+++ b/reencode.go
@@ -12,6 +12,7 @@ import (
 
 	"git.lukeshu.com/go/lowmemjson/internal/fastio"
 	"git.lukeshu.com/go/lowmemjson/internal/jsonparse"
+	"git.lukeshu.com/go/lowmemjson/internal/jsonstring"
 )
 
 // A ReEncoderConfig controls how a ReEncoder should behave.
@@ -499,34 +500,35 @@ func (enc *ReEncoder) handleRunePre(c rune, t jsonparse.RuneType) (error, bool)
 
 // handleRuneMain handles the new rune itself, not buffered things.
 func (enc *ReEncoder) handleRuneMain(c rune, t jsonparse.RuneType) error {
+	escaper := enc.BackslashEscape
+	if escaper == nil {
+		escaper = EscapeDefault
+	}
 	var err error
 	switch t {
 
 	case jsonparse.RuneTypeStringChar:
-		err = enc.emit(writeStringChar(enc.out, c, BackslashEscapeNone, enc.BackslashEscape))
+		err = enc.emit(jsonstring.WriteStringChar(enc.out, c, escaper(c, BackslashEscapeNone)))
 	case jsonparse.RuneTypeStringEsc, jsonparse.RuneTypeStringEscU:
 		// do nothing
 	case jsonparse.RuneTypeStringEsc1:
 		switch c {
-		case '"':
-			err = enc.emit(writeStringChar(enc.out, '"', BackslashEscapeShort, enc.BackslashEscape))
-		case '\\':
-			err = enc.emit(writeStringChar(enc.out, '\\', BackslashEscapeShort, enc.BackslashEscape))
-		case '/':
-			err = enc.emit(writeStringChar(enc.out, '/', BackslashEscapeShort, enc.BackslashEscape))
+		case '"', '\\', '/':
+			// self
 		case 'b':
-			err = enc.emit(writeStringChar(enc.out, '\b', BackslashEscapeShort, enc.BackslashEscape))
+			c = '\b'
 		case 'f':
-			err = enc.emit(writeStringChar(enc.out, '\f', BackslashEscapeShort, enc.BackslashEscape))
+			c = '\f'
 		case 'n':
-			err = enc.emit(writeStringChar(enc.out, '\n', BackslashEscapeShort, enc.BackslashEscape))
+			c = '\n'
 		case 'r':
-			err = enc.emit(writeStringChar(enc.out, '\r', BackslashEscapeShort, enc.BackslashEscape))
+			c = '\r'
 		case 't':
-			err = enc.emit(writeStringChar(enc.out, '\t', BackslashEscapeShort, enc.BackslashEscape))
+			c = '\t'
 		default:
 			panic(fmt.Errorf("should not happen: rune %q is not a RuneTypeStringEsc1", c))
 		}
+		err = enc.emit(jsonstring.WriteStringChar(enc.out, c, escaper(c, BackslashEscapeShort)))
 	case jsonparse.RuneTypeStringEscUA:
 		enc.uhex[0], _ = jsonparse.HexToInt(c)
 	case jsonparse.RuneTypeStringEscUB:
@@ -540,7 +542,7 @@ func (enc *ReEncoder) handleRuneMain(c rune, t jsonparse.RuneType) error {
 			rune(enc.uhex[1])<<8 |
 			rune(enc.uhex[2])<<4 |
 			rune(enc.uhex[3])<<0
-		err = enc.emit(writeStringChar(enc.out, c, BackslashEscapeUnicode, enc.BackslashEscape))
+		err = enc.emit(jsonstring.WriteStringChar(enc.out, c, escaper(c, BackslashEscapeUnicode)))
 
 	case jsonparse.RuneTypeError: // EOF explicitly stated by .Close()
 		fallthrough