go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-04-20 11:28:49 +02:00
Code Issues Releases Activity

check nil for interface{}

Browse Source
This commit is contained in:
Tao Wen 2018-02-17 22:33:09 +08:00
parent 9dafbc667f
commit ef3038593b
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
feature_reflect_native.go
View File

@ -599,7 +599,7 @@ type marshalerEncoder struct {
func (encoder *marshalerEncoder) Encode(ptr unsafe.Pointer, stream *Stream) { func (encoder *marshalerEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
obj := encoder.valType.UnsafeIndirect(ptr) obj := encoder.valType.UnsafeIndirect(ptr)
if obj == nil { if reflect2.IsNil(obj) {
stream.WriteNil() stream.WriteNil()
return return
} }
@ -623,7 +623,7 @@ type textMarshalerEncoder struct {
func (encoder *textMarshalerEncoder) Encode(ptr unsafe.Pointer, stream *Stream) { func (encoder *textMarshalerEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
obj := encoder.valType.UnsafeIndirect(ptr) obj := encoder.valType.UnsafeIndirect(ptr)
if obj == nil { if reflect2.IsNil(obj) {
stream.WriteNil() stream.WriteNil()
return return
} }

4
type_tests/struct_test.go
View File

@ -251,8 +251,8 @@ func init() {
})(nil), })(nil),
(*struct { (*struct {
TF1 struct { TF1 struct {
F1 withTime F2 int
F2 *withTime F1 *withTime
} }
})(nil), })(nil),
(*DeeplyNested)(nil), (*DeeplyNested)(nil),

11
type_tests/type_test.go
View File

@ -15,7 +15,18 @@ import (
var testCases []interface{} var testCases []interface{}
var asymmetricTestCases [][2]interface{} var asymmetricTestCases [][2]interface{}
type selectedSymmetricCase struct {
testCase interface{}
}
func Test_symmetric(t *testing.T) { func Test_symmetric(t *testing.T) {
for _, testCase := range testCases {
selectedSymmetricCase, found := testCase.(selectedSymmetricCase)
if found {
testCases = []interface{}{selectedSymmetricCase.testCase}
break
}
}
for _, testCase := range testCases { for _, testCase := range testCases {
valType := reflect.TypeOf(testCase).Elem() valType := reflect.TypeOf(testCase).Elem()
t.Run(valType.String(), func(t *testing.T) { t.Run(valType.String(), func(t *testing.T) {