Update 3rd party package dependencies

This commit is contained in:
Tobie Morgan Hitchcock 2018-04-14 19:24:25 +01:00
parent bc31140308
commit dc700c34f6
4 changed files with 3516 additions and 5479 deletions

View file

@ -4,66 +4,66 @@ package db
import ( import (
"errors" "errors"
"fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
"reflect"
"runtime" "runtime"
"strconv"
) )
const ( const (
// ----- content types ---- // ----- content types ----
codecSelferCcUTF82423 = 1 codecSelferCcUTF81891 = 1
codecSelferCcRAW2423 = 0 codecSelferCcRAW1891 = 0
// ----- value types used ---- // ----- value types used ----
codecSelferValueTypeArray2423 = 10 codecSelferValueTypeArray1891 = 10
codecSelferValueTypeMap2423 = 9 codecSelferValueTypeMap1891 = 9
codecSelferValueTypeString1891 = 6
codecSelferValueTypeInt1891 = 2
codecSelferValueTypeUint1891 = 3
codecSelferValueTypeFloat1891 = 4
codecSelferBitsize1891 = uint8(32 << (^uint(0) >> 63))
) )
var ( var (
codecSelferBitsize2423 = uint8(reflect.TypeOf(uint(0)).Bits()) errCodecSelferOnlyMapOrArrayEncodeToStruct1891 = errors.New(`only encoded map or array can be decoded into a struct`)
errCodecSelferOnlyMapOrArrayEncodeToStruct2423 = errors.New(`only encoded map or array can be decoded into a struct`)
) )
type codecSelfer2423 struct{} type codecSelfer1891 struct{}
func init() { func init() {
if codec1978.GenVersion != 8 { if codec1978.GenVersion != 8 {
_, file, _, _ := runtime.Caller(0) _, file, _, _ := runtime.Caller(0)
err := fmt.Errorf("codecgen version mismatch: current: %v, need %v. Re-generate file: %v", panic("codecgen version mismatch: current: 8, need " + strconv.FormatInt(int64(codec1978.GenVersion), 10) + ". Re-generate file: " + file)
8, codec1978.GenVersion, file)
panic(err)
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
} }
} }
func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) { func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
var h codecSelfer2423 var h codecSelfer1891
z, r := codec1978.GenHelperEncoder(e) z, r := codec1978.GenHelperEncoder(e)
_, _, _ = h, z, r _, _, _ = h, z, r
if x == nil { if x == nil {
r.EncodeNil() r.EncodeNil()
} else { } else {
yym1 := z.EncBinary()
_ = yym1
if false { if false {
} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil { } else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
z.EncExtension(x, yyxt1) z.EncExtension(x, yyxt1)
} else { } else {
yysep2 := !z.EncBinary() yysep2 := !z.EncBinary()
yy2arr2 := z.EncBasicHandle().StructToArray yy2arr2 := z.EncBasicHandle().StructToArray
var yyq2 [4]bool
_ = yyq2
_, _ = yysep2, yy2arr2 _, _ = yysep2, yy2arr2
const yyr2 bool = false const yyr2 bool = false // struct tag has 'toArray'
yyq2[0] = x.Time != "" var yyq2 = [4]bool{ // should field at this index be written?
yyq2[1] = x.Status != "" x.Time != "", // Time
yyq2[2] = x.Detail != "" x.Status != "", // Status
yyq2[3] = len(x.Result) != 0 x.Detail != "", // Detail
len(x.Result) != 0, // Result
}
_ = yyq2
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.WriteArrayStart(4) r.WriteArrayStart(4)
} else { } else {
var yynn2 = 0 var yynn2 int
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -75,75 +75,63 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.WriteArrayElem() r.WriteArrayElem()
if yyq2[0] { if yyq2[0] {
yym4 := z.EncBinary()
_ = yym4
if false { if false {
} else { } else {
r.EncodeString(codecSelferCcUTF82423, string(x.Time)) r.EncodeString(codecSelferCcUTF81891, string(x.Time))
} }
} else { } else {
r.EncodeString(codecSelferCcUTF82423, "") r.EncodeString(codecSelferCcUTF81891, "")
} }
} else { } else {
if yyq2[0] { if yyq2[0] {
r.WriteMapElemKey() r.WriteMapElemKey()
r.EncodeString(codecSelferCcUTF82423, `time`) r.EncodeString(codecSelferCcUTF81891, `time`)
r.WriteMapElemValue() r.WriteMapElemValue()
yym5 := z.EncBinary()
_ = yym5
if false { if false {
} else { } else {
r.EncodeString(codecSelferCcUTF82423, string(x.Time)) r.EncodeString(codecSelferCcUTF81891, string(x.Time))
} }
} }
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.WriteArrayElem() r.WriteArrayElem()
if yyq2[1] { if yyq2[1] {
yym7 := z.EncBinary()
_ = yym7
if false { if false {
} else { } else {
r.EncodeString(codecSelferCcUTF82423, string(x.Status)) r.EncodeString(codecSelferCcUTF81891, string(x.Status))
} }
} else { } else {
r.EncodeString(codecSelferCcUTF82423, "") r.EncodeString(codecSelferCcUTF81891, "")
} }
} else { } else {
if yyq2[1] { if yyq2[1] {
r.WriteMapElemKey() r.WriteMapElemKey()
r.EncodeString(codecSelferCcUTF82423, `status`) r.EncodeString(codecSelferCcUTF81891, `status`)
r.WriteMapElemValue() r.WriteMapElemValue()
yym8 := z.EncBinary()
_ = yym8
if false { if false {
} else { } else {
r.EncodeString(codecSelferCcUTF82423, string(x.Status)) r.EncodeString(codecSelferCcUTF81891, string(x.Status))
} }
} }
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.WriteArrayElem() r.WriteArrayElem()
if yyq2[2] { if yyq2[2] {
yym10 := z.EncBinary()
_ = yym10
if false { if false {
} else { } else {
r.EncodeString(codecSelferCcUTF82423, string(x.Detail)) r.EncodeString(codecSelferCcUTF81891, string(x.Detail))
} }
} else { } else {
r.EncodeString(codecSelferCcUTF82423, "") r.EncodeString(codecSelferCcUTF81891, "")
} }
} else { } else {
if yyq2[2] { if yyq2[2] {
r.WriteMapElemKey() r.WriteMapElemKey()
r.EncodeString(codecSelferCcUTF82423, `detail`) r.EncodeString(codecSelferCcUTF81891, `detail`)
r.WriteMapElemValue() r.WriteMapElemValue()
yym11 := z.EncBinary()
_ = yym11
if false { if false {
} else { } else {
r.EncodeString(codecSelferCcUTF82423, string(x.Detail)) r.EncodeString(codecSelferCcUTF81891, string(x.Detail))
} }
} }
} }
@ -153,8 +141,6 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
if x.Result == nil { if x.Result == nil {
r.EncodeNil() r.EncodeNil()
} else { } else {
yym13 := z.EncBinary()
_ = yym13
if false { if false {
} else { } else {
z.F.EncSliceIntfV(x.Result, e) z.F.EncSliceIntfV(x.Result, e)
@ -166,13 +152,11 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
} else { } else {
if yyq2[3] { if yyq2[3] {
r.WriteMapElemKey() r.WriteMapElemKey()
r.EncodeString(codecSelferCcUTF82423, `result`) r.EncodeString(codecSelferCcUTF81891, `result`)
r.WriteMapElemValue() r.WriteMapElemValue()
if x.Result == nil { if x.Result == nil {
r.EncodeNil() r.EncodeNil()
} else { } else {
yym14 := z.EncBinary()
_ = yym14
if false { if false {
} else { } else {
z.F.EncSliceIntfV(x.Result, e) z.F.EncSliceIntfV(x.Result, e)
@ -190,24 +174,22 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
} }
func (x *Response) CodecDecodeSelf(d *codec1978.Decoder) { func (x *Response) CodecDecodeSelf(d *codec1978.Decoder) {
var h codecSelfer2423 var h codecSelfer1891
z, r := codec1978.GenHelperDecoder(d) z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r _, _, _ = h, z, r
yym1 := z.DecBinary()
_ = yym1
if false { if false {
} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil { } else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
z.DecExtension(x, yyxt1) z.DecExtension(x, yyxt1)
} else { } else {
yyct2 := r.ContainerType() yyct2 := r.ContainerType()
if yyct2 == codecSelferValueTypeMap2423 { if yyct2 == codecSelferValueTypeMap1891 {
yyl2 := r.ReadMapStart() yyl2 := r.ReadMapStart()
if yyl2 == 0 { if yyl2 == 0 {
r.ReadMapEnd() r.ReadMapEnd()
} else { } else {
x.codecDecodeSelfFromMap(yyl2, d) x.codecDecodeSelfFromMap(yyl2, d)
} }
} else if yyct2 == codecSelferValueTypeArray2423 { } else if yyct2 == codecSelferValueTypeArray1891 {
yyl2 := r.ReadArrayStart() yyl2 := r.ReadArrayStart()
if yyl2 == 0 { if yyl2 == 0 {
r.ReadArrayEnd() r.ReadArrayEnd()
@ -215,17 +197,15 @@ func (x *Response) CodecDecodeSelf(d *codec1978.Decoder) {
x.codecDecodeSelfFromArray(yyl2, d) x.codecDecodeSelfFromArray(yyl2, d)
} }
} else { } else {
panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2423) panic(errCodecSelferOnlyMapOrArrayEncodeToStruct1891)
} }
} }
} }
func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
var h codecSelfer2423 var h codecSelfer1891
z, r := codec1978.GenHelperDecoder(d) z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r _, _, _ = h, z, r
var yys3Slc = z.DecScratchBuffer() // default slice to decode into
_ = yys3Slc
var yyhl3 bool = l >= 0 var yyhl3 bool = l >= 0
for yyj3 := 0; ; yyj3++ { for yyj3 := 0; ; yyj3++ {
if yyhl3 { if yyhl3 {
@ -238,56 +218,34 @@ func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} }
r.ReadMapElemKey() r.ReadMapElemKey()
yys3Slc = r.DecodeStringAsBytes() yys3 := z.StringView(r.DecodeStringAsBytes())
yys3 := string(yys3Slc)
r.ReadMapElemValue() r.ReadMapElemValue()
switch yys3 { switch yys3 {
case "time": case "time":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Time = "" x.Time = ""
} else { } else {
yyv4 := &x.Time x.Time = (string)(r.DecodeString())
yym5 := z.DecBinary()
_ = yym5
if false {
} else {
*((*string)(yyv4)) = r.DecodeString()
}
} }
case "status": case "status":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Status = "" x.Status = ""
} else { } else {
yyv6 := &x.Status x.Status = (string)(r.DecodeString())
yym7 := z.DecBinary()
_ = yym7
if false {
} else {
*((*string)(yyv6)) = r.DecodeString()
}
} }
case "detail": case "detail":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Detail = "" x.Detail = ""
} else { } else {
yyv8 := &x.Detail x.Detail = (string)(r.DecodeString())
yym9 := z.DecBinary()
_ = yym9
if false {
} else {
*((*string)(yyv8)) = r.DecodeString()
}
} }
case "result": case "result":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Result = nil x.Result = nil
} else { } else {
yyv10 := &x.Result
yym11 := z.DecBinary()
_ = yym11
if false { if false {
} else { } else {
z.F.DecSliceIntfX(yyv10, d) z.F.DecSliceIntfX(&x.Result, d)
} }
} }
default: default:
@ -298,19 +256,19 @@ func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
var h codecSelfer2423 var h codecSelfer1891
z, r := codec1978.GenHelperDecoder(d) z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r _, _, _ = h, z, r
var yyj12 int var yyj9 int
var yyb12 bool var yyb9 bool
var yyhl12 bool = l >= 0 var yyhl9 bool = l >= 0
yyj12++ yyj9++
if yyhl12 { if yyhl9 {
yyb12 = yyj12 > l yyb9 = yyj9 > l
} else { } else {
yyb12 = r.CheckBreak() yyb9 = r.CheckBreak()
} }
if yyb12 { if yyb9 {
r.ReadArrayEnd() r.ReadArrayEnd()
return return
} }
@ -318,21 +276,15 @@ func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Time = "" x.Time = ""
} else { } else {
yyv13 := &x.Time x.Time = (string)(r.DecodeString())
yym14 := z.DecBinary()
_ = yym14
if false {
} else {
*((*string)(yyv13)) = r.DecodeString()
}
} }
yyj12++ yyj9++
if yyhl12 { if yyhl9 {
yyb12 = yyj12 > l yyb9 = yyj9 > l
} else { } else {
yyb12 = r.CheckBreak() yyb9 = r.CheckBreak()
} }
if yyb12 { if yyb9 {
r.ReadArrayEnd() r.ReadArrayEnd()
return return
} }
@ -340,21 +292,15 @@ func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Status = "" x.Status = ""
} else { } else {
yyv15 := &x.Status x.Status = (string)(r.DecodeString())
yym16 := z.DecBinary()
_ = yym16
if false {
} else {
*((*string)(yyv15)) = r.DecodeString()
}
} }
yyj12++ yyj9++
if yyhl12 { if yyhl9 {
yyb12 = yyj12 > l yyb9 = yyj9 > l
} else { } else {
yyb12 = r.CheckBreak() yyb9 = r.CheckBreak()
} }
if yyb12 { if yyb9 {
r.ReadArrayEnd() r.ReadArrayEnd()
return return
} }
@ -362,21 +308,15 @@ func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Detail = "" x.Detail = ""
} else { } else {
yyv17 := &x.Detail x.Detail = (string)(r.DecodeString())
yym18 := z.DecBinary()
_ = yym18
if false {
} else {
*((*string)(yyv17)) = r.DecodeString()
}
} }
yyj12++ yyj9++
if yyhl12 { if yyhl9 {
yyb12 = yyj12 > l yyb9 = yyj9 > l
} else { } else {
yyb12 = r.CheckBreak() yyb9 = r.CheckBreak()
} }
if yyb12 { if yyb9 {
r.ReadArrayEnd() r.ReadArrayEnd()
return return
} }
@ -384,56 +324,52 @@ func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Result = nil x.Result = nil
} else { } else {
yyv19 := &x.Result
yym20 := z.DecBinary()
_ = yym20
if false { if false {
} else { } else {
z.F.DecSliceIntfX(yyv19, d) z.F.DecSliceIntfX(&x.Result, d)
} }
} }
for { for {
yyj12++ yyj9++
if yyhl12 { if yyhl9 {
yyb12 = yyj12 > l yyb9 = yyj9 > l
} else { } else {
yyb12 = r.CheckBreak() yyb9 = r.CheckBreak()
} }
if yyb12 { if yyb9 {
break break
} }
r.ReadArrayElem() r.ReadArrayElem()
z.DecStructFieldNotFound(yyj12-1, "") z.DecStructFieldNotFound(yyj9-1, "")
} }
r.ReadArrayEnd() r.ReadArrayEnd()
} }
func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) { func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
var h codecSelfer2423 var h codecSelfer1891
z, r := codec1978.GenHelperEncoder(e) z, r := codec1978.GenHelperEncoder(e)
_, _, _ = h, z, r _, _, _ = h, z, r
if x == nil { if x == nil {
r.EncodeNil() r.EncodeNil()
} else { } else {
yym1 := z.EncBinary()
_ = yym1
if false { if false {
} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil { } else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
z.EncExtension(x, yyxt1) z.EncExtension(x, yyxt1)
} else { } else {
yysep2 := !z.EncBinary() yysep2 := !z.EncBinary()
yy2arr2 := z.EncBasicHandle().StructToArray yy2arr2 := z.EncBasicHandle().StructToArray
var yyq2 [3]bool
_ = yyq2
_, _ = yysep2, yy2arr2 _, _ = yysep2, yy2arr2
const yyr2 bool = false const yyr2 bool = false // struct tag has 'toArray'
yyq2[0] = x.Query != "" var yyq2 = [3]bool{ // should field at this index be written?
yyq2[1] = x.Action != "" x.Query != "", // Query
yyq2[2] = x.Result != nil x.Action != "", // Action
x.Result != nil, // Result
}
_ = yyq2
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.WriteArrayStart(3) r.WriteArrayStart(3)
} else { } else {
var yynn2 = 0 var yynn2 int
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -445,50 +381,42 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.WriteArrayElem() r.WriteArrayElem()
if yyq2[0] { if yyq2[0] {
yym4 := z.EncBinary()
_ = yym4
if false { if false {
} else { } else {
r.EncodeString(codecSelferCcUTF82423, string(x.Query)) r.EncodeString(codecSelferCcUTF81891, string(x.Query))
} }
} else { } else {
r.EncodeString(codecSelferCcUTF82423, "") r.EncodeString(codecSelferCcUTF81891, "")
} }
} else { } else {
if yyq2[0] { if yyq2[0] {
r.WriteMapElemKey() r.WriteMapElemKey()
r.EncodeString(codecSelferCcUTF82423, `query`) r.EncodeString(codecSelferCcUTF81891, `query`)
r.WriteMapElemValue() r.WriteMapElemValue()
yym5 := z.EncBinary()
_ = yym5
if false { if false {
} else { } else {
r.EncodeString(codecSelferCcUTF82423, string(x.Query)) r.EncodeString(codecSelferCcUTF81891, string(x.Query))
} }
} }
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.WriteArrayElem() r.WriteArrayElem()
if yyq2[1] { if yyq2[1] {
yym7 := z.EncBinary()
_ = yym7
if false { if false {
} else { } else {
r.EncodeString(codecSelferCcUTF82423, string(x.Action)) r.EncodeString(codecSelferCcUTF81891, string(x.Action))
} }
} else { } else {
r.EncodeString(codecSelferCcUTF82423, "") r.EncodeString(codecSelferCcUTF81891, "")
} }
} else { } else {
if yyq2[1] { if yyq2[1] {
r.WriteMapElemKey() r.WriteMapElemKey()
r.EncodeString(codecSelferCcUTF82423, `action`) r.EncodeString(codecSelferCcUTF81891, `action`)
r.WriteMapElemValue() r.WriteMapElemValue()
yym8 := z.EncBinary()
_ = yym8
if false { if false {
} else { } else {
r.EncodeString(codecSelferCcUTF82423, string(x.Action)) r.EncodeString(codecSelferCcUTF81891, string(x.Action))
} }
} }
} }
@ -498,8 +426,6 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
if x.Result == nil { if x.Result == nil {
r.EncodeNil() r.EncodeNil()
} else { } else {
yym10 := z.EncBinary()
_ = yym10
if false { if false {
} else { } else {
z.EncFallback(x.Result) z.EncFallback(x.Result)
@ -511,13 +437,11 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
} else { } else {
if yyq2[2] { if yyq2[2] {
r.WriteMapElemKey() r.WriteMapElemKey()
r.EncodeString(codecSelferCcUTF82423, `result`) r.EncodeString(codecSelferCcUTF81891, `result`)
r.WriteMapElemValue() r.WriteMapElemValue()
if x.Result == nil { if x.Result == nil {
r.EncodeNil() r.EncodeNil()
} else { } else {
yym11 := z.EncBinary()
_ = yym11
if false { if false {
} else { } else {
z.EncFallback(x.Result) z.EncFallback(x.Result)
@ -535,24 +459,22 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
} }
func (x *Dispatch) CodecDecodeSelf(d *codec1978.Decoder) { func (x *Dispatch) CodecDecodeSelf(d *codec1978.Decoder) {
var h codecSelfer2423 var h codecSelfer1891
z, r := codec1978.GenHelperDecoder(d) z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r _, _, _ = h, z, r
yym1 := z.DecBinary()
_ = yym1
if false { if false {
} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil { } else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
z.DecExtension(x, yyxt1) z.DecExtension(x, yyxt1)
} else { } else {
yyct2 := r.ContainerType() yyct2 := r.ContainerType()
if yyct2 == codecSelferValueTypeMap2423 { if yyct2 == codecSelferValueTypeMap1891 {
yyl2 := r.ReadMapStart() yyl2 := r.ReadMapStart()
if yyl2 == 0 { if yyl2 == 0 {
r.ReadMapEnd() r.ReadMapEnd()
} else { } else {
x.codecDecodeSelfFromMap(yyl2, d) x.codecDecodeSelfFromMap(yyl2, d)
} }
} else if yyct2 == codecSelferValueTypeArray2423 { } else if yyct2 == codecSelferValueTypeArray1891 {
yyl2 := r.ReadArrayStart() yyl2 := r.ReadArrayStart()
if yyl2 == 0 { if yyl2 == 0 {
r.ReadArrayEnd() r.ReadArrayEnd()
@ -560,17 +482,15 @@ func (x *Dispatch) CodecDecodeSelf(d *codec1978.Decoder) {
x.codecDecodeSelfFromArray(yyl2, d) x.codecDecodeSelfFromArray(yyl2, d)
} }
} else { } else {
panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2423) panic(errCodecSelferOnlyMapOrArrayEncodeToStruct1891)
} }
} }
} }
func (x *Dispatch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { func (x *Dispatch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
var h codecSelfer2423 var h codecSelfer1891
z, r := codec1978.GenHelperDecoder(d) z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r _, _, _ = h, z, r
var yys3Slc = z.DecScratchBuffer() // default slice to decode into
_ = yys3Slc
var yyhl3 bool = l >= 0 var yyhl3 bool = l >= 0
for yyj3 := 0; ; yyj3++ { for yyj3 := 0; ; yyj3++ {
if yyhl3 { if yyhl3 {
@ -583,44 +503,28 @@ func (x *Dispatch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} }
r.ReadMapElemKey() r.ReadMapElemKey()
yys3Slc = r.DecodeStringAsBytes() yys3 := z.StringView(r.DecodeStringAsBytes())
yys3 := string(yys3Slc)
r.ReadMapElemValue() r.ReadMapElemValue()
switch yys3 { switch yys3 {
case "query": case "query":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Query = "" x.Query = ""
} else { } else {
yyv4 := &x.Query x.Query = (string)(r.DecodeString())
yym5 := z.DecBinary()
_ = yym5
if false {
} else {
*((*string)(yyv4)) = r.DecodeString()
}
} }
case "action": case "action":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Action = "" x.Action = ""
} else { } else {
yyv6 := &x.Action x.Action = (string)(r.DecodeString())
yym7 := z.DecBinary()
_ = yym7
if false {
} else {
*((*string)(yyv6)) = r.DecodeString()
}
} }
case "result": case "result":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Result = nil x.Result = nil
} else { } else {
yyv8 := &x.Result
yym9 := z.DecBinary()
_ = yym9
if false { if false {
} else { } else {
z.DecFallback(yyv8, true) z.DecFallback(&x.Result, true)
} }
} }
default: default:
@ -631,19 +535,19 @@ func (x *Dispatch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
var h codecSelfer2423 var h codecSelfer1891
z, r := codec1978.GenHelperDecoder(d) z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r _, _, _ = h, z, r
var yyj10 int var yyj8 int
var yyb10 bool var yyb8 bool
var yyhl10 bool = l >= 0 var yyhl8 bool = l >= 0
yyj10++ yyj8++
if yyhl10 { if yyhl8 {
yyb10 = yyj10 > l yyb8 = yyj8 > l
} else { } else {
yyb10 = r.CheckBreak() yyb8 = r.CheckBreak()
} }
if yyb10 { if yyb8 {
r.ReadArrayEnd() r.ReadArrayEnd()
return return
} }
@ -651,21 +555,15 @@ func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Query = "" x.Query = ""
} else { } else {
yyv11 := &x.Query x.Query = (string)(r.DecodeString())
yym12 := z.DecBinary()
_ = yym12
if false {
} else {
*((*string)(yyv11)) = r.DecodeString()
}
} }
yyj10++ yyj8++
if yyhl10 { if yyhl8 {
yyb10 = yyj10 > l yyb8 = yyj8 > l
} else { } else {
yyb10 = r.CheckBreak() yyb8 = r.CheckBreak()
} }
if yyb10 { if yyb8 {
r.ReadArrayEnd() r.ReadArrayEnd()
return return
} }
@ -673,21 +571,15 @@ func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Action = "" x.Action = ""
} else { } else {
yyv13 := &x.Action x.Action = (string)(r.DecodeString())
yym14 := z.DecBinary()
_ = yym14
if false {
} else {
*((*string)(yyv13)) = r.DecodeString()
}
} }
yyj10++ yyj8++
if yyhl10 { if yyhl8 {
yyb10 = yyj10 > l yyb8 = yyj8 > l
} else { } else {
yyb10 = r.CheckBreak() yyb8 = r.CheckBreak()
} }
if yyb10 { if yyb8 {
r.ReadArrayEnd() r.ReadArrayEnd()
return return
} }
@ -695,26 +587,23 @@ func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Result = nil x.Result = nil
} else { } else {
yyv15 := &x.Result
yym16 := z.DecBinary()
_ = yym16
if false { if false {
} else { } else {
z.DecFallback(yyv15, true) z.DecFallback(&x.Result, true)
} }
} }
for { for {
yyj10++ yyj8++
if yyhl10 { if yyhl8 {
yyb10 = yyj10 > l yyb8 = yyj8 > l
} else { } else {
yyb10 = r.CheckBreak() yyb8 = r.CheckBreak()
} }
if yyb10 { if yyb8 {
break break
} }
r.ReadArrayElem() r.ReadArrayElem()
z.DecStructFieldNotFound(yyj10-1, "") z.DecStructFieldNotFound(yyj8-1, "")
} }
r.ReadArrayEnd() r.ReadArrayEnd()
} }

9
glide.lock generated
View file

@ -1,12 +1,12 @@
hash: 78b2793cc6b44df21d4b96f19e3ca2d9ec1d3de7be1e0cba3a5087b5079abea4 hash: c56e5bd935dd1933a6e7370fe3fc67ea26169ec91aa05c171543866c6c2490ed
updated: 2018-04-06T09:47:33.423062+01:00 updated: 2018-04-14T19:22:29.284814+01:00
imports: imports:
- name: github.com/abcum/bump - name: github.com/abcum/bump
version: 526934c541e071b5a330671c76434b9e32d55638 version: 526934c541e071b5a330671c76434b9e32d55638
- name: github.com/abcum/cork - name: github.com/abcum/cork
version: 6cbaf5d51f99013c103c95f336e98da8ef04f85d version: 6cbaf5d51f99013c103c95f336e98da8ef04f85d
- name: github.com/abcum/fibre - name: github.com/abcum/fibre
version: 6c2189150be9541c7c1f1803b98c452e553fe6e2 version: 1b1947da964c0c0a244868279f9476df093eef34
subpackages: subpackages:
- mw - mw
- name: github.com/abcum/ptree - name: github.com/abcum/ptree
@ -97,7 +97,7 @@ imports:
- name: github.com/spf13/pflag - name: github.com/spf13/pflag
version: 1ce0cc6db4029d97571db82f85092fccedb572ce version: 1ce0cc6db4029d97571db82f85092fccedb572ce
- name: github.com/ugorji/go - name: github.com/ugorji/go
version: 9831f2c3ac1068a78f50999a30db84270f647af6 version: b4c50a2b199d93b13dc15e78929cfb23bfdf21ab
subpackages: subpackages:
- codec - codec
- name: golang.org/x/crypto - name: golang.org/x/crypto
@ -132,6 +132,7 @@ imports:
- internal/colltab - internal/colltab
- internal/tag - internal/tag
- language - language
- search
- transform - transform
- unicode/norm - unicode/norm
- name: gopkg.in/tylerb/graceful.v1 - name: gopkg.in/tylerb/graceful.v1

View file

@ -37,7 +37,7 @@ import:
- package: github.com/spf13/cobra - package: github.com/spf13/cobra
version: ^0.0.2 version: ^0.0.2
- package: github.com/ugorji/go - package: github.com/ugorji/go
version: ^1.1.0 version: ^1.1.1
subpackages: subpackages:
- codec - codec
- package: golang.org/x/crypto - package: golang.org/x/crypto
@ -52,6 +52,7 @@ import:
subpackages: subpackages:
- collate - collate
- language - language
- search
testImport: testImport:
- package: github.com/smartystreets/goconvey - package: github.com/smartystreets/goconvey
version: ^1.6.3 version: ^1.6.3

File diff suppressed because it is too large Load diff