refactor to use collateString collate2String #17.

Author: prataprc

cbor_collate.go

@@ -186,16 +186,7 @@ func collateCborT2(buf, out []byte, config *Config) (int, int) {
 
 func collateCborT3(buf, out []byte, config *Config) (int, int) {
 	ln, m := cborItemLength(buf)
-	if config.doMissing && MissingLiteral.Equal(bytes2str(buf[m:m+ln])) {
-		out[0], out[1] = TypeMissing, Terminator
-		return m + ln, 2
-	}
-	n := 0
-	out[n] = TypeString
-	n++
-	n += suffixEncodeString(buf[m:m+ln], out[n:])
-	out[n] = Terminator
-	n++
+	n := collateString(bytes2str(buf[m:m+ln]), out, config)
 	return m + ln, n
 }
 

collate_cbor.go

@@ -43,11 +43,13 @@ func collate2cbor(code, out []byte, config *Config) (int, int) {
 		return m + x, n
 
 	case TypeString:
+		var x int
+
 		poolstr := config.pools.stringPool.Get()
 		defer config.pools.stringPool.Put(poolstr)
 		scratch := poolstr.([]byte)
-		x, y := suffixDecodeString(code[m:], scratch)
-		n += valtext2cbor(bytes2str(scratch[:y]), out[n:])
+		scratch, x = collate2String(code[m:], scratch[:])
+		n += valtext2cbor(bytes2str(scratch), out[n:])
 		return m + x, n
 
 	case TypeBinary:

collate_json.go

@@ -32,22 +32,24 @@ func collate2json(code []byte, text []byte, config *Config) (int, int) {
 		return n + x, m + y
 
 	case TypeString:
+		var x int
+
 		scratchi := config.pools.stringPool.Get()
 		scratch := scratchi.([]byte)
 		defer config.pools.stringPool.Put(scratchi)
 
-		x, y := suffixDecodeString(code[n:], scratch[:])
+		scratch, x = collate2String(code[n:], scratch[:])
 
 		if config.strict {
 			config.buf.Reset()
-			if err := config.enc.Encode(bytes2str(scratch[:y])); err != nil {
+			if err := config.enc.Encode(bytes2str(scratch)); err != nil {
 				panic(err)
 			}
 			s := config.buf.Bytes()
 			m += copy(text[m:], s[:len(s)-1]) // -1 to strip \n
 			return n + x, m
 		}
-		remtxt, err := encodeString(scratch[:y], text[m:m])
+		remtxt, err := encodeString(scratch, text[m:m])
 		if err != nil {
 			panic(err)
 		}

collate_value.go

@@ -39,8 +39,8 @@ func collate2gson(code []byte, config *Config) (interface{}, int) {
 
 	case TypeString:
 		s := make([]byte, encodedStringSize(code[n:]))
-		x, y := suffixDecodeString(code[n:], s)
-		return bytes2str(s[:y]), n + x
+		s, x := collate2String(code[n:], s)
+		return bytes2str(s), n + x
 
 	case TypeBinary:
 		m := getDatum(code[n:])

json_collate.go

@@ -51,15 +51,8 @@ func json2collate(txt string, code []byte, config *Config) (string, int) {
 		defer config.pools.stringPool.Put(scratchi)
 
 		txt, p := scanString(txt, scratch)
-		if config.doMissing && MissingLiteral.Equal(bytes2str(scratch[:p])) {
-			code[n], code[n+1] = TypeMissing, Terminator
-			return txt, n + 2
-		}
-		code[n] = TypeString
-		n++
-		n += suffixEncodeString(scratch[:p], code[n:])
-		code[n] = Terminator
-		n++
+		str := bytes2str(scratch[:p])
+		n += collateString(str, code[n:], config)
 		return txt, n
 
 	case '[':
@@ -123,7 +116,8 @@ func json2collate(txt string, code []byte, config *Config) (string, int) {
 			for {
 				// NOTE: empty string is also a valid key
 				txt, x = scanString(txt, altcode[p:])
-				if txt = skipWS(txt, config.ws); len(txt) == 0 || txt[0] != ':' {
+				txt = skipWS(txt, config.ws)
+				if len(txt) == 0 || txt[0] != ':' {
 					panic("collate scanner expectedColon")
 				}
 				key := bytes2str(altcode[p : p+x])

util.go

@@ -181,6 +181,24 @@ func collateJsonNumber(value string, code []byte, config *Config) int {
 	return collateFloat(bs, code)
 }
 
+func collateString(str string, code []byte, config *Config) (n int) {
+	if config.doMissing && MissingLiteral.Equal(str) {
+		code[0], code[1] = TypeMissing, Terminator
+		return 2
+	}
+	code[n] = TypeString
+	n++
+	n += suffixEncodeString(str2bytes(str), code[n:])
+	code[n] = Terminator
+	n++
+	return n
+}
+
+func collate2String(code []byte, str []byte) ([]byte, int) {
+	x, y := suffixDecodeString(code, str)
+	return str[:y], x
+}
+
 func collated2Number(code []byte, nk NumberKind) (uint64, int64, float64, int) {
 	var mantissa, scratch [64]byte
 	_, y := collated2Float(code, scratch[:])

value_collate.go

@@ -144,16 +144,3 @@ func collateLength(length int, code []byte) (n int) {
 	n++
 	return n
 }
-
-func collateString(str string, code []byte, config *Config) (n int) {
-	if config.doMissing && MissingLiteral.Equal(str) {
-		code[0], code[1] = TypeMissing, Terminator
-		return 2
-	}
-	code[n] = TypeString
-	n++
-	n += suffixEncodeString(str2bytes(str), code[n:])
-	code[n] = Terminator
-	n++
-	return n
-}