re
/
go-json
forked from mirror/go-json
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rule of lower key

This commit is contained in:
Masaaki Goshima 2020-12-23 01:28:56 +09:00
parent 6506007b6c
commit b4a3ab8203
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
decode_compile.go
View File

@ -236,7 +236,10 @@ func (d *Decoder) removeConflictFields(fieldMap map[string]*structFieldSet, conf
isTaggedKey: v.isTaggedKey, isTaggedKey: v.isTaggedKey,
} }
fieldMap[k] = fieldSet fieldMap[k] = fieldSet
fieldMap[strings.ToLower(k)] = fieldSet lower := strings.ToLower(k)
if _, exists := fieldMap[lower]; !exists {
fieldMap[lower] = fieldSet
}
continue continue
} }
if set.isTaggedKey { if set.isTaggedKey {
@ -254,7 +257,10 @@ func (d *Decoder) removeConflictFields(fieldMap map[string]*structFieldSet, conf
isTaggedKey: v.isTaggedKey, isTaggedKey: v.isTaggedKey,
} }
fieldMap[k] = fieldSet fieldMap[k] = fieldSet
fieldMap[strings.ToLower(k)] = fieldSet lower := strings.ToLower(k)
if _, exists := fieldMap[lower]; !exists {
fieldMap[lower] = fieldSet
}
} else { } else {
// conflict tag key // conflict tag key
delete(fieldMap, k) delete(fieldMap, k)
@ -313,7 +319,10 @@ func (d *Decoder) compileStruct(typ *rtype, structName, fieldName string) (decod
isTaggedKey: v.isTaggedKey, isTaggedKey: v.isTaggedKey,
} }
fieldMap[k] = fieldSet fieldMap[k] = fieldSet
fieldMap[strings.ToLower(k)] = fieldSet lower := strings.ToLower(k)
if _, exists := fieldMap[lower]; !exists {
fieldMap[lower] = fieldSet
}
continue continue
} }
if set.isTaggedKey { if set.isTaggedKey {
@ -331,7 +340,10 @@ func (d *Decoder) compileStruct(typ *rtype, structName, fieldName string) (decod
isTaggedKey: v.isTaggedKey, isTaggedKey: v.isTaggedKey,
} }
fieldMap[k] = fieldSet fieldMap[k] = fieldSet
fieldMap[strings.ToLower(k)] = fieldSet lower := strings.ToLower(k)
if _, exists := fieldMap[lower]; !exists {
fieldMap[lower] = fieldSet
}
} else { } else {
// conflict tag key // conflict tag key
delete(fieldMap, k) delete(fieldMap, k)
@ -349,10 +361,16 @@ func (d *Decoder) compileStruct(typ *rtype, structName, fieldName string) (decod
fieldSet := &structFieldSet{dec: dec, offset: field.Offset, isTaggedKey: tag.isTaggedKey} fieldSet := &structFieldSet{dec: dec, offset: field.Offset, isTaggedKey: tag.isTaggedKey}
if tag.key != "" { if tag.key != "" {
fieldMap[tag.key] = fieldSet fieldMap[tag.key] = fieldSet
fieldMap[strings.ToLower(tag.key)] = fieldSet lower := strings.ToLower(tag.key)
if _, exists := fieldMap[lower]; !exists {
fieldMap[lower] = fieldSet
}
} else { } else {
fieldMap[field.Name] = fieldSet fieldMap[field.Name] = fieldSet
fieldMap[strings.ToLower(field.Name)] = fieldSet lower := strings.ToLower(field.Name)
if _, exists := fieldMap[lower]; !exists {
fieldMap[lower] = fieldSet
}
} }
} }
} }