Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

encoding/json: encode map key is of string kind, decode only of string type

Browse source 
Allows encoding and decoding of maps with key of string kind, not just string type.
Fixes #3519.

R=rsc, dave
CC=golang-dev
https://golang.org/cl/6943047
This commit is contained in:
Ryan Slade 2012-12-30 15:40:42 +11:00 • committed by Dave Cheney
parent a22389ec38
commit a4600126d9
2 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pkg/encoding/json/decode.go
View file

@ -430,9 +430,9 @@ func (d *decodeState) object(v reflect.Value) {
// Check type of target: struct or map[string]T
switch v.Kind() {
case reflect.Map:
// map must have string type
// map must have string kind
t := v.Type()
if t.Key() != reflect.TypeOf("") {
if t.Key().Kind() != reflect.String {
d.saveError(&UnmarshalTypeError{"object", v.Type()})
break
}
@ -536,10 +536,12 @@ func (d *decodeState) object(v reflect.Value) {
} else {
d.value(subv)
}
// Write value back to map;
// if using struct, subv points into struct already.
if v.Kind() == reflect.Map {
v.SetMapIndex(reflect.ValueOf(key), subv)
kv := reflect.ValueOf(key).Convert(v.Type().Key())
v.SetMapIndex(kv, subv)
}
// Next token must be , or }.