go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-02-19 19:59:49 +02:00
Code Issues Releases Activity

array is just like struct, one element case special for interface{

Browse Source
This commit is contained in:
Tao Wen 2017-06-29 18:58:40 +08:00
parent a6673c983a
commit e6c24947ee
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
feature_reflect_array.go
View File

@ -56,7 +56,16 @@ func (encoder *arrayEncoder) EncodeInterface(val interface{}, stream *Stream) {
stream.WriteArrayEnd()
return
}
WriteToStream(val, stream, encoder)
elemType := encoder.arrayType.Elem()
if encoder.arrayType.Len() == 1 && (elemType.Kind() == reflect.Ptr ||elemType.Kind() == reflect.Map) {
ptr := uintptr(e.word)
e.word = unsafe.Pointer(&ptr)
}
if reflect.TypeOf(val).Kind() == reflect.Ptr {
encoder.Encode(unsafe.Pointer(&e.word), stream)
} else {
encoder.Encode(e.word, stream)
}
}
func (encoder *arrayEncoder) IsEmpty(ptr unsafe.Pointer) bool {

11
jsoniter_interface_test.go
View File

@ -233,7 +233,7 @@ func Test_struct_with_not_nil_embedded(t *testing.T) {
should.Equal("1", obj.Field0)
}
func Test_array_with_one_nil(t *testing.T) {
func Test_array_with_one_nil_ptr(t *testing.T) {
obj := [1]*float64{nil}
should := require.New(t)
output, err := MarshalToString(obj)
@ -241,6 +241,15 @@ func Test_array_with_one_nil(t *testing.T) {
should.Equal(`[null]`, output)
}
func Test_array_with_one_not_nil_ptr(t *testing.T) {
two := float64(2)
obj := [1]*float64{&two}
should := require.New(t)
output, err := MarshalToString(obj)
should.Nil(err)
should.Equal(`[2]`, output)
}
func Test_embedded_array_with_one_nil(t *testing.T) {
type TestObject struct {
Field1 int