Commit 71ac162

authored

Merge pull request #635 from molon/fix-tests

encoding/json: Compatibility optimization

2 parents bf8b920 + 720cd42 commit 71ac162Copy full SHA for 71ac162

File tree

+33

-13

lines changed

+33

-13

lines changed

Lines changed: 12 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,12 @@ package jsoniter`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "github.com/modern-go/reflect2"`
`6`	`5`	`"io"`
`7`	`6`	`"reflect"`
`8`	`7`	`"sort"`
`9`	`8`	`"unsafe"`
	`9`	`+`
	`10`	`+ "github.com/modern-go/reflect2"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`func decoderOfMap(ctx *ctx, typ reflect2.Type) ValDecoder {`
`@@ -106,15 +107,17 @@ func encoderOfMapKey(ctx *ctx, typ reflect2.Type) ValEncoder {`
`106`	`107`	`}`
`107`	`108`	`}`
`108`	`109`
`109`		`- if typ == textMarshalerType {`
`110`		`- return &directTextMarshalerEncoder{`
`111`		`- stringEncoder: ctx.EncoderOf(reflect2.TypeOf("")),`
	`110`	`+ if typ.Kind() != reflect.String {`
	`111`	`+ if typ == textMarshalerType {`
	`112`	`+ return &directTextMarshalerEncoder{`
	`113`	`+ stringEncoder: ctx.EncoderOf(reflect2.TypeOf("")),`
	`114`	`+ }`
`112`	`115`	`}`
`113`		`- }`
`114`		`- iftyp.Implements(textMarshalerType) {`
`115`		`- return&textMarshalerEncoder{`
`116`		`- valType: typ,`
`117`		`- stringEncoder: ctx.EncoderOf(reflect2.TypeOf("")),`
	`116`	`+ iftyp.Implements(textMarshalerType) {`
	`117`	`+ return&textMarshalerEncoder{`
	`118`	`+ valType: typ,`
	`119`	`+ stringEncoder: ctx.EncoderOf(reflect2.TypeOf("")),`
	`120`	`+ }`
`118`	`121`	`}`
`119`	`122`	`}`
`120`	`123`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,14 @@ func (stream *Stream) WriteFloat32(val float32) {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`stream.buf = strconv.AppendFloat(stream.buf, float64(val), fmt, -1, 32)`
	`30`	`+ if fmt == 'e' {`
	`31`	`+ // clean up e-09 to e-9`
	`32`	`+ n := len(stream.buf)`
	`33`	`+ if n >= 4 && stream.buf[n-4] == 'e' && stream.buf[n-3] == '-' && stream.buf[n-2] == '0' {`
	`34`	`+ stream.buf[n-2] = stream.buf[n-1]`
	`35`	`+ stream.buf = stream.buf[:n-1]`
	`36`	`+ }`
	`37`	`+ }`
`30`	`38`	`}`
`31`	`39`
`32`	`40`	`// WriteFloat32Lossy write float32 to stream with ONLY 6 digits precision although much much faster`
`@@ -76,6 +84,14 @@ func (stream *Stream) WriteFloat64(val float64) {`
`76`	`84`	`}`
`77`	`85`	`}`
`78`	`86`	`stream.buf = strconv.AppendFloat(stream.buf, float64(val), fmt, -1, 64)`
	`87`	`+ if fmt == 'e' {`
	`88`	`+ // clean up e-09 to e-9`
	`89`	`+ n := len(stream.buf)`
	`90`	`+ if n >= 4 && stream.buf[n-4] == 'e' && stream.buf[n-3] == '-' && stream.buf[n-2] == '0' {`
	`91`	`+ stream.buf[n-2] = stream.buf[n-1]`
	`92`	`+ stream.buf = stream.buf[:n-1]`
	`93`	`+ }`
	`94`	`+ }`
`79`	`95`	`}`
`80`	`96`
`81`	`97`	`// WriteFloat64Lossy write float64 to stream with ONLY 6 digits precision although much much faster`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,11 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"encoding/json"`
`6`	`6`	`"fmt"`
`7`		`- "github.com/json-iterator/go"`
`8`		`- "github.com/stretchr/testify/require"`
`9`	`7`	`"strconv"`
`10`	`8`	`"testing"`
	`9`	`+`
	`10`	`+ jsoniter "github.com/json-iterator/go"`
	`11`	`+ "github.com/stretchr/testify/require"`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`func Test_read_float(t *testing.T) {`
`@@ -88,7 +89,7 @@ func Test_write_float32(t *testing.T) {`
`88`	`89`
`89`	`90`	`stream = jsoniter.NewStream(jsoniter.ConfigDefault, nil, 0)`
`90`	`91`	`stream.WriteFloat32(float32(0.0000001))`
`91`		`- should.Equal("1e-07", string(stream.Buffer()))`
	`92`	`+ should.Equal("1e-7", string(stream.Buffer()))`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`func Test_write_float64(t *testing.T) {`
`@@ -125,5 +126,5 @@ func Test_write_float64(t *testing.T) {`
`125`	`126`
`126`	`127`	`stream = jsoniter.NewStream(jsoniter.ConfigDefault, nil, 0)`
`127`	`128`	`stream.WriteFloat64(float64(0.0000001))`
`128`		`- should.Equal("1e-07", string(stream.Buffer()))`
	`129`	`+ should.Equal("1e-7", string(stream.Buffer()))`
`129`	`130`	`}`

Comments

(0)