go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-04-23 11:37:32 +02:00
Code Issues Releases Activity

create map if nil

Browse Source
This commit is contained in:
Tao Wen 2017-03-07 18:36:58 -08:00
parent 62028f1ede
commit ceb8c8a733
3 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
feature_reflect.go
View File

@ -200,7 +200,9 @@ func (decoder *mapDecoder) decode(ptr unsafe.Pointer, iter *Iterator) {
mapInterface.word = ptr mapInterface.word = ptr
realInterface := (*interface{})(unsafe.Pointer(&mapInterface)) realInterface := (*interface{})(unsafe.Pointer(&mapInterface))
realVal := reflect.ValueOf(*realInterface).Elem() realVal := reflect.ValueOf(*realInterface).Elem()
if realVal.IsNil() {
realVal.Set(reflect.MakeMap(realVal.Type()))
}
for field := iter.ReadObject(); field != ""; field = iter.ReadObject() { for field := iter.ReadObject(); field != ""; field = iter.ReadObject() {
elem := reflect.New(decoder.elemType) elem := reflect.New(decoder.elemType)
decoder.elemDecoder.decode(unsafe.Pointer(elem.Pointer()), iter) decoder.elemDecoder.decode(unsafe.Pointer(elem.Pointer()), iter)

5
feature_reflect_object.go
View File

@ -33,6 +33,8 @@ func encoderOfStruct(typ reflect.Type) (Encoder, error) {
fieldNames = []string{tagParts[0]} fieldNames = []string{tagParts[0]}
} }
} }
var encoder Encoder
if len(fieldNames) > 0 {
encoder, err := encoderOfType(field.Type) encoder, err := encoderOfType(field.Type)
if err != nil { if err != nil {
return prefix(fmt.Sprintf("{%s}", field.Name)).addToEncoder(encoder, err) return prefix(fmt.Sprintf("{%s}", field.Name)).addToEncoder(encoder, err)
@ -42,6 +44,7 @@ func encoderOfStruct(typ reflect.Type) (Encoder, error) {
if field.Type.Kind() == reflect.Map && typ.NumField() > 1 { if field.Type.Kind() == reflect.Map && typ.NumField() > 1 {
encoder = &optionalEncoder{field.Type, encoder} encoder = &optionalEncoder{field.Type, encoder}
} }
}
for _, fieldName := range fieldNames { for _, fieldName := range fieldNames {
if structEncoder_.firstField == nil { if structEncoder_.firstField == nil {
structEncoder_.firstField = &structFieldEncoder{&field, fieldName, encoder} structEncoder_.firstField = &structFieldEncoder{&field, fieldName, encoder}
@ -85,7 +88,7 @@ func decoderOfStruct(typ reflect.Type) (Decoder, error) {
fieldNames = []string{tagParts[0]} fieldNames = []string{tagParts[0]}
} }
} }
if decoder == nil { if decoder == nil && len(fieldNames) > 0 {
var err error var err error
decoder, err = decoderOfType(field.Type) decoder, err = decoderOfType(field.Type)
if err != nil { if err != nil {

15
jsoniter_reflect_struct_test.go
View File

@ -3,6 +3,7 @@ package jsoniter
import ( import (
"testing" "testing"
"github.com/json-iterator/go/require" "github.com/json-iterator/go/require"
"bytes"
) )
func Test_decode_one_field_struct(t *testing.T) { func Test_decode_one_field_struct(t *testing.T) {
@ -144,3 +145,17 @@ func Test_write_val_one_field_struct(t *testing.T) {
should.Nil(err) should.Nil(err)
should.Equal(`{"field-1":"hello"}`, str) should.Equal(`{"field-1":"hello"}`, str)
} }
func Test_mixed(t *testing.T) {
should := require.New(t)
type AA struct {
ID int `json:"id"`
Payload map[string]interface{} `json:"payload"`
buf *bytes.Buffer `json:"-"`
}
aa := AA{}
err := UnmarshalFromString(` {"id":1, "payload":{"account":"123","password":"456"}}`, &aa)
should.Nil(err)
should.Equal(1, aa.ID)
should.Equal("123", aa.Payload["account"])
}