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

Fix compile for encoding

This commit is contained in:
Masaaki Goshima 2020-04-22 15:29:54 +09:00
parent 2625e69825
commit 31f2422545
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
encode.go
View File

@ -173,9 +173,9 @@ func (e *Encoder) encode(v reflect.Value, ptr unsafe.Pointer) error {
return nil return nil
} }
if typ.Kind() == reflect.Ptr { if typ.Kind() == reflect.Ptr {
v = v.Elem() typ = typ.Elem()
} }
op, err := e.compile(v) op, err := e.compile(typ)
if err != nil { if err != nil {
return err return err
} }
@ -189,18 +189,18 @@ func (e *Encoder) encode(v reflect.Value, ptr unsafe.Pointer) error {
return nil return nil
} }
func (e *Encoder) compile(v reflect.Value) (EncodeOp, error) { func (e *Encoder) compile(typ reflect.Type) (EncodeOp, error) {
switch v.Type().Kind() { switch typ.Kind() {
case reflect.Ptr: case reflect.Ptr:
return e.compilePtr(v) return e.compilePtr(typ)
case reflect.Slice: case reflect.Slice:
return e.compileSlice(v) return e.compileSlice(typ)
case reflect.Struct: case reflect.Struct:
return e.compileStruct(v) return e.compileStruct(typ)
case reflect.Map: case reflect.Map:
return e.compileMap(v) return e.compileMap(typ)
case reflect.Array: case reflect.Array:
return e.compileArray(v) return e.compileArray(typ)
case reflect.Int: case reflect.Int:
return e.compileInt() return e.compileInt()
case reflect.Int8: case reflect.Int8:
@ -234,11 +234,11 @@ func (e *Encoder) compile(v reflect.Value) (EncodeOp, error) {
case reflect.Interface: case reflect.Interface:
return nil, ErrCompileSlowPath return nil, ErrCompileSlowPath
} }
return nil, xerrors.Errorf("failed to encode type %s: %w", v.Type(), ErrUnsupportedType) return nil, xerrors.Errorf("failed to encode type %s: %w", typ, ErrUnsupportedType)
} }
func (e *Encoder) compilePtr(v reflect.Value) (EncodeOp, error) { func (e *Encoder) compilePtr(typ reflect.Type) (EncodeOp, error) {
op, err := e.compile(v.Elem()) op, err := e.compile(typ.Elem())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -306,14 +306,9 @@ func (e *Encoder) compileBool() (EncodeOp, error) {
return func(enc *Encoder, p uintptr) { enc.encodeBool(e.ptrToBool(p)) }, nil return func(enc *Encoder, p uintptr) { enc.encodeBool(e.ptrToBool(p)) }, nil
} }
func (e *Encoder) zeroValue(typ reflect.Type) reflect.Value { func (e *Encoder) compileSlice(typ reflect.Type) (EncodeOp, error) {
return reflect.New(typ).Elem()
}
func (e *Encoder) compileSlice(v reflect.Value) (EncodeOp, error) {
typ := v.Type()
size := typ.Elem().Size() size := typ.Elem().Size()
op, err := e.compile(e.zeroValue(typ.Elem())) op, err := e.compile(typ.Elem())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -338,11 +333,10 @@ func (e *Encoder) compileSlice(v reflect.Value) (EncodeOp, error) {
}, nil }, nil
} }
func (e *Encoder) compileArray(v reflect.Value) (EncodeOp, error) { func (e *Encoder) compileArray(typ reflect.Type) (EncodeOp, error) {
typ := v.Type()
alen := typ.Len() alen := typ.Len()
size := typ.Elem().Size() size := typ.Elem().Size()
op, err := e.compile(e.zeroValue(typ.Elem())) op, err := e.compile(typ.Elem())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -381,8 +375,7 @@ func (e *Encoder) isIgnoredStructField(field reflect.StructField) bool {
return false return false
} }
func (e *Encoder) compileStruct(v reflect.Value) (EncodeOp, error) { func (e *Encoder) compileStruct(typ reflect.Type) (EncodeOp, error) {
typ := v.Type()
fieldNum := typ.NumField() fieldNum := typ.NumField()
opQueue := make([]EncodeOp, 0, fieldNum) opQueue := make([]EncodeOp, 0, fieldNum)
for i := 0; i < fieldNum; i++ { for i := 0; i < fieldNum; i++ {
@ -398,7 +391,7 @@ func (e *Encoder) compileStruct(v reflect.Value) (EncodeOp, error) {
keyName = opts[0] keyName = opts[0]
} }
} }
op, err := e.compile(v.Field(i)) op, err := e.compile(field.Type)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -448,16 +441,17 @@ type valueType struct {
ptr unsafe.Pointer ptr unsafe.Pointer
} }
func (e *Encoder) compileMap(v reflect.Value) (EncodeOp, error) { func (e *Encoder) compileMap(typ reflect.Type) (EncodeOp, error) {
v := reflect.New(typ).Elem()
mapType := (*valueType)(unsafe.Pointer(&v)).typ mapType := (*valueType)(unsafe.Pointer(&v)).typ
keyOp, err := e.compile(e.zeroValue(v.Type().Key())) keyOp, err := e.compile(typ.Key())
if err != nil { if err != nil {
return nil, err return nil, err
} }
if keyOp == nil { if keyOp == nil {
return nil, nil return nil, nil
} }
valueOp, err := e.compile(e.zeroValue(v.Type().Elem())) valueOp, err := e.compile(typ.Elem())
if err != nil { if err != nil {
return nil, err return nil, err
} }