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

Refactor error of marshaler

This commit is contained in:
Masaaki Goshima 2020-11-17 15:08:12 +09:00
parent 69ea157270
commit c79cf6a3f5
1 changed files with 26 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
encode_vm.go
View File

@ -41,6 +41,14 @@ func errUnsupportedFloat(v float64) *UnsupportedValueError {
Str: strconv.FormatFloat(v, 'g', -1, 64), Str: strconv.FormatFloat(v, 'g', -1, 64),
} }
} }
func errMarshaler(code *opcode, err error) *MarshalerError {
return &MarshalerError{
Type: rtype2type(code.typ),
Err: err,
}
}
func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error { func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
recursiveLevel := 0 recursiveLevel := 0
seenPtr := map[uintptr]struct{}{} seenPtr := map[uintptr]struct{}{}
@ -374,10 +382,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
b, err := v.(Marshaler).MarshalJSON() b, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
if len(b) == 0 { if len(b) == 0 {
return errUnexpectedEndOfJSON( return errUnexpectedEndOfJSON(
@ -411,10 +416,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
b, err := v.(Marshaler).MarshalJSON() b, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
if len(b) == 0 { if len(b) == 0 {
return errUnexpectedEndOfJSON( return errUnexpectedEndOfJSON(
@ -460,10 +462,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
bytes, err := v.(encoding.TextMarshaler).MarshalText() bytes, err := v.(encoding.TextMarshaler).MarshalText()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
e.encodeString(*(*string)(unsafe.Pointer(&bytes))) e.encodeString(*(*string)(unsafe.Pointer(&bytes)))
e.encodeByte(',') e.encodeByte(',')
@ -489,10 +488,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
bytes, err := v.(encoding.TextMarshaler).MarshalText() bytes, err := v.(encoding.TextMarshaler).MarshalText()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
e.encodeString(*(*string)(unsafe.Pointer(&bytes))) e.encodeString(*(*string)(unsafe.Pointer(&bytes)))
e.encodeBytes([]byte{',', '\n'}) e.encodeBytes([]byte{',', '\n'})
@ -1839,10 +1835,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
} }
b, err := rv.Interface().(Marshaler).MarshalJSON() b, err := rv.Interface().(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
if len(b) == 0 { if len(b) == 0 {
return errUnexpectedEndOfJSON( return errUnexpectedEndOfJSON(
@ -1880,10 +1873,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
} }
b, err := rv.Interface().(Marshaler).MarshalJSON() b, err := rv.Interface().(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
if len(b) == 0 { if len(b) == 0 {
return errUnexpectedEndOfJSON( return errUnexpectedEndOfJSON(
@ -1932,10 +1922,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
} }
bytes, err := rv.Interface().(encoding.TextMarshaler).MarshalText() bytes, err := rv.Interface().(encoding.TextMarshaler).MarshalText()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
e.encodeString(*(*string)(unsafe.Pointer(&bytes))) e.encodeString(*(*string)(unsafe.Pointer(&bytes)))
e.encodeByte(',') e.encodeByte(',')
@ -1964,10 +1951,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
} }
bytes, err := rv.Interface().(encoding.TextMarshaler).MarshalText() bytes, err := rv.Interface().(encoding.TextMarshaler).MarshalText()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
e.encodeString(*(*string)(unsafe.Pointer(&bytes))) e.encodeString(*(*string)(unsafe.Pointer(&bytes)))
e.encodeByte(',') e.encodeByte(',')
@ -4373,10 +4357,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
v := *(*interface{})(unsafe.Pointer(&interfaceHeader{typ: code.typ, ptr: p})) v := *(*interface{})(unsafe.Pointer(&interfaceHeader{typ: code.typ, ptr: p}))
bytes, err := v.(encoding.TextMarshaler).MarshalText() bytes, err := v.(encoding.TextMarshaler).MarshalText()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
e.encodeKey(code) e.encodeKey(code)
e.encodeString(*(*string)(unsafe.Pointer(&bytes))) e.encodeString(*(*string)(unsafe.Pointer(&bytes)))
@ -5032,10 +5013,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
b, err := v.(Marshaler).MarshalJSON() b, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
var buf bytes.Buffer var buf bytes.Buffer
if err := compact(&buf, b, e.enabledHTMLEscape); err != nil { if err := compact(&buf, b, e.enabledHTMLEscape); err != nil {
@ -5054,10 +5032,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
bytes, err := v.(encoding.TextMarshaler).MarshalText() bytes, err := v.(encoding.TextMarshaler).MarshalText()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
e.encodeString(*(*string)(unsafe.Pointer(&bytes))) e.encodeString(*(*string)(unsafe.Pointer(&bytes)))
e.encodeByte(',') e.encodeByte(',')
@ -5242,10 +5217,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
b, err := v.(Marshaler).MarshalJSON() b, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
var buf bytes.Buffer var buf bytes.Buffer
if err := compact(&buf, b, e.enabledHTMLEscape); err != nil { if err := compact(&buf, b, e.enabledHTMLEscape); err != nil {
@ -5502,10 +5474,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
if v != nil { if v != nil {
b, err := v.(Marshaler).MarshalJSON() b, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
var buf bytes.Buffer var buf bytes.Buffer
if err := compact(&buf, b, e.enabledHTMLEscape); err != nil { if err := compact(&buf, b, e.enabledHTMLEscape); err != nil {
@ -5529,10 +5498,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
bytes, err := v.(encoding.TextMarshaler).MarshalText() bytes, err := v.(encoding.TextMarshaler).MarshalText()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
e.encodeString(*(*string)(unsafe.Pointer(&bytes))) e.encodeString(*(*string)(unsafe.Pointer(&bytes)))
e.encodeByte(',') e.encodeByte(',')
@ -5958,10 +5924,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
b, err := v.(Marshaler).MarshalJSON() b, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
var buf bytes.Buffer var buf bytes.Buffer
if err := compact(&buf, b, e.enabledHTMLEscape); err != nil { if err := compact(&buf, b, e.enabledHTMLEscape); err != nil {
@ -5979,10 +5942,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
bytes, err := v.(encoding.TextMarshaler).MarshalText() bytes, err := v.(encoding.TextMarshaler).MarshalText()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
e.encodeString(*(*string)(unsafe.Pointer(&bytes))) e.encodeString(*(*string)(unsafe.Pointer(&bytes)))
e.encodeByte(',') e.encodeByte(',')
@ -6143,10 +6103,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
b, err := v.(Marshaler).MarshalJSON() b, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
var buf bytes.Buffer var buf bytes.Buffer
if err := compact(&buf, b, e.enabledHTMLEscape); err != nil { if err := compact(&buf, b, e.enabledHTMLEscape); err != nil {
@ -6167,10 +6124,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, code *opcode) error {
})) }))
bytes, err := v.(encoding.TextMarshaler).MarshalText() bytes, err := v.(encoding.TextMarshaler).MarshalText()
if err != nil { if err != nil {
return &MarshalerError{ return errMarshaler(code, err)
Type: rtype2type(code.typ),
Err: err,
}
} }
e.encodeString(*(*string)(unsafe.Pointer(&bytes))) e.encodeString(*(*string)(unsafe.Pointer(&bytes)))
e.encodeBytes([]byte{',', '\n'}) e.encodeBytes([]byte{',', '\n'})