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

#63 fix embed struct at last

Browse Source
This commit is contained in:
Tao Wen 2017-06-23 07:45:18 +08:00
parent ebed7df895
commit d7ea1acd3f
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feature_reflect_extension.go
View File

@ -203,6 +203,8 @@ func describeStruct(cfg *frozenConfig, typ reflect.Type) (*StructDescriptor, err
return nil, err return nil, err
} }
for _, binding := range structDescriptor.Fields { for _, binding := range structDescriptor.Fields {
binding.Encoder = &structFieldEncoder{&field, binding.Encoder, false}
binding.Decoder = &structFieldDecoder{&field, binding.Decoder}
anonymousBindings = append(anonymousBindings, binding) anonymousBindings = append(anonymousBindings, binding)
} }
} else if field.Type.Kind() == reflect.Ptr && field.Type.Elem().Kind() == reflect.Struct { } else if field.Type.Kind() == reflect.Ptr && field.Type.Elem().Kind() == reflect.Struct {

19
jsoniter_object_test.go
View File

@ -407,6 +407,25 @@ func Test_shadow_struct_field(t *testing.T) {
should.Contains(output, `"max_age":20`) should.Contains(output, `"max_age":20`)
} }
func Test_embed_at_last(t *testing.T) {
type Base struct {
Type string `json:"type"`
}
type Struct struct {
Field string `json:"field"`
FieldType string `json:"field_type"`
Base
}
should := require.New(t)
s := Struct{Field: "field", FieldType: "field_type", Base: Base{"type"}}
output, err := MarshalToString(s)
should.Nil(err)
should.Contains(output, `"type":"type"`)
should.Contains(output, `"field":"field"`)
should.Contains(output, `"field_type":"field_type"`)
}
func Test_decode_nested(t *testing.T) { func Test_decode_nested(t *testing.T) {
type StructOfString struct { type StructOfString struct {
Field1 string Field1 string