go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-06-24 23:16:47 +02:00
Code Issues Releases Activity

fix anonymous fields

Browse Source
This commit is contained in:
Tao Wen
2017-06-21 00:26:18 +08:00
parent 3333ec11a0
commit ff3c624fa9
12 changed files with 58 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
feature_reflect_extension.go
View File

@ -1,11 +1,11 @@
package jsoniter
import (
"reflect"
"fmt"
"unsafe"
"reflect"
"strings"
"unicode"
"unsafe"
)
var typeDecoders = map[string]ValDecoder{}
@ -192,6 +192,7 @@ func _getTypeEncoderFromExtension(typ reflect.Type) ValEncoder {
}
func describeStruct(cfg *frozenConfig, typ reflect.Type) (*StructDescriptor, error) {
anonymousBindings := []*Binding{}
bindings := []*Binding{}
for i := 0; i < typ.NumField(); i++ {
field := typ.Field(i)
@ -202,7 +203,7 @@ func describeStruct(cfg *frozenConfig, typ reflect.Type) (*StructDescriptor, err
return nil, err
}
for _, binding := range structDescriptor.Fields {
bindings = append(bindings, binding)
anonymousBindings = append(anonymousBindings, binding)
}
} else if field.Type.Kind() == reflect.Ptr && field.Type.Elem().Kind() == reflect.Struct {
structDescriptor, err := describeStruct(cfg, field.Type.Elem())
@ -214,7 +215,7 @@ func describeStruct(cfg *frozenConfig, typ reflect.Type) (*StructDescriptor, err
binding.Encoder = &structFieldEncoder{&field, binding.Encoder, false}
binding.Decoder = &optionalDecoder{field.Type, binding.Decoder}
binding.Decoder = &structFieldDecoder{&field, binding.Decoder}
bindings = append(bindings, binding)
anonymousBindings = append(anonymousBindings, binding)
}
}
} else {
@ -272,6 +273,8 @@ func describeStruct(cfg *frozenConfig, typ reflect.Type) (*StructDescriptor, err
binding.Decoder = &structFieldDecoder{binding.Field, binding.Decoder}
binding.Encoder = &structFieldEncoder{binding.Field, binding.Encoder, shouldOmitEmpty}
}
// insert anonymous bindings to the head
structDescriptor.Fields = append(anonymousBindings, structDescriptor.Fields...)
return structDescriptor, nil
}