netbird/easyjson
0
0
Fork 0
mirror of https://github.com/netbirdio/easyjson.git synced 2026-05-22 18:44:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #204 from hhh0pE/unnamed_embedded_field

Browse Source 
improved gen getStructFields: for anonymous field that is not a struct.
This commit is contained in:
GoWebProd
2020-03-30 23:38:48 +03:00
committed by GitHub
parent 612e635679 6a8072e759
commit e790aae53f
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gen/decoder.go
+13 -5
View File
@@ -367,6 +367,7 @@ func getStructFields(t reflect.Type) ([]reflect.StructField, error) {
}
var efields []reflect.StructField
var fields []reflect.StructField
for i := 0; i < t.NumField(); i++ {
f := t.Field(i)
tags := parseFieldTags(f)
@@ -379,14 +380,21 @@ func getStructFields(t reflect.Type) ([]reflect.StructField, error) {
t1 = t1.Elem()
}
fs, err := getStructFields(t1)
if err != nil {
return nil, fmt.Errorf("error processing embedded field: %v", err)
if t1.Kind() == reflect.Struct {
fs, err := getStructFields(t1)
if err != nil {
return nil, fmt.Errorf("error processing embedded field: %v", err)
}
efields = mergeStructFields(efields, fs)
} else if (t1.Kind() >= reflect.Bool && t1.Kind() < reflect.Complex128) || t1.Kind() == reflect.String {
if strings.Contains(f.Name, ".") || unicode.IsUpper([]rune(f.Name)[0]) {
fields = append(fields, f)
}
}
efields = mergeStructFields(efields, fs)
}
var fields []reflect.StructField
for i := 0; i < t.NumField(); i++ {
f := t.Field(i)
tags := parseFieldTags(f)