go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-06-06 22:36:25 +02:00
Code Issues Releases Activity

#71 fix map key type of string alias

Browse Source
This commit is contained in:
Tao Wen 2017-06-26 11:52:22 +08:00
parent 0c07128d3c
commit 7d681fe2c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
feature_reflect_map.go
View File

@ -37,7 +37,7 @@ func (decoder *mapDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
keyType := decoder.keyType keyType := decoder.keyType
switch { switch {
case keyType.Kind() == reflect.String: case keyType.Kind() == reflect.String:
realVal.SetMapIndex(reflect.ValueOf(keyStr), elem.Elem()) realVal.SetMapIndex(reflect.ValueOf(keyStr).Convert(keyType), elem.Elem())
return true return true
case keyType.Implements(textUnmarshalerType): case keyType.Implements(textUnmarshalerType):
textUnmarshaler := reflect.New(keyType.Elem()).Interface().(encoding.TextUnmarshaler) textUnmarshaler := reflect.New(keyType.Elem()).Interface().(encoding.TextUnmarshaler)
@ -172,7 +172,7 @@ func (encoder *sortKeysMapEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
if i != 0 { if i != 0 {
stream.WriteMore() stream.WriteMore()
} }
stream.WriteString(key.s) stream.WriteVal(key.s) // might need html escape, so can not WriteString directly
stream.writeByte(':') stream.writeByte(':')
val := realVal.MapIndex(key.v).Interface() val := realVal.MapIndex(key.v).Interface()
encoder.elemEncoder.EncodeInterface(val, stream) encoder.elemEncoder.EncodeInterface(val, stream)