From 1c917e7120b5323230f4f5e9667f599e4ce34ab7 Mon Sep 17 00:00:00 2001 From: Tobie Morgan Hitchcock Date: Tue, 5 Oct 2021 08:17:50 +0100 Subject: [PATCH] Update 3rd party dependencies --- db/db.gen.go | 109 +- go.mod | 80 +- go.sum | 393 ++++--- sql/ast.gen.go | 2690 ++++++++++++++++++++++++++++-------------------- 4 files changed, 1933 insertions(+), 1339 deletions(-) diff --git a/db/db.gen.go b/db/db.gen.go index dd3ec20b..5741f505 100644 --- a/db/db.gen.go +++ b/db/db.gen.go @@ -1,3 +1,4 @@ +//go:build go1.6 // +build go1.6 // Code generated by codecgen - DO NOT EDIT. @@ -13,41 +14,46 @@ import ( const ( // ----- content types ---- - codecSelferCcUTF87046 = 1 - codecSelferCcRAW7046 = 255 + codecSelferCcUTF87585 = 1 + codecSelferCcRAW7585 = 255 // ----- value types used ---- - codecSelferValueTypeArray7046 = 10 - codecSelferValueTypeMap7046 = 9 - codecSelferValueTypeString7046 = 6 - codecSelferValueTypeInt7046 = 2 - codecSelferValueTypeUint7046 = 3 - codecSelferValueTypeFloat7046 = 4 - codecSelferValueTypeNil7046 = 1 - codecSelferBitsize7046 = uint8(32 << (^uint(0) >> 63)) - codecSelferDecContainerLenNil7046 = -2147483648 + codecSelferValueTypeArray7585 = 10 + codecSelferValueTypeMap7585 = 9 + codecSelferValueTypeString7585 = 6 + codecSelferValueTypeInt7585 = 2 + codecSelferValueTypeUint7585 = 3 + codecSelferValueTypeFloat7585 = 4 + codecSelferValueTypeNil7585 = 1 + codecSelferBitsize7585 = uint8(32 << (^uint(0) >> 63)) + codecSelferDecContainerLenNil7585 = -2147483648 ) var ( - errCodecSelferOnlyMapOrArrayEncodeToStruct7046 = errors.New(`only encoded map or array can be decoded into a struct`) + errCodecSelferOnlyMapOrArrayEncodeToStruct7585 = errors.New(`only encoded map or array can be decoded into a struct`) ) -type codecSelfer7046 struct{} +type codecSelfer7585 struct{} -func codecSelfer7046False() bool { return false } -func codecSelfer7046True() bool { return true } +func codecSelfer7585False() bool { return false } +func codecSelfer7585True() bool { return true } func init() { - if codec1978.GenVersion != 20 { + if codec1978.GenVersion != 25 { _, file, _, _ := runtime.Caller(0) ver := strconv.FormatInt(int64(codec1978.GenVersion), 10) - panic(errors.New("codecgen version mismatch: current: 20, need " + ver + ". Re-generate file: " + file)) + panic(errors.New("codecgen version mismatch: current: 25, need " + ver + ". Re-generate file: " + file)) } } +func (Response) codecSelferViaCodecgen() {} func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer7046 + var h codecSelfer7585 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -151,32 +157,32 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Response) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer7046 + var h codecSelfer7585 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil7046 { + if yyct2 == codecSelferValueTypeNil7585 { *(x) = Response{} - } else if yyct2 == codecSelferValueTypeMap7046 { + } else if yyct2 == codecSelferValueTypeMap7585 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray7046 { + } else if yyct2 == codecSelferValueTypeArray7585 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7046) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7585) } } func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer7046 + var h codecSelfer7585 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -191,25 +197,25 @@ func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "time": - x.Time = (string)(string(r.DecodeStringAsBytes())) + x.Time = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "status": - x.Status = (string)(string(r.DecodeStringAsBytes())) + x.Status = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "detail": - x.Detail = (string)(string(r.DecodeStringAsBytes())) + x.Detail = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "result": z.F.DecSliceIntfX(&x.Result, d) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer7046 + var h codecSelfer7585 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj9 int @@ -226,7 +232,7 @@ func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.Time = (string)(string(r.DecodeStringAsBytes())) + x.Time = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj9++ if yyhl9 { yyb9 = yyj9 > l @@ -238,7 +244,7 @@ func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.Status = (string)(string(r.DecodeStringAsBytes())) + x.Status = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj9++ if yyhl9 { yyb9 = yyj9 > l @@ -250,7 +256,7 @@ func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.Detail = (string)(string(r.DecodeStringAsBytes())) + x.Detail = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj9++ if yyhl9 { yyb9 = yyj9 > l @@ -282,10 +288,15 @@ func (x *Response) IsCodecEmpty() bool { return !(x.Time != "" || x.Status != "" || x.Detail != "" || len(x.Result) != 0 || false) } +func (Dispatch) codecSelferViaCodecgen() {} func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer7046 + var h codecSelfer7585 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -364,32 +375,32 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Dispatch) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer7046 + var h codecSelfer7585 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil7046 { + if yyct2 == codecSelferValueTypeNil7585 { *(x) = Dispatch{} - } else if yyct2 == codecSelferValueTypeMap7046 { + } else if yyct2 == codecSelferValueTypeMap7585 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray7046 { + } else if yyct2 == codecSelferValueTypeArray7585 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7046) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7585) } } func (x *Dispatch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer7046 + var h codecSelfer7585 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -404,23 +415,23 @@ func (x *Dispatch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "query": - x.Query = (string)(string(r.DecodeStringAsBytes())) + x.Query = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "action": - x.Action = (string)(string(r.DecodeStringAsBytes())) + x.Action = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "result": z.DecFallback(&x.Result, true) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer7046 + var h codecSelfer7585 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj8 int @@ -437,7 +448,7 @@ func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.Query = (string)(string(r.DecodeStringAsBytes())) + x.Query = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj8++ if yyhl8 { yyb8 = yyj8 > l @@ -449,7 +460,7 @@ func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.Action = (string)(string(r.DecodeStringAsBytes())) + x.Action = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj8++ if yyhl8 { yyb8 = yyj8 > l diff --git a/go.mod b/go.mod index 0081497f..d8a7cdac 100644 --- a/go.mod +++ b/go.mod @@ -1,45 +1,67 @@ module github.com/abcum/surreal -go 1.15 +go 1.17 require ( - cloud.google.com/go v0.73.0 - cloud.google.com/go/logging v1.1.2 - contrib.go.opencensus.io/exporter/stackdriver v0.13.4 + cloud.google.com/go v0.97.0 + cloud.google.com/go/errorreporting v0.1.0 + cloud.google.com/go/logging v1.4.2 github.com/abcum/bump v0.0.0-20201116071400-31a74cba5f19 github.com/abcum/cork v0.0.0-20201116072055-6b3677fdfab1 - github.com/abcum/fibre v0.0.0-20201209220204-e58587731574 + github.com/abcum/fibre v0.0.0-20211005070429-9c53d8998428 github.com/abcum/rixxdb v0.0.0-20201116083534-c988f1e5d2bb - github.com/abcum/tmpl v0.0.0-20190929092451-4b08f6027ed1 // indirect - github.com/aws/aws-sdk-go v1.36.5 // indirect - github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect - github.com/dgraph-io/ristretto v0.0.3 + github.com/dgraph-io/ristretto v0.1.0 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/elithrar/simple-scrypt v1.3.0 - github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2 // indirect github.com/gorilla/websocket v1.4.2 github.com/hjson/hjson-go v3.1.0+incompatible - github.com/mattn/go-colorable v0.1.8 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d - github.com/pkg/profile v1.5.0 + github.com/pkg/profile v1.6.0 github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be - github.com/rs/xid v1.2.1 + github.com/rs/xid v1.3.0 github.com/satori/go.uuid v1.2.0 - github.com/sergi/go-diff v1.1.0 - github.com/sirupsen/logrus v1.7.0 + github.com/sergi/go-diff v1.2.0 + github.com/sirupsen/logrus v1.8.1 github.com/smartystreets/goconvey v1.6.4 - github.com/spf13/cobra v1.1.1 - github.com/ugorji/go/codec v1.2.1 - github.com/ugorji/go/codec/codecgen v1.2.1 // indirect - go.opencensus.io v0.22.5 - golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 - golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect - golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 - golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 // indirect - golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect - golang.org/x/term v0.0.0-20201207232118-ee85cb95a76b // indirect - golang.org/x/text v0.3.4 - golang.org/x/tools v0.0.0-20201208233053-a543418bbed2 // indirect - google.golang.org/genproto v0.0.0-20201209185603-f92720507ed4 // indirect - google.golang.org/grpc v1.34.0 // indirect + github.com/spf13/cobra v1.2.1 + github.com/ugorji/go/codec v1.2.6 + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 + golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b + golang.org/x/text v0.3.7 +) + +require ( + github.com/abcum/tmpl v0.0.0-20190929092451-4b08f6027ed1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/dustin/go-humanize v1.0.0 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/googleapis/gax-go/v2 v2.1.0 // indirect + github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jtolds/gls v4.20.0+incompatible // indirect + github.com/mattn/go-colorable v0.0.9 // indirect + github.com/mattn/go-isatty v0.0.3 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/ory/graceful v0.1.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/segmentio/ksuid v1.0.3 // indirect + github.com/smartystreets/assertions v1.2.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/ugorji/go/codec/codecgen v1.2.6 // indirect + go.opencensus.io v0.23.0 // indirect + golang.org/x/mod v0.5.1 // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef // indirect + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect + golang.org/x/tools v0.1.7 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/api v0.57.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0 // indirect + google.golang.org/grpc v1.40.0 // indirect + google.golang.org/protobuf v1.27.1 // indirect ) diff --git a/go.sum b/go.sum index 71aaed4f..30b1c528 100644 --- a/go.sum +++ b/go.sum @@ -13,10 +13,20 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.71.0/go.mod h1:qZfY4Y7AEIQwG/fQYD3xrxLNkQZ0Xzf3HGeqCkA6LVM= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.73.0 h1:sGvc4e0Cmm4+DKQR76a9VwNukpacQK8TOl5pDl0Pcn0= -cloud.google.com/go v0.73.0/go.mod h1:BkDh9dFvGjCitVw03TNjKbBxXNKULXXIq6orU6HrJ4Q= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.92.2/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0 h1:3DXvAyifywvq64LfkKaMOmkWPS1CikIQdMe2lY9vxU8= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -25,9 +35,11 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/errorreporting v0.1.0 h1:z40EhrjRspplwbpO+9DSnC4kgDokBi94T/gYwtdKL5Q= +cloud.google.com/go/errorreporting v0.1.0/go.mod h1:cZSiBMvrnl0X13pD9DwKf9sQ8Eqy3EzHqkyKBZxiIrM= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/logging v1.1.2 h1:KNALX0NZn8UJhqKnqoHxhMqyoZfBZoh5wF7CQJZ5XrU= -cloud.google.com/go/logging v1.1.2/go.mod h1:KrljuAHIw631j9+QXsnq9vDwsrwmdxfGpivMR68M7DY= +cloud.google.com/go/logging v1.4.2 h1:Mu2Q75VBDQlW1HlBMjTX4X84UFR73G1TiLlRYc/b7tA= +cloud.google.com/go/logging v1.4.2/go.mod h1:jco9QZSx8HiVVqLJReq7z7bVdj0P1Jb9PDFs63T+axo= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -37,8 +49,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -contrib.go.opencensus.io/exporter/stackdriver v0.13.4 h1:ksUxwH3OD5sxkjzEqGxNTl+Xjsmu3BnC/300MhSVTSc= -contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -47,73 +57,65 @@ github.com/abcum/bump v0.0.0-20201116071400-31a74cba5f19 h1:FmvfNT034i2bxnBu18IL github.com/abcum/bump v0.0.0-20201116071400-31a74cba5f19/go.mod h1:4I2T23JoKcYIVfkro3Y5Lkay4kqEyna5FmLfkHgcTb8= github.com/abcum/cork v0.0.0-20201116072055-6b3677fdfab1 h1:HRy+gOcIbmHi2CHY/kVgbqJN0igBNj20Cl4u4Eg9d2g= github.com/abcum/cork v0.0.0-20201116072055-6b3677fdfab1/go.mod h1:4NyuORcAT6R8JYsS+CDcBa0TmSPnP7n0Kxrxiq9EZLw= -github.com/abcum/fibre v0.0.0-20201209220204-e58587731574 h1:bE9XNlmSGYRIH7hSvm+VVySibv/xppzkHv8/CTdDIzg= -github.com/abcum/fibre v0.0.0-20201209220204-e58587731574/go.mod h1:ODK4gT46G71Rzh7jg7GCVeW86P1H0UETcLnR2E/7WJ0= +github.com/abcum/fibre v0.0.0-20211005070429-9c53d8998428 h1:GVKGSfklDeWDHGP+aS0j14iX/2zmxLFfjnECsGCevG0= +github.com/abcum/fibre v0.0.0-20211005070429-9c53d8998428/go.mod h1:ODK4gT46G71Rzh7jg7GCVeW86P1H0UETcLnR2E/7WJ0= github.com/abcum/rixxdb v0.0.0-20201116083534-c988f1e5d2bb h1:iS1RpYDGSvhFoCzO2zTMMXLPNG7KS+ezm38i9rpDwuM= github.com/abcum/rixxdb v0.0.0-20201116083534-c988f1e5d2bb/go.mod h1:/n9dcXlrp22Yy2p+0n9DynExr5Ne/VVuGvQfdgC7U3I= github.com/abcum/tmpl v0.0.0-20190929092451-4b08f6027ed1 h1:hRp2bOK7p4HTCCFl4v0apR309NuN1qpKnWnX21JSCHQ= github.com/abcum/tmpl v0.0.0-20190929092451-4b08f6027ed1/go.mod h1:T/xXRVJ6YMMHqf+MiKW6KELsEmb2n4eNMsaNQ6lI5M8= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.23.20 h1:2CBuL21P0yKdZN5urf2NxKa1ha8fhnY+A3pBCHFeZoA= -github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.36.5 h1:SouM2ar1A8f+3DYWW622sDdqkkZAO3ha4j8GQjiPLFg= -github.com/aws/aws-sdk-go v1.36.5/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgraph-io/ristretto v0.0.3 h1:jh22xisGBjrEVnRZ1DVTpBVQm0Xndu8sMl0CWDzSIBI= -github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= -github.com/dgrijalva/jwt-go v1.0.2 h1:KPldsxuKGsS2FPWsNeg9ZO18aCrGKujPoWXn2yo+KQM= +github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= +github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elithrar/simple-scrypt v1.3.0 h1:KIlOlxdoQf9JWKl5lMAJ28SY2URB0XTRDn2TckyzAZg= github.com/elithrar/simple-scrypt v1.3.0/go.mod h1:U2XQRI95XHY0St410VE3UjT7vuKb1qPwrl/EJwEqnZo= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= @@ -125,6 +127,8 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -138,8 +142,12 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -150,11 +158,16 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -163,23 +176,24 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201117184057-ae444373da19 h1:iFELRewmQ9CldLrqgr0E6b6ZPfZmMvLyyz6kMsR+c4w= -github.com/google/pprof v0.0.0-20201117184057-ae444373da19/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2 h1:HyOHhUtuB/Ruw/L5s5pG2D0kckkN2/IzBs9OClGHnHI= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.1.0 h1:6DWmvNpomjL1+3liNSZbVns3zsYzzCjm6pRBO1tLeso= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -200,88 +214,66 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hjson/hjson-go v0.2.3 h1:KhG7/PSxTibbYOzFso5FoiX2gWePcANaCsvM1WE/bTo= github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw= github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.0 h1:7ks8ZkOP5/ujthUsT07rNv+nkLXCQWKNHuwzOAesEks= github.com/mitchellh/mapstructure v1.4.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/ory/graceful v0.1.1 h1:zx+8tDObLPrG+7Tc8jKYlXsqWnLtOQA1IZ/FAAKHMXU= github.com/ory/graceful v0.1.1/go.mod h1:zqu70l95WrKHF4AZ6tXHvAqAvpY6M7g6ttaAVcMm7KU= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug= -github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= +github.com/pkg/profile v1.6.0 h1:hUDfIISABYI59DyeB3OTay/HxSRwTQ8rB/H83k6r5dM= +github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ= github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/xid v1.3.0 h1:6NjYksEUlhurdVehpc7S7dk6DAmcKv8V9gG0FsVN2U4= +github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= @@ -289,67 +281,72 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/ksuid v1.0.3 h1:FoResxvleQwYiPAVKe1tMUlEirodZqlqglIuFsdDntY= github.com/segmentio/ksuid v1.0.3/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE= -github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= +github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ugorji/go v1.2.1 h1:dz+JxTe7GZQdErTo7SREc1jQj/hFP1k7jyIAwODoW+k= github.com/ugorji/go v1.2.1/go.mod h1:cSVypSfTLm2o9fKxXvQgn3rMmkPXovcWor6Qn5tbFmI= -github.com/ugorji/go/codec v1.2.1 h1:/TRfW3XKkvWvmAYyCUaQlhoCDGjcvNR8xVVA/l5p/jQ= +github.com/ugorji/go v1.2.6 h1:tGiWC9HENWE2tqYycIqFTNorMmFRVhNwCpDOpWqnk8E= +github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn0= github.com/ugorji/go/codec v1.2.1/go.mod h1:s/WxCRi46t8rA+fowL40EnmD7ec0XhR7ZypxeBNdzsM= -github.com/ugorji/go/codec/codecgen v1.2.1 h1:vgJmj8mk78qEuZZihyaymmTIgLnGEbQ1PVoAwn5ueuE= -github.com/ugorji/go/codec/codecgen v1.2.1/go.mod h1:cYyebUNEEc8KWEK2T6mjoH+8e3q74sVZbDB4DwdoOsk= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/ugorji/go/codec v1.2.6 h1:7kbGefxLoDBuYXOms4yD7223OpNMMPNPZxXk5TvFcyQ= +github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw= +github.com/ugorji/go/codec/codecgen v1.2.6 h1:7Hv5px3xQNvgYX2bhQv31edoyQYlcN6wOacsr0gLwGQ= +github.com/ugorji/go/codec/codecgen v1.2.6/go.mod h1:pOEF0qieVrlmZmMUXWdMkWFrE1zfcyOnge55NbLw30U= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 h1:sYNJzB4J8toYPQTM6pAkcmBRgw9SnQKP9oXCHfgy604= -golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -371,10 +368,9 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -383,14 +379,15 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -401,7 +398,6 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -417,21 +413,34 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201026091529-146b70c837a4/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 h1:lwlPPsmjDKK0J6eG6xDWd5XPehI0R024zxjDnw3esPA= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b h1:SXy8Ld8oKlcogOvUAh0J5Pm5RKzgYBMMxLxt6n5XW50= +golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58 h1:Mj83v+wSRNEar42a/MQgxk9X42TdEmrOl9i+y8WbxLo= golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 h1:Lm4OryKCca1vehdsWogr9N4t7NfZxLbJoc/H0w4K4S4= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f h1:Qmd2pbz05z7z6lm0DrgQVVPuBm92jqujBKMHMOlOQEw= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -440,16 +449,13 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -459,11 +465,11 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -480,24 +486,44 @@ golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d h1:MiWWjyhUzZ+jvhZvloX6ZrUsdEghn8a64Upd8EMHglE= golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 h1:6wSTsvPddg9gc/mVEEyk9oOAoxn+bT4Z9q1zx+4RwA4= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef h1:fPxZ3Umkct3LZ8gK9nbk+DWDJ9fstZa2grBn+lWVKPs= +golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20201207232118-ee85cb95a76b h1:a0ErnNnPKmhDyIXQvdZr+Lq8dc8xpMeqkF8y5PgQU4Q= -golang.org/x/term v0.0.0-20201207232118-ee85cb95a76b/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -513,7 +539,6 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -538,19 +563,25 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20201028224754-2c115999a7f0/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201030143252-cf7a54d06671/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201105220310-78b158585360/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201202200335-bef1c476418a h1:TYqOq/v+Ri5aADpldxXOj6PmvcPMOJbLjdALzZDQT2M= -golang.org/x/tools v0.0.0-20201202200335-bef1c476418a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2 h1:vEtypaVub6UvKkiXZ2xx9QIvp9TL7sI7xp7vdi2kezA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ= +golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -560,7 +591,6 @@ google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEt google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= @@ -573,15 +603,25 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.34.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0 h1:l2Nfbl2GPXdWorv+dT2XfinX2jOOw4zv1VhLstx+6rE= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= +google.golang.org/api v0.46.0/go.mod h1:ceL4oozhkAiTID8XMmJBsIxID/9wMXJVVFXPg4ylg3I= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0 h1:4t9zuDlHLcIx0ZEhmXEeFVCRsiOgpgn2QOH9N0MNjPI= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= @@ -609,6 +649,7 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -616,19 +657,37 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201030142918-24207fddd1c3/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201106154455-f9bfe239b0ba/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201203001206-6486ece9c497 h1:jDYzwXmX9tLnuG4sL85HPmE1ruErXOopALp2i/0AHnI= -google.golang.org/genproto v0.0.0-20201203001206-6486ece9c497/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201209185603-f92720507ed4 h1:J4dpx/41slnq1aogzUSTuBuvD7VXz7ZLkVpr32YgSlg= -google.golang.org/genproto v0.0.0-20201209185603-f92720507ed4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210429181445-86c259c2b4ab/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210517163617-5e0236093d7a/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0 h1:5Tbluzus3QxoAJx4IefGt1W0HQZW4nuMrVk684jI74Q= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -639,10 +698,19 @@ google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -652,20 +720,25 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/sql/ast.gen.go b/sql/ast.gen.go index 24380121..a653ab7b 100644 --- a/sql/ast.gen.go +++ b/sql/ast.gen.go @@ -1,3 +1,4 @@ +//go:build go1.6 // +build go1.6 // Code generated by codecgen - DO NOT EDIT. @@ -15,34 +16,34 @@ import ( const ( // ----- content types ---- - codecSelferCcUTF82132 = 1 - codecSelferCcRAW2132 = 255 + codecSelferCcUTF86263 = 1 + codecSelferCcRAW6263 = 255 // ----- value types used ---- - codecSelferValueTypeArray2132 = 10 - codecSelferValueTypeMap2132 = 9 - codecSelferValueTypeString2132 = 6 - codecSelferValueTypeInt2132 = 2 - codecSelferValueTypeUint2132 = 3 - codecSelferValueTypeFloat2132 = 4 - codecSelferValueTypeNil2132 = 1 - codecSelferBitsize2132 = uint8(32 << (^uint(0) >> 63)) - codecSelferDecContainerLenNil2132 = -2147483648 + codecSelferValueTypeArray6263 = 10 + codecSelferValueTypeMap6263 = 9 + codecSelferValueTypeString6263 = 6 + codecSelferValueTypeInt6263 = 2 + codecSelferValueTypeUint6263 = 3 + codecSelferValueTypeFloat6263 = 4 + codecSelferValueTypeNil6263 = 1 + codecSelferBitsize6263 = uint8(32 << (^uint(0) >> 63)) + codecSelferDecContainerLenNil6263 = -2147483648 ) var ( - errCodecSelferOnlyMapOrArrayEncodeToStruct2132 = errors.New(`only encoded map or array can be decoded into a struct`) + errCodecSelferOnlyMapOrArrayEncodeToStruct6263 = errors.New(`only encoded map or array can be decoded into a struct`) ) -type codecSelfer2132 struct{} +type codecSelfer6263 struct{} -func codecSelfer2132False() bool { return false } -func codecSelfer2132True() bool { return true } +func codecSelfer6263False() bool { return false } +func codecSelfer6263True() bool { return true } func init() { - if codec1978.GenVersion != 20 { + if codec1978.GenVersion != 25 { _, file, _, _ := runtime.Caller(0) ver := strconv.FormatInt(int64(codec1978.GenVersion), 10) - panic(errors.New("codecgen version mismatch: current: 20, need " + ver + ". Re-generate file: " + file)) + panic(errors.New("codecgen version mismatch: current: 25, need " + ver + ". Re-generate file: " + file)) } if false { // reference the types, but skip this branch at build/run time var _ pkg1_language.Tag @@ -50,10 +51,15 @@ func init() { } } +func (Query) codecSelferViaCodecgen() {} func (x *Query) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -65,6 +71,7 @@ func (x *Query) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt4 := z.Extension(x.Statements); yyxt4 != nil { z.EncExtension(x.Statements, yyxt4) + } else { x.Statements.CodecEncodeSelf(e) } z.EncWriteArrayEnd() @@ -79,6 +86,7 @@ func (x *Query) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt5 := z.Extension(x.Statements); yyxt5 != nil { z.EncExtension(x.Statements, yyxt5) + } else { x.Statements.CodecEncodeSelf(e) } z.EncWriteMapEnd() @@ -87,32 +95,32 @@ func (x *Query) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Query) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Query{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Query) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -127,9 +135,9 @@ func (x *Query) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Statements": if yyxt5 := z.Extension(x.Statements); yyxt5 != nil { z.DecExtension(&x.Statements, yyxt5) @@ -137,13 +145,13 @@ func (x *Query) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Statements.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Query) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -184,8 +192,9 @@ func (x *Query) IsCodecEmpty() bool { return !(len(x.Statements) != 0 || false) } +func (Statements) codecSelferViaCodecgen() {} func (x Statements) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -196,16 +205,21 @@ func (x Statements) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Statements) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decStatements((*Statements)(x), d) } +func (UseStatement) codecSelferViaCodecgen() {} func (x *UseStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -243,32 +257,32 @@ func (x *UseStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *UseStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = UseStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *UseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -283,21 +297,21 @@ func (x *UseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "NS": - x.NS = (string)(string(r.DecodeStringAsBytes())) + x.NS = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "DB": - x.DB = (string)(string(r.DecodeStringAsBytes())) + x.DB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *UseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -314,7 +328,7 @@ func (x *UseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.NS = (string)(string(r.DecodeStringAsBytes())) + x.NS = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj6++ if yyhl6 { yyb6 = yyj6 > l @@ -326,7 +340,7 @@ func (x *UseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.DB = (string)(string(r.DecodeStringAsBytes())) + x.DB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) for { yyj6++ if yyhl6 { @@ -346,10 +360,15 @@ func (x *UseStatement) IsCodecEmpty() bool { return !(x.NS != "" || x.DB != "" || false) } +func (OptStatement) codecSelferViaCodecgen() {} func (x *OptStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -387,32 +406,32 @@ func (x *OptStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *OptStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = OptStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *OptStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -427,21 +446,21 @@ func (x *OptStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": - x.Name = (string)(string(r.DecodeStringAsBytes())) + x.Name = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "What": x.What = (bool)(r.DecodeBool()) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *OptStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -458,7 +477,7 @@ func (x *OptStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.Name = (string)(string(r.DecodeStringAsBytes())) + x.Name = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj6++ if yyhl6 { yyb6 = yyj6 > l @@ -490,10 +509,15 @@ func (x *OptStatement) IsCodecEmpty() bool { return !(x.Name != "" || bool(x.What) || false) } +func (BeginStatement) codecSelferViaCodecgen() {} func (x *BeginStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -511,32 +535,32 @@ func (x *BeginStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *BeginStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = BeginStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *BeginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -551,17 +575,17 @@ func (x *BeginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *BeginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj4 int @@ -586,10 +610,15 @@ func (x *BeginStatement) IsCodecEmpty() bool { return !(false) } +func (CancelStatement) codecSelferViaCodecgen() {} func (x *CancelStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -607,32 +636,32 @@ func (x *CancelStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *CancelStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = CancelStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *CancelStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -647,17 +676,17 @@ func (x *CancelStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *CancelStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj4 int @@ -682,10 +711,15 @@ func (x *CancelStatement) IsCodecEmpty() bool { return !(false) } +func (CommitStatement) codecSelferViaCodecgen() {} func (x *CommitStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -703,32 +737,32 @@ func (x *CommitStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *CommitStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = CommitStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *CommitStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -743,17 +777,17 @@ func (x *CommitStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *CommitStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj4 int @@ -778,10 +812,15 @@ func (x *CommitStatement) IsCodecEmpty() bool { return !(false) } +func (InfoStatement) codecSelferViaCodecgen() {} func (x *InfoStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -808,6 +847,7 @@ func (x *InfoStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt6 := z.Extension(x.What); yyxt6 != nil { z.EncExtension(x.What, yyxt6) + } else { x.What.CodecEncodeSelf(e) } } @@ -842,6 +882,7 @@ func (x *InfoStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt8 := z.Extension(x.What); yyxt8 != nil { z.EncExtension(x.What, yyxt8) + } else { x.What.CodecEncodeSelf(e) } } @@ -851,32 +892,32 @@ func (x *InfoStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *InfoStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = InfoStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *InfoStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -891,9 +932,9 @@ func (x *InfoStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Kind": if yyxt5 := z.Extension(x.Kind); yyxt5 != nil { z.DecExtension(&x.Kind, yyxt5) @@ -918,13 +959,13 @@ func (x *InfoStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *InfoStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj8 int @@ -992,10 +1033,15 @@ func (x *InfoStatement) IsCodecEmpty() bool { return !(x.Kind != 0 || false) } +func (RunStatement) codecSelferViaCodecgen() {} func (x *RunStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -1041,32 +1087,32 @@ func (x *RunStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RunStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RunStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RunStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -1081,9 +1127,9 @@ func (x *RunStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "RW": x.RW = (bool)(r.DecodeBool()) case "Expr": @@ -1093,13 +1139,13 @@ func (x *RunStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Expr, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RunStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj7 int @@ -1152,10 +1198,15 @@ func (x *RunStatement) IsCodecEmpty() bool { return !(bool(x.RW) || x.Expr != nil || false) } +func (LetStatement) codecSelferViaCodecgen() {} func (x *LetStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -1174,6 +1225,7 @@ func (x *LetStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt7 := z.Extension(x.Name); yyxt7 != nil { z.EncExtension(x.Name, yyxt7) + } else { x.Name.CodecEncodeSelf(e) } } @@ -1206,6 +1258,7 @@ func (x *LetStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt10 := z.Extension(x.Name); yyxt10 != nil { z.EncExtension(x.Name, yyxt10) + } else { x.Name.CodecEncodeSelf(e) } } @@ -1227,32 +1280,32 @@ func (x *LetStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *LetStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = LetStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *LetStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -1267,9 +1320,9 @@ func (x *LetStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "RW": x.RW = (bool)(r.DecodeBool()) case "Name": @@ -1294,13 +1347,13 @@ func (x *LetStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.What, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *LetStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj9 int @@ -1378,10 +1431,15 @@ func (x *LetStatement) IsCodecEmpty() bool { return !(bool(x.RW) || x.What != nil || false) } +func (LiveStatement) codecSelferViaCodecgen() {} func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -1403,11 +1461,13 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt17 := z.Extension(x.Expr); yyxt17 != nil { z.EncExtension(x.Expr, yyxt17) + } else { x.Expr.CodecEncodeSelf(e) } z.EncWriteArrayElem() if yyxt18 := z.Extension(x.What); yyxt18 != nil { z.EncExtension(x.What, yyxt18) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -1419,6 +1479,7 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt20 := z.Extension(x.Fetch); yyxt20 != nil { z.EncExtension(x.Fetch, yyxt20) + } else { x.Fetch.CodecEncodeSelf(e) } z.EncWriteArrayEnd() @@ -1473,6 +1534,7 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt26 := z.Extension(x.Expr); yyxt26 != nil { z.EncExtension(x.Expr, yyxt26) + } else { x.Expr.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -1484,6 +1546,7 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt27 := z.Extension(x.What); yyxt27 != nil { z.EncExtension(x.What, yyxt27) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -1507,6 +1570,7 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt29 := z.Extension(x.Fetch); yyxt29 != nil { z.EncExtension(x.Fetch, yyxt29) + } else { x.Fetch.CodecEncodeSelf(e) } z.EncWriteMapEnd() @@ -1515,32 +1579,32 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *LiveStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = LiveStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *LiveStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -1555,17 +1619,17 @@ func (x *LiveStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "ID": - x.ID = (string)(string(r.DecodeStringAsBytes())) + x.ID = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "FB": - x.FB = (string)(string(r.DecodeStringAsBytes())) + x.FB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "NS": - x.NS = (string)(string(r.DecodeStringAsBytes())) + x.NS = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "DB": - x.DB = (string)(string(r.DecodeStringAsBytes())) + x.DB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "Diff": x.Diff = (bool)(r.DecodeBool()) case "Expr": @@ -1593,13 +1657,13 @@ func (x *LiveStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Fetch.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *LiveStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj17 int @@ -1616,7 +1680,7 @@ func (x *LiveStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.ID = (string)(string(r.DecodeStringAsBytes())) + x.ID = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj17++ if yyhl17 { yyb17 = yyj17 > l @@ -1628,7 +1692,7 @@ func (x *LiveStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.FB = (string)(string(r.DecodeStringAsBytes())) + x.FB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj17++ if yyhl17 { yyb17 = yyj17 > l @@ -1640,7 +1704,7 @@ func (x *LiveStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.NS = (string)(string(r.DecodeStringAsBytes())) + x.NS = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj17++ if yyhl17 { yyb17 = yyj17 > l @@ -1652,7 +1716,7 @@ func (x *LiveStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.DB = (string)(string(r.DecodeStringAsBytes())) + x.DB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj17++ if yyhl17 { yyb17 = yyj17 > l @@ -1748,10 +1812,15 @@ func (x *LiveStatement) IsCodecEmpty() bool { return !(x.ID != "" || x.FB != "" || x.NS != "" || x.DB != "" || bool(x.Diff) || len(x.Expr) != 0 || len(x.What) != 0 || x.Cond != nil || len(x.Fetch) != 0 || false) } +func (KillStatement) codecSelferViaCodecgen() {} func (x *KillStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -1765,6 +1834,7 @@ func (x *KillStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt6 := z.Extension(x.What); yyxt6 != nil { z.EncExtension(x.What, yyxt6) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayEnd() @@ -1787,6 +1857,7 @@ func (x *KillStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt8 := z.Extension(x.What); yyxt8 != nil { z.EncExtension(x.What, yyxt8) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapEnd() @@ -1795,32 +1866,32 @@ func (x *KillStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *KillStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = KillStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *KillStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -1835,11 +1906,11 @@ func (x *KillStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "FB": - x.FB = (string)(string(r.DecodeStringAsBytes())) + x.FB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "What": if yyxt6 := z.Extension(x.What); yyxt6 != nil { z.DecExtension(&x.What, yyxt6) @@ -1847,13 +1918,13 @@ func (x *KillStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.What.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *KillStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj7 int @@ -1870,7 +1941,7 @@ func (x *KillStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.FB = (string)(string(r.DecodeStringAsBytes())) + x.FB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj7++ if yyhl7 { yyb7 = yyj7 > l @@ -1906,10 +1977,15 @@ func (x *KillStatement) IsCodecEmpty() bool { return !(x.FB != "" || len(x.What) != 0 || false) } +func (ReturnStatement) codecSelferViaCodecgen() {} func (x *ReturnStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -1923,6 +1999,7 @@ func (x *ReturnStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt6 := z.Extension(x.What); yyxt6 != nil { z.EncExtension(x.What, yyxt6) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayEnd() @@ -1945,6 +2022,7 @@ func (x *ReturnStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt8 := z.Extension(x.What); yyxt8 != nil { z.EncExtension(x.What, yyxt8) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapEnd() @@ -1953,32 +2031,32 @@ func (x *ReturnStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *ReturnStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = ReturnStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *ReturnStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -1993,9 +2071,9 @@ func (x *ReturnStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "RW": x.RW = (bool)(r.DecodeBool()) case "What": @@ -2005,13 +2083,13 @@ func (x *ReturnStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.What.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *ReturnStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj7 int @@ -2064,10 +2142,15 @@ func (x *ReturnStatement) IsCodecEmpty() bool { return !(bool(x.RW) || len(x.What) != 0 || false) } +func (IfelseStatement) codecSelferViaCodecgen() {} func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -2081,11 +2164,13 @@ func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt8 := z.Extension(x.Cond); yyxt8 != nil { z.EncExtension(x.Cond, yyxt8) + } else { x.Cond.CodecEncodeSelf(e) } z.EncWriteArrayElem() if yyxt9 := z.Extension(x.Then); yyxt9 != nil { z.EncExtension(x.Then, yyxt9) + } else { x.Then.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -2114,6 +2199,7 @@ func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt12 := z.Extension(x.Cond); yyxt12 != nil { z.EncExtension(x.Cond, yyxt12) + } else { x.Cond.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -2125,6 +2211,7 @@ func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt13 := z.Extension(x.Then); yyxt13 != nil { z.EncExtension(x.Then, yyxt13) + } else { x.Then.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -2145,32 +2232,32 @@ func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *IfelseStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = IfelseStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *IfelseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -2185,9 +2272,9 @@ func (x *IfelseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "RW": x.RW = (bool)(r.DecodeBool()) case "Cond": @@ -2209,13 +2296,13 @@ func (x *IfelseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Else, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *IfelseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj11 int @@ -2300,10 +2387,15 @@ func (x *IfelseStatement) IsCodecEmpty() bool { return !(bool(x.RW) || len(x.Cond) != 0 || len(x.Then) != 0 || x.Else != nil || false) } +func (SelectStatement) codecSelferViaCodecgen() {} func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -2317,11 +2409,13 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt16 := z.Extension(x.Expr); yyxt16 != nil { z.EncExtension(x.Expr, yyxt16) + } else { x.Expr.CodecEncodeSelf(e) } z.EncWriteArrayElem() if yyxt17 := z.Extension(x.What); yyxt17 != nil { z.EncExtension(x.What, yyxt17) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -2333,16 +2427,19 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt19 := z.Extension(x.Split); yyxt19 != nil { z.EncExtension(x.Split, yyxt19) + } else { x.Split.CodecEncodeSelf(e) } z.EncWriteArrayElem() if yyxt20 := z.Extension(x.Group); yyxt20 != nil { z.EncExtension(x.Group, yyxt20) + } else { x.Group.CodecEncodeSelf(e) } z.EncWriteArrayElem() if yyxt21 := z.Extension(x.Order); yyxt21 != nil { z.EncExtension(x.Order, yyxt21) + } else { x.Order.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -2360,6 +2457,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt24 := z.Extension(x.Fetch); yyxt24 != nil { z.EncExtension(x.Fetch, yyxt24) + } else { x.Fetch.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -2394,6 +2492,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt28 := z.Extension(x.Expr); yyxt28 != nil { z.EncExtension(x.Expr, yyxt28) + } else { x.Expr.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -2405,6 +2504,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt29 := z.Extension(x.What); yyxt29 != nil { z.EncExtension(x.What, yyxt29) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -2428,6 +2528,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt31 := z.Extension(x.Split); yyxt31 != nil { z.EncExtension(x.Split, yyxt31) + } else { x.Split.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -2439,6 +2540,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt32 := z.Extension(x.Group); yyxt32 != nil { z.EncExtension(x.Group, yyxt32) + } else { x.Group.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -2450,6 +2552,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt33 := z.Extension(x.Order); yyxt33 != nil { z.EncExtension(x.Order, yyxt33) + } else { x.Order.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -2485,6 +2588,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt36 := z.Extension(x.Fetch); yyxt36 != nil { z.EncExtension(x.Fetch, yyxt36) + } else { x.Fetch.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -2517,32 +2621,32 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *SelectStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = SelectStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *SelectStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -2557,9 +2661,9 @@ func (x *SelectStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "RW": x.RW = (bool)(r.DecodeBool()) case "Expr": @@ -2629,13 +2733,13 @@ func (x *SelectStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Timeout = (time.Duration)(r.DecodeInt64()) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj27 int @@ -2848,10 +2952,15 @@ func (x *SelectStatement) IsCodecEmpty() bool { return !(bool(x.RW) || len(x.Expr) != 0 || len(x.What) != 0 || x.Cond != nil || len(x.Split) != 0 || len(x.Group) != 0 || len(x.Order) != 0 || x.Limit != nil || x.Start != nil || len(x.Fetch) != 0 || x.Version != nil || x.Timeout != 0 || false) } +func (CreateStatement) codecSelferViaCodecgen() {} func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -2863,6 +2972,7 @@ func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt7 := z.Extension(x.What); yyxt7 != nil { z.EncExtension(x.What, yyxt7) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -2899,6 +3009,7 @@ func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt11 := z.Extension(x.What); yyxt11 != nil { z.EncExtension(x.What, yyxt11) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -2947,32 +3058,32 @@ func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *CreateStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = CreateStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *CreateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -2987,9 +3098,9 @@ func (x *CreateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "What": if yyxt5 := z.Extension(x.What); yyxt5 != nil { z.DecExtension(&x.What, yyxt5) @@ -3017,13 +3128,13 @@ func (x *CreateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Timeout = (time.Duration)(r.DecodeInt64()) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *CreateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj12 int @@ -3114,10 +3225,15 @@ func (x *CreateStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || x.Data != nil || x.Echo != 0 || x.Timeout != 0 || false) } +func (UpdateStatement) codecSelferViaCodecgen() {} func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -3129,6 +3245,7 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt8 := z.Extension(x.What); yyxt8 != nil { z.EncExtension(x.What, yyxt8) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -3171,6 +3288,7 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt13 := z.Extension(x.What); yyxt13 != nil { z.EncExtension(x.What, yyxt13) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -3231,32 +3349,32 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *UpdateStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = UpdateStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *UpdateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -3271,9 +3389,9 @@ func (x *UpdateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "What": if yyxt5 := z.Extension(x.What); yyxt5 != nil { z.DecExtension(&x.What, yyxt5) @@ -3307,13 +3425,13 @@ func (x *UpdateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Timeout = (time.Duration)(r.DecodeInt64()) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *UpdateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj14 int @@ -3420,10 +3538,15 @@ func (x *UpdateStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || x.Data != nil || x.Cond != nil || x.Echo != 0 || x.Timeout != 0 || false) } +func (DeleteStatement) codecSelferViaCodecgen() {} func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -3435,6 +3558,7 @@ func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt7 := z.Extension(x.What); yyxt7 != nil { z.EncExtension(x.What, yyxt7) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -3471,6 +3595,7 @@ func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt11 := z.Extension(x.What); yyxt11 != nil { z.EncExtension(x.What, yyxt11) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -3519,32 +3644,32 @@ func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DeleteStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DeleteStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DeleteStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -3559,9 +3684,9 @@ func (x *DeleteStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "What": if yyxt5 := z.Extension(x.What); yyxt5 != nil { z.DecExtension(&x.What, yyxt5) @@ -3589,13 +3714,13 @@ func (x *DeleteStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Timeout = (time.Duration)(r.DecodeInt64()) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DeleteStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj12 int @@ -3686,10 +3811,15 @@ func (x *DeleteStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || x.Cond != nil || x.Echo != 0 || x.Timeout != 0 || false) } +func (RelateStatement) codecSelferViaCodecgen() {} func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -3707,11 +3837,13 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt11 := z.Extension(x.From); yyxt11 != nil { z.EncExtension(x.From, yyxt11) + } else { x.From.CodecEncodeSelf(e) } z.EncWriteArrayElem() if yyxt12 := z.Extension(x.With); yyxt12 != nil { z.EncExtension(x.With, yyxt12) + } else { x.With.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -3762,6 +3894,7 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt18 := z.Extension(x.From); yyxt18 != nil { z.EncExtension(x.From, yyxt18) + } else { x.From.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -3773,6 +3906,7 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt19 := z.Extension(x.With); yyxt19 != nil { z.EncExtension(x.With, yyxt19) + } else { x.With.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -3829,32 +3963,32 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RelateStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RelateStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RelateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -3869,9 +4003,9 @@ func (x *RelateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Type": if yyxt5 := z.Extension(x.Type); yyxt5 != nil { z.DecExtension(&x.Type, yyxt5) @@ -3913,13 +4047,13 @@ func (x *RelateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Timeout = (time.Duration)(r.DecodeInt64()) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RelateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj17 int @@ -4054,10 +4188,15 @@ func (x *RelateStatement) IsCodecEmpty() bool { return !(x.Type != nil || len(x.From) != 0 || len(x.With) != 0 || x.Data != nil || bool(x.Uniq) || x.Echo != 0 || x.Timeout != 0 || false) } +func (InsertStatement) codecSelferViaCodecgen() {} func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -4080,6 +4219,7 @@ func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt8 := z.Extension(x.Into); yyxt8 != nil { z.EncExtension(x.Into, yyxt8) + } else { x.Into.CodecEncodeSelf(e) } } @@ -4126,6 +4266,7 @@ func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt12 := z.Extension(x.Into); yyxt12 != nil { z.EncExtension(x.Into, yyxt12) + } else { x.Into.CodecEncodeSelf(e) } } @@ -4163,32 +4304,32 @@ func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *InsertStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = InsertStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *InsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -4203,9 +4344,9 @@ func (x *InsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Data": if yyxt5 := z.Extension(x.Data); yyxt5 != nil { z.DecExtension(&x.Data, yyxt5) @@ -4242,13 +4383,13 @@ func (x *InsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Timeout = (time.Duration)(r.DecodeInt64()) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *InsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj12 int @@ -4348,10 +4489,15 @@ func (x *InsertStatement) IsCodecEmpty() bool { return !(x.Data != nil || x.Echo != 0 || x.Timeout != 0 || false) } +func (UpsertStatement) codecSelferViaCodecgen() {} func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -4374,6 +4520,7 @@ func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt8 := z.Extension(x.Into); yyxt8 != nil { z.EncExtension(x.Into, yyxt8) + } else { x.Into.CodecEncodeSelf(e) } } @@ -4420,6 +4567,7 @@ func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt12 := z.Extension(x.Into); yyxt12 != nil { z.EncExtension(x.Into, yyxt12) + } else { x.Into.CodecEncodeSelf(e) } } @@ -4457,32 +4605,32 @@ func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *UpsertStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = UpsertStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *UpsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -4497,9 +4645,9 @@ func (x *UpsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Data": if yyxt5 := z.Extension(x.Data); yyxt5 != nil { z.DecExtension(&x.Data, yyxt5) @@ -4536,13 +4684,13 @@ func (x *UpsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Timeout = (time.Duration)(r.DecodeInt64()) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *UpsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj12 int @@ -4642,10 +4790,15 @@ func (x *UpsertStatement) IsCodecEmpty() bool { return !(x.Data != nil || x.Echo != 0 || x.Timeout != 0 || false) } +func (DefineNamespaceStatement) codecSelferViaCodecgen() {} func (x *DefineNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -4662,6 +4815,7 @@ func (x *DefineNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt4 := z.Extension(x.Name); yyxt4 != nil { z.EncExtension(x.Name, yyxt4) + } else { x.Name.CodecEncodeSelf(e) } } @@ -4680,6 +4834,7 @@ func (x *DefineNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt5 := z.Extension(x.Name); yyxt5 != nil { z.EncExtension(x.Name, yyxt5) + } else { x.Name.CodecEncodeSelf(e) } } @@ -4689,32 +4844,32 @@ func (x *DefineNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DefineNamespaceStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DefineNamespaceStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DefineNamespaceStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -4729,9 +4884,9 @@ func (x *DefineNamespaceStatement) codecDecodeSelfFromMap(l int, d *codec1978.De } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -4748,13 +4903,13 @@ func (x *DefineNamespaceStatement) codecDecodeSelfFromMap(l int, d *codec1978.De } } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DefineNamespaceStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -4804,10 +4959,15 @@ func (x *DefineNamespaceStatement) IsCodecEmpty() bool { return !(false) } +func (RemoveNamespaceStatement) codecSelferViaCodecgen() {} func (x *RemoveNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -4824,6 +4984,7 @@ func (x *RemoveNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt4 := z.Extension(x.Name); yyxt4 != nil { z.EncExtension(x.Name, yyxt4) + } else { x.Name.CodecEncodeSelf(e) } } @@ -4842,6 +5003,7 @@ func (x *RemoveNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt5 := z.Extension(x.Name); yyxt5 != nil { z.EncExtension(x.Name, yyxt5) + } else { x.Name.CodecEncodeSelf(e) } } @@ -4851,32 +5013,32 @@ func (x *RemoveNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RemoveNamespaceStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RemoveNamespaceStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RemoveNamespaceStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -4891,9 +5053,9 @@ func (x *RemoveNamespaceStatement) codecDecodeSelfFromMap(l int, d *codec1978.De } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -4910,13 +5072,13 @@ func (x *RemoveNamespaceStatement) codecDecodeSelfFromMap(l int, d *codec1978.De } } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RemoveNamespaceStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -4966,10 +5128,15 @@ func (x *RemoveNamespaceStatement) IsCodecEmpty() bool { return !(false) } +func (DefineDatabaseStatement) codecSelferViaCodecgen() {} func (x *DefineDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -4986,6 +5153,7 @@ func (x *DefineDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt4 := z.Extension(x.Name); yyxt4 != nil { z.EncExtension(x.Name, yyxt4) + } else { x.Name.CodecEncodeSelf(e) } } @@ -5004,6 +5172,7 @@ func (x *DefineDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt5 := z.Extension(x.Name); yyxt5 != nil { z.EncExtension(x.Name, yyxt5) + } else { x.Name.CodecEncodeSelf(e) } } @@ -5013,32 +5182,32 @@ func (x *DefineDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DefineDatabaseStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DefineDatabaseStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DefineDatabaseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -5053,9 +5222,9 @@ func (x *DefineDatabaseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -5072,13 +5241,13 @@ func (x *DefineDatabaseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DefineDatabaseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -5128,10 +5297,15 @@ func (x *DefineDatabaseStatement) IsCodecEmpty() bool { return !(false) } +func (RemoveDatabaseStatement) codecSelferViaCodecgen() {} func (x *RemoveDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -5148,6 +5322,7 @@ func (x *RemoveDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt4 := z.Extension(x.Name); yyxt4 != nil { z.EncExtension(x.Name, yyxt4) + } else { x.Name.CodecEncodeSelf(e) } } @@ -5166,6 +5341,7 @@ func (x *RemoveDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt5 := z.Extension(x.Name); yyxt5 != nil { z.EncExtension(x.Name, yyxt5) + } else { x.Name.CodecEncodeSelf(e) } } @@ -5175,32 +5351,32 @@ func (x *RemoveDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RemoveDatabaseStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RemoveDatabaseStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RemoveDatabaseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -5215,9 +5391,9 @@ func (x *RemoveDatabaseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -5234,13 +5410,13 @@ func (x *RemoveDatabaseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RemoveDatabaseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -5290,10 +5466,15 @@ func (x *RemoveDatabaseStatement) IsCodecEmpty() bool { return !(false) } +func (DefineLoginStatement) codecSelferViaCodecgen() {} func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -5320,6 +5501,7 @@ func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt9 := z.Extension(x.User); yyxt9 != nil { z.EncExtension(x.User, yyxt9) + } else { x.User.CodecEncodeSelf(e) } } @@ -5372,6 +5554,7 @@ func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt14 := z.Extension(x.User); yyxt14 != nil { z.EncExtension(x.User, yyxt14) + } else { x.User.CodecEncodeSelf(e) } } @@ -5417,32 +5600,32 @@ func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DefineLoginStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DefineLoginStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DefineLoginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -5457,9 +5640,9 @@ func (x *DefineLoginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Kind": if yyxt5 := z.Extension(x.Kind); yyxt5 != nil { z.DecExtension(&x.Kind, yyxt5) @@ -5484,19 +5667,19 @@ func (x *DefineLoginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } case "Pass": - x.Pass = r.DecodeBytes(([]byte)(x.Pass), false) + x.Pass = z.DecodeBytesInto(([]byte)(x.Pass)) case "Hash": - x.Hash = r.DecodeBytes(([]byte)(x.Hash), false) + x.Hash = z.DecodeBytesInto(([]byte)(x.Hash)) case "Code": - x.Code = r.DecodeBytes(([]byte)(x.Code), false) + x.Code = z.DecodeBytesInto(([]byte)(x.Code)) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DefineLoginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj14 int @@ -5556,7 +5739,7 @@ func (x *DefineLoginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco return } z.DecReadArrayElem() - x.Pass = r.DecodeBytes(([]byte)(x.Pass), false) + x.Pass = z.DecodeBytesInto(([]byte)(x.Pass)) yyj14++ if yyhl14 { yyb14 = yyj14 > l @@ -5568,7 +5751,7 @@ func (x *DefineLoginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco return } z.DecReadArrayElem() - x.Hash = r.DecodeBytes(([]byte)(x.Hash), false) + x.Hash = z.DecodeBytesInto(([]byte)(x.Hash)) yyj14++ if yyhl14 { yyb14 = yyj14 > l @@ -5580,7 +5763,7 @@ func (x *DefineLoginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco return } z.DecReadArrayElem() - x.Code = r.DecodeBytes(([]byte)(x.Code), false) + x.Code = z.DecodeBytesInto(([]byte)(x.Code)) for { yyj14++ if yyhl14 { @@ -5600,10 +5783,15 @@ func (x *DefineLoginStatement) IsCodecEmpty() bool { return !(x.Kind != 0 || len(x.Pass) != 0 || len(x.Hash) != 0 || len(x.Code) != 0 || false) } +func (RemoveLoginStatement) codecSelferViaCodecgen() {} func (x *RemoveLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -5630,6 +5818,7 @@ func (x *RemoveLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt6 := z.Extension(x.User); yyxt6 != nil { z.EncExtension(x.User, yyxt6) + } else { x.User.CodecEncodeSelf(e) } } @@ -5664,6 +5853,7 @@ func (x *RemoveLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt8 := z.Extension(x.User); yyxt8 != nil { z.EncExtension(x.User, yyxt8) + } else { x.User.CodecEncodeSelf(e) } } @@ -5673,32 +5863,32 @@ func (x *RemoveLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RemoveLoginStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RemoveLoginStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RemoveLoginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -5713,9 +5903,9 @@ func (x *RemoveLoginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Kind": if yyxt5 := z.Extension(x.Kind); yyxt5 != nil { z.DecExtension(&x.Kind, yyxt5) @@ -5740,13 +5930,13 @@ func (x *RemoveLoginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RemoveLoginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj8 int @@ -5814,10 +6004,15 @@ func (x *RemoveLoginStatement) IsCodecEmpty() bool { return !(x.Kind != 0 || false) } +func (DefineTokenStatement) codecSelferViaCodecgen() {} func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -5845,6 +6040,7 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt9 := z.Extension(x.Name); yyxt9 != nil { z.EncExtension(x.Name, yyxt9) + } else { x.Name.CodecEncodeSelf(e) } } @@ -5855,6 +6051,7 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt10 := z.Extension(x.What); yyxt10 != nil { z.EncExtension(x.What, yyxt10) + } else { x.What.CodecEncodeSelf(e) } } @@ -5897,6 +6094,7 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt14 := z.Extension(x.Name); yyxt14 != nil { z.EncExtension(x.Name, yyxt14) + } else { x.Name.CodecEncodeSelf(e) } } @@ -5912,6 +6110,7 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt15 := z.Extension(x.What); yyxt15 != nil { z.EncExtension(x.What, yyxt15) + } else { x.What.CodecEncodeSelf(e) } } @@ -5941,32 +6140,32 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DefineTokenStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DefineTokenStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DefineTokenStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -5981,9 +6180,9 @@ func (x *DefineTokenStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Kind": if yyxt5 := z.Extension(x.Kind); yyxt5 != nil { z.DecExtension(&x.Kind, yyxt5) @@ -6023,17 +6222,17 @@ func (x *DefineTokenStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } case "Type": - x.Type = (string)(string(r.DecodeStringAsBytes())) + x.Type = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "Code": - x.Code = r.DecodeBytes(([]byte)(x.Code), false) + x.Code = z.DecodeBytesInto(([]byte)(x.Code)) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DefineTokenStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj13 int @@ -6118,7 +6317,7 @@ func (x *DefineTokenStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco return } z.DecReadArrayElem() - x.Type = (string)(string(r.DecodeStringAsBytes())) + x.Type = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj13++ if yyhl13 { yyb13 = yyj13 > l @@ -6130,7 +6329,7 @@ func (x *DefineTokenStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco return } z.DecReadArrayElem() - x.Code = r.DecodeBytes(([]byte)(x.Code), false) + x.Code = z.DecodeBytesInto(([]byte)(x.Code)) for { yyj13++ if yyhl13 { @@ -6150,10 +6349,15 @@ func (x *DefineTokenStatement) IsCodecEmpty() bool { return !(x.Kind != 0 || x.Type != "" || len(x.Code) != 0 || false) } +func (RemoveTokenStatement) codecSelferViaCodecgen() {} func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -6181,6 +6385,7 @@ func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt7 := z.Extension(x.Name); yyxt7 != nil { z.EncExtension(x.Name, yyxt7) + } else { x.Name.CodecEncodeSelf(e) } } @@ -6191,6 +6396,7 @@ func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt8 := z.Extension(x.What); yyxt8 != nil { z.EncExtension(x.What, yyxt8) + } else { x.What.CodecEncodeSelf(e) } } @@ -6225,6 +6431,7 @@ func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt10 := z.Extension(x.Name); yyxt10 != nil { z.EncExtension(x.Name, yyxt10) + } else { x.Name.CodecEncodeSelf(e) } } @@ -6240,6 +6447,7 @@ func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt11 := z.Extension(x.What); yyxt11 != nil { z.EncExtension(x.What, yyxt11) + } else { x.What.CodecEncodeSelf(e) } } @@ -6249,32 +6457,32 @@ func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RemoveTokenStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RemoveTokenStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RemoveTokenStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -6289,9 +6497,9 @@ func (x *RemoveTokenStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Kind": if yyxt5 := z.Extension(x.Kind); yyxt5 != nil { z.DecExtension(&x.Kind, yyxt5) @@ -6331,13 +6539,13 @@ func (x *RemoveTokenStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RemoveTokenStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj10 int @@ -6430,10 +6638,15 @@ func (x *RemoveTokenStatement) IsCodecEmpty() bool { return !(x.Kind != 0 || false) } +func (DefineScopeStatement) codecSelferViaCodecgen() {} func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -6450,6 +6663,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt11 := z.Extension(x.Name); yyxt11 != nil { z.EncExtension(x.Name, yyxt11) + } else { x.Name.CodecEncodeSelf(e) } } @@ -6510,6 +6724,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt19 := z.Extension(x.Name); yyxt19 != nil { z.EncExtension(x.Name, yyxt19) + } else { x.Name.CodecEncodeSelf(e) } } @@ -6603,32 +6818,32 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DefineScopeStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DefineScopeStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DefineScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -6643,9 +6858,9 @@ func (x *DefineScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -6668,7 +6883,7 @@ func (x *DefineScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.Time = (time.Duration)(r.DecodeInt64()) } case "Code": - x.Code = r.DecodeBytes(([]byte)(x.Code), false) + x.Code = z.DecodeBytesInto(([]byte)(x.Code)) case "Signup": if yyxt11 := z.Extension(x.Signup); yyxt11 != nil { z.DecExtension(&x.Signup, yyxt11) @@ -6700,13 +6915,13 @@ func (x *DefineScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode z.DecFallback(&x.OnSignin, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DefineScopeStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj20 int @@ -6764,7 +6979,7 @@ func (x *DefineScopeStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco return } z.DecReadArrayElem() - x.Code = r.DecodeBytes(([]byte)(x.Code), false) + x.Code = z.DecodeBytesInto(([]byte)(x.Code)) yyj20++ if yyhl20 { yyb20 = yyj20 > l @@ -6864,10 +7079,15 @@ func (x *DefineScopeStatement) IsCodecEmpty() bool { return !(x.Time != 0 || len(x.Code) != 0 || x.Signup != nil || x.Signin != nil || x.Connect != nil || x.OnSignup != nil || x.OnSignin != nil || false) } +func (RemoveScopeStatement) codecSelferViaCodecgen() {} func (x *RemoveScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -6884,6 +7104,7 @@ func (x *RemoveScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt4 := z.Extension(x.Name); yyxt4 != nil { z.EncExtension(x.Name, yyxt4) + } else { x.Name.CodecEncodeSelf(e) } } @@ -6902,6 +7123,7 @@ func (x *RemoveScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt5 := z.Extension(x.Name); yyxt5 != nil { z.EncExtension(x.Name, yyxt5) + } else { x.Name.CodecEncodeSelf(e) } } @@ -6911,32 +7133,32 @@ func (x *RemoveScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RemoveScopeStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RemoveScopeStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RemoveScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -6951,9 +7173,9 @@ func (x *RemoveScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -6970,13 +7192,13 @@ func (x *RemoveScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RemoveScopeStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -7026,10 +7248,15 @@ func (x *RemoveScopeStatement) IsCodecEmpty() bool { return !(false) } +func (DefineTableStatement) codecSelferViaCodecgen() {} func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -7046,12 +7273,14 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt14 := z.Extension(x.Name); yyxt14 != nil { z.EncExtension(x.Name, yyxt14) + } else { x.Name.CodecEncodeSelf(e) } } z.EncWriteArrayElem() if yyxt15 := z.Extension(x.What); yyxt15 != nil { z.EncExtension(x.What, yyxt15) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -7065,11 +7294,13 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt20 := z.Extension(x.Expr); yyxt20 != nil { z.EncExtension(x.Expr, yyxt20) + } else { x.Expr.CodecEncodeSelf(e) } z.EncWriteArrayElem() if yyxt21 := z.Extension(x.From); yyxt21 != nil { z.EncExtension(x.From, yyxt21) + } else { x.From.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -7081,6 +7312,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt23 := z.Extension(x.Group); yyxt23 != nil { z.EncExtension(x.Group, yyxt23) + } else { x.Group.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -7104,6 +7336,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt25 := z.Extension(x.Name); yyxt25 != nil { z.EncExtension(x.Name, yyxt25) + } else { x.Name.CodecEncodeSelf(e) } } @@ -7116,6 +7349,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt26 := z.Extension(x.What); yyxt26 != nil { z.EncExtension(x.What, yyxt26) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -7159,6 +7393,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt31 := z.Extension(x.Expr); yyxt31 != nil { z.EncExtension(x.Expr, yyxt31) + } else { x.Expr.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -7170,6 +7405,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt32 := z.Extension(x.From); yyxt32 != nil { z.EncExtension(x.From, yyxt32) + } else { x.From.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -7193,6 +7429,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt34 := z.Extension(x.Group); yyxt34 != nil { z.EncExtension(x.Group, yyxt34) + } else { x.Group.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -7213,32 +7450,32 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DefineTableStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DefineTableStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DefineTableStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -7253,9 +7490,9 @@ func (x *DefineTableStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -7316,13 +7553,13 @@ func (x *DefineTableStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode z.DecFallback(&x.Perms, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DefineTableStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj22 int @@ -7516,10 +7753,15 @@ func (x *DefineTableStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || bool(x.Full) || bool(x.Vers) || bool(x.Drop) || bool(x.Lock) || len(x.Expr) != 0 || len(x.From) != 0 || x.Cond != nil || len(x.Group) != 0 || x.Perms != nil || false) } +func (RemoveTableStatement) codecSelferViaCodecgen() {} func (x *RemoveTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -7531,6 +7773,7 @@ func (x *RemoveTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt4 := z.Extension(x.What); yyxt4 != nil { z.EncExtension(x.What, yyxt4) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayEnd() @@ -7545,6 +7788,7 @@ func (x *RemoveTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt5 := z.Extension(x.What); yyxt5 != nil { z.EncExtension(x.What, yyxt5) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapEnd() @@ -7553,32 +7797,32 @@ func (x *RemoveTableStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RemoveTableStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RemoveTableStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RemoveTableStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -7593,9 +7837,9 @@ func (x *RemoveTableStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "What": if yyxt5 := z.Extension(x.What); yyxt5 != nil { z.DecExtension(&x.What, yyxt5) @@ -7603,13 +7847,13 @@ func (x *RemoveTableStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.What.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RemoveTableStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -7650,10 +7894,15 @@ func (x *RemoveTableStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || false) } +func (DefineEventStatement) codecSelferViaCodecgen() {} func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -7670,12 +7919,14 @@ func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt7 := z.Extension(x.Name); yyxt7 != nil { z.EncExtension(x.Name, yyxt7) + } else { x.Name.CodecEncodeSelf(e) } } z.EncWriteArrayElem() if yyxt8 := z.Extension(x.What); yyxt8 != nil { z.EncExtension(x.What, yyxt8) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -7705,6 +7956,7 @@ func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt11 := z.Extension(x.Name); yyxt11 != nil { z.EncExtension(x.Name, yyxt11) + } else { x.Name.CodecEncodeSelf(e) } } @@ -7717,6 +7969,7 @@ func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt12 := z.Extension(x.What); yyxt12 != nil { z.EncExtension(x.What, yyxt12) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -7749,32 +8002,32 @@ func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DefineEventStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DefineEventStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DefineEventStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -7789,9 +8042,9 @@ func (x *DefineEventStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -7826,13 +8079,13 @@ func (x *DefineEventStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode z.DecFallback(&x.Then, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DefineEventStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj12 int @@ -7930,10 +8183,15 @@ func (x *DefineEventStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || x.When != nil || x.Then != nil || false) } +func (RemoveEventStatement) codecSelferViaCodecgen() {} func (x *RemoveEventStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -7950,12 +8208,14 @@ func (x *RemoveEventStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt5 := z.Extension(x.Name); yyxt5 != nil { z.EncExtension(x.Name, yyxt5) + } else { x.Name.CodecEncodeSelf(e) } } z.EncWriteArrayElem() if yyxt6 := z.Extension(x.What); yyxt6 != nil { z.EncExtension(x.What, yyxt6) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayEnd() @@ -7973,6 +8233,7 @@ func (x *RemoveEventStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt7 := z.Extension(x.Name); yyxt7 != nil { z.EncExtension(x.Name, yyxt7) + } else { x.Name.CodecEncodeSelf(e) } } @@ -7985,6 +8246,7 @@ func (x *RemoveEventStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt8 := z.Extension(x.What); yyxt8 != nil { z.EncExtension(x.What, yyxt8) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapEnd() @@ -7993,32 +8255,32 @@ func (x *RemoveEventStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RemoveEventStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RemoveEventStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RemoveEventStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -8033,9 +8295,9 @@ func (x *RemoveEventStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -8058,13 +8320,13 @@ func (x *RemoveEventStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.What.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RemoveEventStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj8 int @@ -8130,10 +8392,15 @@ func (x *RemoveEventStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || false) } +func (DefineFieldStatement) codecSelferViaCodecgen() {} func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -8150,12 +8417,14 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt11 := z.Extension(x.Name); yyxt11 != nil { z.EncExtension(x.Name, yyxt11) + } else { x.Name.CodecEncodeSelf(e) } } z.EncWriteArrayElem() if yyxt12 := z.Extension(x.What); yyxt12 != nil { z.EncExtension(x.What, yyxt12) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -8197,6 +8466,7 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt19 := z.Extension(x.Name); yyxt19 != nil { z.EncExtension(x.Name, yyxt19) + } else { x.Name.CodecEncodeSelf(e) } } @@ -8209,6 +8479,7 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt20 := z.Extension(x.What); yyxt20 != nil { z.EncExtension(x.What, yyxt20) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -8277,32 +8548,32 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DefineFieldStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DefineFieldStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DefineFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -8317,9 +8588,9 @@ func (x *DefineFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -8348,9 +8619,9 @@ func (x *DefineFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode z.DecFallback(&x.Perms, true) } case "Type": - x.Type = (string)(string(r.DecodeStringAsBytes())) + x.Type = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "Kind": - x.Kind = (string)(string(r.DecodeStringAsBytes())) + x.Kind = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "Value": if yyxt13 := z.Extension(x.Value); yyxt13 != nil { z.DecExtension(&x.Value, yyxt13) @@ -8366,13 +8637,13 @@ func (x *DefineFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode case "Priority": x.Priority = (float64)(r.DecodeFloat64()) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DefineFieldStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj17 int @@ -8446,7 +8717,7 @@ func (x *DefineFieldStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco return } z.DecReadArrayElem() - x.Type = (string)(string(r.DecodeStringAsBytes())) + x.Type = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj17++ if yyhl17 { yyb17 = yyj17 > l @@ -8458,7 +8729,7 @@ func (x *DefineFieldStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco return } z.DecReadArrayElem() - x.Kind = (string)(string(r.DecodeStringAsBytes())) + x.Kind = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj17++ if yyhl17 { yyb17 = yyj17 > l @@ -8522,10 +8793,15 @@ func (x *DefineFieldStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || x.Perms != nil || x.Type != "" || x.Kind != "" || x.Value != nil || x.Assert != nil || x.Priority != 0 || false) } +func (RemoveFieldStatement) codecSelferViaCodecgen() {} func (x *RemoveFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -8542,12 +8818,14 @@ func (x *RemoveFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt5 := z.Extension(x.Name); yyxt5 != nil { z.EncExtension(x.Name, yyxt5) + } else { x.Name.CodecEncodeSelf(e) } } z.EncWriteArrayElem() if yyxt6 := z.Extension(x.What); yyxt6 != nil { z.EncExtension(x.What, yyxt6) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayEnd() @@ -8565,6 +8843,7 @@ func (x *RemoveFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt7 := z.Extension(x.Name); yyxt7 != nil { z.EncExtension(x.Name, yyxt7) + } else { x.Name.CodecEncodeSelf(e) } } @@ -8577,6 +8856,7 @@ func (x *RemoveFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt8 := z.Extension(x.What); yyxt8 != nil { z.EncExtension(x.What, yyxt8) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapEnd() @@ -8585,32 +8865,32 @@ func (x *RemoveFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RemoveFieldStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RemoveFieldStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RemoveFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -8625,9 +8905,9 @@ func (x *RemoveFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -8650,13 +8930,13 @@ func (x *RemoveFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.What.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RemoveFieldStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj8 int @@ -8722,10 +9002,15 @@ func (x *RemoveFieldStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || false) } +func (DefineIndexStatement) codecSelferViaCodecgen() {} func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -8742,17 +9027,20 @@ func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt7 := z.Extension(x.Name); yyxt7 != nil { z.EncExtension(x.Name, yyxt7) + } else { x.Name.CodecEncodeSelf(e) } } z.EncWriteArrayElem() if yyxt8 := z.Extension(x.What); yyxt8 != nil { z.EncExtension(x.What, yyxt8) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayElem() if yyxt9 := z.Extension(x.Cols); yyxt9 != nil { z.EncExtension(x.Cols, yyxt9) + } else { x.Cols.CodecEncodeSelf(e) } z.EncWriteArrayElem() @@ -8772,6 +9060,7 @@ func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt11 := z.Extension(x.Name); yyxt11 != nil { z.EncExtension(x.Name, yyxt11) + } else { x.Name.CodecEncodeSelf(e) } } @@ -8784,6 +9073,7 @@ func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt12 := z.Extension(x.What); yyxt12 != nil { z.EncExtension(x.What, yyxt12) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -8795,6 +9085,7 @@ func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt13 := z.Extension(x.Cols); yyxt13 != nil { z.EncExtension(x.Cols, yyxt13) + } else { x.Cols.CodecEncodeSelf(e) } z.EncWriteMapElemKey() @@ -8811,32 +9102,32 @@ func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DefineIndexStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DefineIndexStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DefineIndexStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -8851,9 +9142,9 @@ func (x *DefineIndexStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -8884,13 +9175,13 @@ func (x *DefineIndexStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode case "Uniq": x.Uniq = (bool)(r.DecodeBool()) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DefineIndexStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj11 int @@ -8984,10 +9275,15 @@ func (x *DefineIndexStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || len(x.Cols) != 0 || bool(x.Uniq) || false) } +func (RemoveIndexStatement) codecSelferViaCodecgen() {} func (x *RemoveIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -9004,12 +9300,14 @@ func (x *RemoveIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt5 := z.Extension(x.Name); yyxt5 != nil { z.EncExtension(x.Name, yyxt5) + } else { x.Name.CodecEncodeSelf(e) } } z.EncWriteArrayElem() if yyxt6 := z.Extension(x.What); yyxt6 != nil { z.EncExtension(x.What, yyxt6) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteArrayEnd() @@ -9027,6 +9325,7 @@ func (x *RemoveIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt7 := z.Extension(x.Name); yyxt7 != nil { z.EncExtension(x.Name, yyxt7) + } else { x.Name.CodecEncodeSelf(e) } } @@ -9039,6 +9338,7 @@ func (x *RemoveIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteMapElemValue() if yyxt8 := z.Extension(x.What); yyxt8 != nil { z.EncExtension(x.What, yyxt8) + } else { x.What.CodecEncodeSelf(e) } z.EncWriteMapEnd() @@ -9047,32 +9347,32 @@ func (x *RemoveIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *RemoveIndexStatement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = RemoveIndexStatement{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *RemoveIndexStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -9087,9 +9387,9 @@ func (x *RemoveIndexStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": if r.TryNil() { if x.Name != nil { // remove the if-true @@ -9112,13 +9412,13 @@ func (x *RemoveIndexStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.What.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *RemoveIndexStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj8 int @@ -9184,8 +9484,9 @@ func (x *RemoveIndexStatement) IsCodecEmpty() bool { return !(len(x.What) != 0 || false) } +func (Exprs) codecSelferViaCodecgen() {} func (x Exprs) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -9196,16 +9497,21 @@ func (x Exprs) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Exprs) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decExprs((*Exprs)(x), d) } +func (All) codecSelferViaCodecgen() {} func (x *All) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -9223,32 +9529,32 @@ func (x *All) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *All) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = All{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *All) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -9263,17 +9569,17 @@ func (x *All) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *All) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj4 int @@ -9298,10 +9604,15 @@ func (x *All) IsCodecEmpty() bool { return !(false) } +func (Any) codecSelferViaCodecgen() {} func (x *Any) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -9319,32 +9630,32 @@ func (x *Any) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Any) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Any{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Any) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -9359,17 +9670,17 @@ func (x *Any) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Any) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj4 int @@ -9394,10 +9705,15 @@ func (x *Any) IsCodecEmpty() bool { return !(false) } +func (Null) codecSelferViaCodecgen() {} func (x *Null) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -9415,32 +9731,32 @@ func (x *Null) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Null) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Null{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Null) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -9455,17 +9771,17 @@ func (x *Null) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Null) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj4 int @@ -9490,10 +9806,15 @@ func (x *Null) IsCodecEmpty() bool { return !(false) } +func (Void) codecSelferViaCodecgen() {} func (x *Void) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -9511,32 +9832,32 @@ func (x *Void) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Void) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Void{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Void) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -9551,17 +9872,17 @@ func (x *Void) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Void) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj4 int @@ -9586,10 +9907,15 @@ func (x *Void) IsCodecEmpty() bool { return !(false) } +func (Empty) codecSelferViaCodecgen() {} func (x *Empty) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -9607,32 +9933,32 @@ func (x *Empty) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Empty) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Empty{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Empty) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -9647,17 +9973,17 @@ func (x *Empty) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Empty) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj4 int @@ -9682,10 +10008,15 @@ func (x *Empty) IsCodecEmpty() bool { return !(false) } +func (Field) codecSelferViaCodecgen() {} func (x *Field) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -9741,32 +10072,32 @@ func (x *Field) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Field) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Field{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Field) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -9781,9 +10112,9 @@ func (x *Field) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Expr": if yyxt5 := z.Extension(x.Expr); yyxt5 != nil { z.DecExtension(&x.Expr, yyxt5) @@ -9791,17 +10122,17 @@ func (x *Field) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Expr, true) } case "Field": - x.Field = (string)(string(r.DecodeStringAsBytes())) + x.Field = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "Alias": - x.Alias = (string)(string(r.DecodeStringAsBytes())) + x.Alias = (string)(z.DecStringZC(r.DecodeStringAsBytes())) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Field) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj8 int @@ -9834,7 +10165,7 @@ func (x *Field) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.Field = (string)(string(r.DecodeStringAsBytes())) + x.Field = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj8++ if yyhl8 { yyb8 = yyj8 > l @@ -9846,7 +10177,7 @@ func (x *Field) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.Alias = (string)(string(r.DecodeStringAsBytes())) + x.Alias = (string)(z.DecStringZC(r.DecodeStringAsBytes())) for { yyj8++ if yyhl8 { @@ -9866,8 +10197,9 @@ func (x *Field) IsCodecEmpty() bool { return !(x.Expr != nil || x.Field != "" || x.Alias != "" || false) } +func (Fields) codecSelferViaCodecgen() {} func (x Fields) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -9878,16 +10210,21 @@ func (x Fields) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Fields) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decFields((*Fields)(x), d) } +func (Group) codecSelferViaCodecgen() {} func (x *Group) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -9923,32 +10260,32 @@ func (x *Group) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Group) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Group{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Group) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -9963,9 +10300,9 @@ func (x *Group) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Expr": if yyxt5 := z.Extension(x.Expr); yyxt5 != nil { z.DecExtension(&x.Expr, yyxt5) @@ -9973,13 +10310,13 @@ func (x *Group) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Expr, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Group) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -10020,8 +10357,9 @@ func (x *Group) IsCodecEmpty() bool { return !(x.Expr != nil || false) } +func (Groups) codecSelferViaCodecgen() {} func (x Groups) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -10032,16 +10370,21 @@ func (x Groups) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Groups) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decGroups((*Groups)(x), d) } +func (Order) codecSelferViaCodecgen() {} func (x *Order) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -10111,32 +10454,32 @@ func (x *Order) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Order) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Order{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Order) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -10151,9 +10494,9 @@ func (x *Order) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Expr": if yyxt5 := z.Extension(x.Expr); yyxt5 != nil { z.DecExtension(&x.Expr, yyxt5) @@ -10171,13 +10514,13 @@ func (x *Order) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Tag, false) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Order) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj9 int @@ -10248,8 +10591,9 @@ func (x *Order) IsCodecEmpty() bool { return !(x.Expr != nil || bool(x.Dir) || x.Tag != pkg1_language.Tag{} || false) } +func (Orders) codecSelferViaCodecgen() {} func (x Orders) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -10260,16 +10604,21 @@ func (x Orders) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Orders) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decOrders((*Orders)(x), d) } +func (Fetch) codecSelferViaCodecgen() {} func (x *Fetch) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -10305,32 +10654,32 @@ func (x *Fetch) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Fetch) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Fetch{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Fetch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -10345,9 +10694,9 @@ func (x *Fetch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Expr": if yyxt5 := z.Extension(x.Expr); yyxt5 != nil { z.DecExtension(&x.Expr, yyxt5) @@ -10355,13 +10704,13 @@ func (x *Fetch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Expr, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Fetch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -10402,8 +10751,9 @@ func (x *Fetch) IsCodecEmpty() bool { return !(x.Expr != nil || false) } +func (Fetchs) codecSelferViaCodecgen() {} func (x Fetchs) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -10414,16 +10764,21 @@ func (x Fetchs) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Fetchs) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decFetchs((*Fetchs)(x), d) } +func (SubExpression) codecSelferViaCodecgen() {} func (x *SubExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -10459,32 +10814,32 @@ func (x *SubExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *SubExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = SubExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *SubExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -10499,9 +10854,9 @@ func (x *SubExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Expr": if yyxt5 := z.Extension(x.Expr); yyxt5 != nil { z.DecExtension(&x.Expr, yyxt5) @@ -10509,13 +10864,13 @@ func (x *SubExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Expr, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *SubExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -10556,10 +10911,15 @@ func (x *SubExpression) IsCodecEmpty() bool { return !(x.Expr != nil || false) } +func (MultExpression) codecSelferViaCodecgen() {} func (x *MultExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -10595,32 +10955,32 @@ func (x *MultExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *MultExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = MultExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *MultExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -10635,19 +10995,19 @@ func (x *MultExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Expr": h.decSliceExpr((*[]Expr)(&x.Expr), d) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *MultExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -10684,10 +11044,15 @@ func (x *MultExpression) IsCodecEmpty() bool { return !(len(x.Expr) != 0 || false) } +func (FuncExpression) codecSelferViaCodecgen() {} func (x *FuncExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -10743,32 +11108,32 @@ func (x *FuncExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *FuncExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = FuncExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *FuncExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -10783,11 +11148,11 @@ func (x *FuncExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Name": - x.Name = (string)(string(r.DecodeStringAsBytes())) + x.Name = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "Args": if yyxt6 := z.Extension(x.Args); yyxt6 != nil { z.DecExtension(&x.Args, yyxt6) @@ -10797,13 +11162,13 @@ func (x *FuncExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { case "Aggr": x.Aggr = (bool)(r.DecodeBool()) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *FuncExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj8 int @@ -10820,7 +11185,7 @@ func (x *FuncExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.Name = (string)(string(r.DecodeStringAsBytes())) + x.Name = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj8++ if yyhl8 { yyb8 = yyj8 > l @@ -10868,10 +11233,15 @@ func (x *FuncExpression) IsCodecEmpty() bool { return !(x.Name != "" || len(x.Args) != 0 || bool(x.Aggr) || false) } +func (ItemExpression) codecSelferViaCodecgen() {} func (x *ItemExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -10951,32 +11321,32 @@ func (x *ItemExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *ItemExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = ItemExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *ItemExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -10991,9 +11361,9 @@ func (x *ItemExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "LHS": if yyxt5 := z.Extension(x.LHS); yyxt5 != nil { z.DecExtension(&x.LHS, yyxt5) @@ -11015,13 +11385,13 @@ func (x *ItemExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.RHS, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *ItemExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj10 int @@ -11096,10 +11466,15 @@ func (x *ItemExpression) IsCodecEmpty() bool { return !(x.LHS != nil || x.Op != 0 || x.RHS != nil || false) } +func (BinaryExpression) codecSelferViaCodecgen() {} func (x *BinaryExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -11179,32 +11554,32 @@ func (x *BinaryExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *BinaryExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = BinaryExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *BinaryExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -11219,9 +11594,9 @@ func (x *BinaryExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "LHS": if yyxt5 := z.Extension(x.LHS); yyxt5 != nil { z.DecExtension(&x.LHS, yyxt5) @@ -11243,13 +11618,13 @@ func (x *BinaryExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.RHS, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *BinaryExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj10 int @@ -11324,10 +11699,15 @@ func (x *BinaryExpression) IsCodecEmpty() bool { return !(x.LHS != nil || x.Op != 0 || x.RHS != nil || false) } +func (PathExpression) codecSelferViaCodecgen() {} func (x *PathExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -11363,32 +11743,32 @@ func (x *PathExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *PathExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = PathExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *PathExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -11403,9 +11783,9 @@ func (x *PathExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Expr": if yyxt5 := z.Extension(x.Expr); yyxt5 != nil { z.DecExtension(&x.Expr, yyxt5) @@ -11413,13 +11793,13 @@ func (x *PathExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Expr.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *PathExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -11460,10 +11840,15 @@ func (x *PathExpression) IsCodecEmpty() bool { return !(len(x.Expr) != 0 || false) } +func (PartExpression) codecSelferViaCodecgen() {} func (x *PartExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -11499,32 +11884,32 @@ func (x *PartExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *PartExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = PartExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *PartExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -11539,9 +11924,9 @@ func (x *PartExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Part": if yyxt5 := z.Extension(x.Part); yyxt5 != nil { z.DecExtension(&x.Part, yyxt5) @@ -11549,13 +11934,13 @@ func (x *PartExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Part, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *PartExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -11596,10 +11981,15 @@ func (x *PartExpression) IsCodecEmpty() bool { return !(x.Part != nil || false) } +func (JoinExpression) codecSelferViaCodecgen() {} func (x *JoinExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -11643,32 +12033,32 @@ func (x *JoinExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *JoinExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = JoinExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *JoinExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -11683,9 +12073,9 @@ func (x *JoinExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Join": if yyxt5 := z.Extension(x.Join); yyxt5 != nil { z.DecExtension(&x.Join, yyxt5) @@ -11695,13 +12085,13 @@ func (x *JoinExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Join = (Token)(z.C.IntV(r.DecodeInt64(), 16)) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *JoinExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -11744,10 +12134,15 @@ func (x *JoinExpression) IsCodecEmpty() bool { return !(x.Join != 0 || false) } +func (SubpExpression) codecSelferViaCodecgen() {} func (x *SubpExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -11770,6 +12165,7 @@ func (x *SubpExpression) CodecEncodeSelf(e *codec1978.Encoder) { z.EncWriteArrayElem() if yyxt7 := z.Extension(x.Name); yyxt7 != nil { z.EncExtension(x.Name, yyxt7) + } else { x.Name.CodecEncodeSelf(e) } } @@ -11806,6 +12202,7 @@ func (x *SubpExpression) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyxt10 := z.Extension(x.Name); yyxt10 != nil { z.EncExtension(x.Name, yyxt10) + } else { x.Name.CodecEncodeSelf(e) } } @@ -11827,32 +12224,32 @@ func (x *SubpExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *SubpExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = SubpExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *SubpExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -11867,9 +12264,9 @@ func (x *SubpExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "What": if yyxt5 := z.Extension(x.What); yyxt5 != nil { z.DecExtension(&x.What, yyxt5) @@ -11898,13 +12295,13 @@ func (x *SubpExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Cond, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *SubpExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj10 int @@ -11986,10 +12383,15 @@ func (x *SubpExpression) IsCodecEmpty() bool { return !(len(x.What) != 0 || x.Cond != nil || false) } +func (PermExpression) codecSelferViaCodecgen() {} func (x *PermExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -12079,32 +12481,32 @@ func (x *PermExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *PermExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = PermExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *PermExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -12119,9 +12521,9 @@ func (x *PermExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Select": if yyxt5 := z.Extension(x.Select); yyxt5 != nil { z.DecExtension(&x.Select, yyxt5) @@ -12147,13 +12549,13 @@ func (x *PermExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Delete, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *PermExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj12 int @@ -12242,10 +12644,15 @@ func (x *PermExpression) IsCodecEmpty() bool { return !(x.Select != nil || x.Create != nil || x.Update != nil || x.Delete != nil || false) } +func (DataExpression) codecSelferViaCodecgen() {} func (x *DataExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -12281,32 +12688,32 @@ func (x *DataExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DataExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DataExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DataExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -12321,19 +12728,19 @@ func (x *DataExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Data": h.decSlicePtrtoItemExpression((*[]*ItemExpression)(&x.Data), d) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DataExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -12370,10 +12777,15 @@ func (x *DataExpression) IsCodecEmpty() bool { return !(len(x.Data) != 0 || false) } +func (DiffExpression) codecSelferViaCodecgen() {} func (x *DiffExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -12409,32 +12821,32 @@ func (x *DiffExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *DiffExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = DiffExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *DiffExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -12449,9 +12861,9 @@ func (x *DiffExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Data": if yyxt5 := z.Extension(x.Data); yyxt5 != nil { z.DecExtension(&x.Data, yyxt5) @@ -12459,13 +12871,13 @@ func (x *DiffExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Data, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *DiffExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -12506,10 +12918,15 @@ func (x *DiffExpression) IsCodecEmpty() bool { return !(x.Data != nil || false) } +func (MergeExpression) codecSelferViaCodecgen() {} func (x *MergeExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -12545,32 +12962,32 @@ func (x *MergeExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *MergeExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = MergeExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *MergeExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -12585,9 +13002,9 @@ func (x *MergeExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Data": if yyxt5 := z.Extension(x.Data); yyxt5 != nil { z.DecExtension(&x.Data, yyxt5) @@ -12595,13 +13012,13 @@ func (x *MergeExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecFallback(&x.Data, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *MergeExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -12642,10 +13059,15 @@ func (x *MergeExpression) IsCodecEmpty() bool { return !(x.Data != nil || false) } +func (ContentExpression) codecSelferViaCodecgen() {} func (x *ContentExpression) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -12681,32 +13103,32 @@ func (x *ContentExpression) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *ContentExpression) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = ContentExpression{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *ContentExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -12721,9 +13143,9 @@ func (x *ContentExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "Data": if yyxt5 := z.Extension(x.Data); yyxt5 != nil { z.DecExtension(&x.Data, yyxt5) @@ -12731,13 +13153,13 @@ func (x *ContentExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) z.DecFallback(&x.Data, true) } default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *ContentExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -12778,8 +13200,9 @@ func (x *ContentExpression) IsCodecEmpty() bool { return !(x.Data != nil || false) } +func (Params) codecSelferViaCodecgen() {} func (x Params) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -12790,16 +13213,21 @@ func (x Params) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Params) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decParams((*Params)(x), d) } +func (Param) codecSelferViaCodecgen() {} func (x *Param) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -12827,32 +13255,32 @@ func (x *Param) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Param) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Param{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Param) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -12867,19 +13295,19 @@ func (x *Param) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "VA": - x.VA = (string)(string(r.DecodeStringAsBytes())) + x.VA = (string)(z.DecStringZC(r.DecodeStringAsBytes())) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Param) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj5 int @@ -12896,7 +13324,7 @@ func (x *Param) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.VA = (string)(string(r.DecodeStringAsBytes())) + x.VA = (string)(z.DecStringZC(r.DecodeStringAsBytes())) for { yyj5++ if yyhl5 { @@ -12916,8 +13344,9 @@ func (x *Param) IsCodecEmpty() bool { return !(x.VA != "" || false) } +func (Idents) codecSelferViaCodecgen() {} func (x Idents) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -12928,16 +13357,21 @@ func (x Idents) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Idents) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decIdents((*Idents)(x), d) } +func (Ident) codecSelferViaCodecgen() {} func (x *Ident) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -12965,32 +13399,32 @@ func (x *Ident) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Ident) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Ident{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Ident) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -13005,19 +13439,19 @@ func (x *Ident) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "VA": - x.VA = (string)(string(r.DecodeStringAsBytes())) + x.VA = (string)(z.DecStringZC(r.DecodeStringAsBytes())) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Ident) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj5 int @@ -13034,7 +13468,7 @@ func (x *Ident) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.VA = (string)(string(r.DecodeStringAsBytes())) + x.VA = (string)(z.DecStringZC(r.DecodeStringAsBytes())) for { yyj5++ if yyhl5 { @@ -13054,8 +13488,9 @@ func (x *Ident) IsCodecEmpty() bool { return !(x.VA != "" || false) } +func (Values) codecSelferViaCodecgen() {} func (x Values) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -13066,16 +13501,21 @@ func (x Values) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Values) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decValues((*Values)(x), d) } +func (Value) codecSelferViaCodecgen() {} func (x *Value) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -13103,32 +13543,32 @@ func (x *Value) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Value) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Value{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Value) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -13143,19 +13583,19 @@ func (x *Value) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "VA": - x.VA = (string)(string(r.DecodeStringAsBytes())) + x.VA = (string)(z.DecStringZC(r.DecodeStringAsBytes())) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Value) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj5 int @@ -13172,7 +13612,7 @@ func (x *Value) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.VA = (string)(string(r.DecodeStringAsBytes())) + x.VA = (string)(z.DecStringZC(r.DecodeStringAsBytes())) for { yyj5++ if yyhl5 { @@ -13192,8 +13632,9 @@ func (x *Value) IsCodecEmpty() bool { return !(x.VA != "" || false) } +func (Regexs) codecSelferViaCodecgen() {} func (x Regexs) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -13204,16 +13645,21 @@ func (x Regexs) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Regexs) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decRegexs((*Regexs)(x), d) } +func (Regex) codecSelferViaCodecgen() {} func (x *Regex) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -13241,32 +13687,32 @@ func (x *Regex) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Regex) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Regex{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Regex) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -13281,19 +13727,19 @@ func (x *Regex) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "VA": - x.VA = (string)(string(r.DecodeStringAsBytes())) + x.VA = (string)(z.DecStringZC(r.DecodeStringAsBytes())) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Regex) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj5 int @@ -13310,7 +13756,7 @@ func (x *Regex) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.VA = (string)(string(r.DecodeStringAsBytes())) + x.VA = (string)(z.DecStringZC(r.DecodeStringAsBytes())) for { yyj5++ if yyhl5 { @@ -13330,8 +13776,9 @@ func (x *Regex) IsCodecEmpty() bool { return !(x.VA != "" || false) } +func (Tables) codecSelferViaCodecgen() {} func (x Tables) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -13342,16 +13789,21 @@ func (x Tables) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Tables) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decTables((*Tables)(x), d) } +func (Table) codecSelferViaCodecgen() {} func (x *Table) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -13379,32 +13831,32 @@ func (x *Table) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Table) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Table{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Table) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -13419,19 +13871,19 @@ func (x *Table) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "TB": - x.TB = (string)(string(r.DecodeStringAsBytes())) + x.TB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Table) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj5 int @@ -13448,7 +13900,7 @@ func (x *Table) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.TB = (string)(string(r.DecodeStringAsBytes())) + x.TB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) for { yyj5++ if yyhl5 { @@ -13468,8 +13920,9 @@ func (x *Table) IsCodecEmpty() bool { return !(x.TB != "" || false) } +func (Batchs) codecSelferViaCodecgen() {} func (x Batchs) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -13480,16 +13933,21 @@ func (x Batchs) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Batchs) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decBatchs((*Batchs)(x), d) } +func (Batch) codecSelferViaCodecgen() {} func (x *Batch) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -13535,32 +13993,32 @@ func (x *Batch) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Batch) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Batch{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Batch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -13575,21 +14033,21 @@ func (x *Batch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "TB": - x.TB = (string)(string(r.DecodeStringAsBytes())) + x.TB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "BA": h.decSlicePtrtoThing((*[]*Thing)(&x.BA), d) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Batch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj7 int @@ -13606,7 +14064,7 @@ func (x *Batch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.TB = (string)(string(r.DecodeStringAsBytes())) + x.TB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj7++ if yyhl7 { yyb7 = yyj7 > l @@ -13638,8 +14096,9 @@ func (x *Batch) IsCodecEmpty() bool { return !(x.TB != "" || len(x.BA) != 0 || false) } +func (Models) codecSelferViaCodecgen() {} func (x Models) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -13650,16 +14109,21 @@ func (x Models) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Models) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decModels((*Models)(x), d) } +func (Model) codecSelferViaCodecgen() {} func (x *Model) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -13717,32 +14181,32 @@ func (x *Model) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Model) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Model{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Model) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -13757,11 +14221,11 @@ func (x *Model) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "TB": - x.TB = (string)(string(r.DecodeStringAsBytes())) + x.TB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "MIN": x.MIN = (float64)(r.DecodeFloat64()) case "INC": @@ -13769,13 +14233,13 @@ func (x *Model) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { case "MAX": x.MAX = (float64)(r.DecodeFloat64()) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Model) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj8 int @@ -13792,7 +14256,7 @@ func (x *Model) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.TB = (string)(string(r.DecodeStringAsBytes())) + x.TB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj8++ if yyhl8 { yyb8 = yyj8 > l @@ -13848,8 +14312,9 @@ func (x *Model) IsCodecEmpty() bool { return !(x.TB != "" || x.MIN != 0 || x.INC != 0 || x.MAX != 0 || false) } +func (Things) codecSelferViaCodecgen() {} func (x Things) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -13860,16 +14325,21 @@ func (x Things) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Things) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decThings((*Things)(x), d) } +func (Thing) codecSelferViaCodecgen() {} func (x *Thing) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -13911,32 +14381,32 @@ func (x *Thing) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Thing) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Thing{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Thing) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -13951,21 +14421,21 @@ func (x *Thing) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "TB": - x.TB = (string)(string(r.DecodeStringAsBytes())) + x.TB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) case "ID": z.DecFallback(&x.ID, true) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Thing) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj7 int @@ -13982,7 +14452,7 @@ func (x *Thing) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.TB = (string)(string(r.DecodeStringAsBytes())) + x.TB = (string)(z.DecStringZC(r.DecodeStringAsBytes())) yyj7++ if yyhl7 { yyb7 = yyj7 > l @@ -14014,8 +14484,9 @@ func (x *Thing) IsCodecEmpty() bool { return !(x.TB != "" || x.ID != nil || false) } +func (Points) codecSelferViaCodecgen() {} func (x Points) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -14026,16 +14497,21 @@ func (x Points) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Points) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decPoints((*Points)(x), d) } +func (Point) codecSelferViaCodecgen() {} func (x *Point) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -14048,21 +14524,13 @@ func (x *Point) CodecEncodeSelf(e *codec1978.Encoder) { if yyr2 || yy2arr2 { z.EncWriteArrayStart(2) z.EncWriteArrayElem() - r.EncodeFloat64(float64(x.LA)) - z.EncWriteArrayElem() r.EncodeFloat64(float64(x.LO)) + z.EncWriteArrayElem() + r.EncodeFloat64(float64(x.LA)) z.EncWriteArrayEnd() } else { z.EncWriteMapStart(2) z.EncWriteMapElemKey() - if z.IsJSONHandle() { - z.WriteStr("\"LA\"") - } else { - r.EncodeString(`LA`) - } - z.EncWriteMapElemValue() - r.EncodeFloat64(float64(x.LA)) - z.EncWriteMapElemKey() if z.IsJSONHandle() { z.WriteStr("\"LO\"") } else { @@ -14070,6 +14538,14 @@ func (x *Point) CodecEncodeSelf(e *codec1978.Encoder) { } z.EncWriteMapElemValue() r.EncodeFloat64(float64(x.LO)) + z.EncWriteMapElemKey() + if z.IsJSONHandle() { + z.WriteStr("\"LA\"") + } else { + r.EncodeString(`LA`) + } + z.EncWriteMapElemValue() + r.EncodeFloat64(float64(x.LA)) z.EncWriteMapEnd() } } @@ -14077,32 +14553,32 @@ func (x *Point) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Point) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Point{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Point) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -14117,21 +14593,21 @@ func (x *Point) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { - case "LA": - x.LA = (float64)(r.DecodeFloat64()) + switch string(yys3) { case "LO": x.LO = (float64)(r.DecodeFloat64()) + case "LA": + x.LA = (float64)(r.DecodeFloat64()) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Point) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -14148,7 +14624,7 @@ func (x *Point) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.LA = (float64)(r.DecodeFloat64()) + x.LO = (float64)(r.DecodeFloat64()) yyj6++ if yyhl6 { yyb6 = yyj6 > l @@ -14160,7 +14636,7 @@ func (x *Point) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { return } z.DecReadArrayElem() - x.LO = (float64)(r.DecodeFloat64()) + x.LA = (float64)(r.DecodeFloat64()) for { yyj6++ if yyhl6 { @@ -14177,11 +14653,12 @@ func (x *Point) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } func (x *Point) IsCodecEmpty() bool { - return !(x.LA != 0 || x.LO != 0 || false) + return !(x.LO != 0 || x.LA != 0 || false) } +func (Circles) codecSelferViaCodecgen() {} func (x Circles) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -14192,16 +14669,21 @@ func (x Circles) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Circles) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decCircles((*Circles)(x), d) } +func (Circle) codecSelferViaCodecgen() {} func (x *Circle) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -14261,32 +14743,32 @@ func (x *Circle) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Circle) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Circle{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Circle) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -14301,9 +14783,9 @@ func (x *Circle) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "CE": if r.TryNil() { if x.CE != nil { // remove the if-true @@ -14322,13 +14804,13 @@ func (x *Circle) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { case "RA": x.RA = (float64)(r.DecodeFloat64()) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Circle) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj7 int @@ -14390,8 +14872,9 @@ func (x *Circle) IsCodecEmpty() bool { return !(x.RA != 0 || false) } +func (Polygons) codecSelferViaCodecgen() {} func (x Polygons) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if x == nil { @@ -14402,16 +14885,21 @@ func (x Polygons) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Polygons) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r h.decPolygons((*Polygons)(x), d) } +func (Polygon) codecSelferViaCodecgen() {} func (x *Polygon) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r + if z.EncBasicHandle().CheckCircularRef { + z.EncEncode(x) + return + } if x == nil { r.EncodeNil() } else { @@ -14451,32 +14939,32 @@ func (x *Polygon) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *Polygon) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r yyct2 := r.ContainerType() - if yyct2 == codecSelferValueTypeNil2132 { + if yyct2 == codecSelferValueTypeNil6263 { *(x) = Polygon{} - } else if yyct2 == codecSelferValueTypeMap2132 { + } else if yyct2 == codecSelferValueTypeMap6263 { yyl2 := z.DecReadMapStart() if yyl2 == 0 { } else { x.codecDecodeSelfFromMap(yyl2, d) } z.DecReadMapEnd() - } else if yyct2 == codecSelferValueTypeArray2132 { + } else if yyct2 == codecSelferValueTypeArray6263 { yyl2 := z.DecReadArrayStart() if yyl2 != 0 { x.codecDecodeSelfFromArray(yyl2, d) } z.DecReadArrayEnd() } else { - panic(errCodecSelferOnlyMapOrArrayEncodeToStruct2132) + panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6263) } } func (x *Polygon) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyhl3 bool = l >= 0 @@ -14491,19 +14979,19 @@ func (x *Polygon) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecReadMapElemKey() - yys3 := z.StringView(r.DecodeStringAsBytes()) + yys3 := r.DecodeStringAsBytes() z.DecReadMapElemValue() - switch yys3 { + switch string(yys3) { case "PS": h.decSlicePtrtoPoint((*[]*Point)(&x.PS), d) default: - z.DecStructFieldNotFound(-1, yys3) + z.DecStructFieldNotFound(-1, string(yys3)) } // end switch yys3 } // end for yyj3 } func (x *Polygon) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer2132 + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r var yyj6 int @@ -14540,8 +15028,8 @@ func (x *Polygon) IsCodecEmpty() bool { return !(len(x.PS) != 0 || false) } -func (x codecSelfer2132) encStatements(v Statements, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encStatements(v Statements, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -14549,23 +15037,23 @@ func (x codecSelfer2132) encStatements(v Statements, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - z.EncFallback(yyv1) + z.EncFallback(v[yyv1]) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decStatements(v *Statements, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decStatements(v *Statements, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -14645,8 +15133,8 @@ func (x codecSelfer2132) decStatements(v *Statements, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encExprs(v Exprs, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encExprs(v Exprs, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -14654,23 +15142,23 @@ func (x codecSelfer2132) encExprs(v Exprs, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - z.EncFallback(yyv1) + z.EncFallback(v[yyv1]) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decExprs(v *Exprs, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decExprs(v *Exprs, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -14750,8 +15238,8 @@ func (x codecSelfer2132) decExprs(v *Exprs, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encFields(v Fields, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encFields(v Fields, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -14759,23 +15247,23 @@ func (x codecSelfer2132) encFields(v Fields, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decFields(v *Fields, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decFields(v *Fields, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -14862,8 +15350,8 @@ func (x codecSelfer2132) decFields(v *Fields, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encGroups(v Groups, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encGroups(v Groups, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -14871,23 +15359,23 @@ func (x codecSelfer2132) encGroups(v Groups, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decGroups(v *Groups, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decGroups(v *Groups, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -14974,8 +15462,8 @@ func (x codecSelfer2132) decGroups(v *Groups, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encOrders(v Orders, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encOrders(v Orders, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -14983,23 +15471,23 @@ func (x codecSelfer2132) encOrders(v Orders, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decOrders(v *Orders, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decOrders(v *Orders, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -15086,8 +15574,8 @@ func (x codecSelfer2132) decOrders(v *Orders, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encFetchs(v Fetchs, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encFetchs(v Fetchs, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -15095,23 +15583,23 @@ func (x codecSelfer2132) encFetchs(v Fetchs, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decFetchs(v *Fetchs, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decFetchs(v *Fetchs, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -15198,8 +15686,8 @@ func (x codecSelfer2132) decFetchs(v *Fetchs, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encSliceExpr(v []Expr, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encSliceExpr(v []Expr, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -15207,23 +15695,23 @@ func (x codecSelfer2132) encSliceExpr(v []Expr, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - z.EncFallback(yyv1) + z.EncFallback(v[yyv1]) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decSliceExpr(v *[]Expr, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decSliceExpr(v *[]Expr, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -15303,8 +15791,8 @@ func (x codecSelfer2132) decSliceExpr(v *[]Expr, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encSlicePtrtoItemExpression(v []*ItemExpression, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encSlicePtrtoItemExpression(v []*ItemExpression, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -15312,23 +15800,23 @@ func (x codecSelfer2132) encSlicePtrtoItemExpression(v []*ItemExpression, e *cod return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decSlicePtrtoItemExpression(v *[]*ItemExpression, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decSlicePtrtoItemExpression(v *[]*ItemExpression, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -15415,8 +15903,8 @@ func (x codecSelfer2132) decSlicePtrtoItemExpression(v *[]*ItemExpression, d *co } } -func (x codecSelfer2132) encParams(v Params, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encParams(v Params, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -15424,23 +15912,23 @@ func (x codecSelfer2132) encParams(v Params, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decParams(v *Params, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decParams(v *Params, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -15527,8 +16015,8 @@ func (x codecSelfer2132) decParams(v *Params, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encIdents(v Idents, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encIdents(v Idents, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -15536,23 +16024,23 @@ func (x codecSelfer2132) encIdents(v Idents, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decIdents(v *Idents, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decIdents(v *Idents, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -15639,8 +16127,8 @@ func (x codecSelfer2132) decIdents(v *Idents, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encValues(v Values, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encValues(v Values, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -15648,23 +16136,23 @@ func (x codecSelfer2132) encValues(v Values, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decValues(v *Values, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decValues(v *Values, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -15751,8 +16239,8 @@ func (x codecSelfer2132) decValues(v *Values, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encRegexs(v Regexs, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encRegexs(v Regexs, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -15760,23 +16248,23 @@ func (x codecSelfer2132) encRegexs(v Regexs, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decRegexs(v *Regexs, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decRegexs(v *Regexs, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -15863,8 +16351,8 @@ func (x codecSelfer2132) decRegexs(v *Regexs, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encTables(v Tables, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encTables(v Tables, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -15872,23 +16360,23 @@ func (x codecSelfer2132) encTables(v Tables, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decTables(v *Tables, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decTables(v *Tables, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -15975,8 +16463,8 @@ func (x codecSelfer2132) decTables(v *Tables, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encBatchs(v Batchs, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encBatchs(v Batchs, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -15984,23 +16472,23 @@ func (x codecSelfer2132) encBatchs(v Batchs, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decBatchs(v *Batchs, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decBatchs(v *Batchs, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -16087,8 +16575,8 @@ func (x codecSelfer2132) decBatchs(v *Batchs, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encSlicePtrtoThing(v []*Thing, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encSlicePtrtoThing(v []*Thing, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -16096,23 +16584,23 @@ func (x codecSelfer2132) encSlicePtrtoThing(v []*Thing, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decSlicePtrtoThing(v *[]*Thing, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decSlicePtrtoThing(v *[]*Thing, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -16199,8 +16687,8 @@ func (x codecSelfer2132) decSlicePtrtoThing(v *[]*Thing, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encModels(v Models, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encModels(v Models, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -16208,23 +16696,23 @@ func (x codecSelfer2132) encModels(v Models, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decModels(v *Models, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decModels(v *Models, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -16311,8 +16799,8 @@ func (x codecSelfer2132) decModels(v *Models, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encThings(v Things, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encThings(v Things, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -16320,23 +16808,23 @@ func (x codecSelfer2132) encThings(v Things, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decThings(v *Things, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decThings(v *Things, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -16423,8 +16911,8 @@ func (x codecSelfer2132) decThings(v *Things, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encPoints(v Points, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encPoints(v Points, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -16432,23 +16920,23 @@ func (x codecSelfer2132) encPoints(v Points, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decPoints(v *Points, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decPoints(v *Points, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -16535,8 +17023,8 @@ func (x codecSelfer2132) decPoints(v *Points, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encCircles(v Circles, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encCircles(v Circles, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -16544,23 +17032,23 @@ func (x codecSelfer2132) encCircles(v Circles, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decCircles(v *Circles, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decCircles(v *Circles, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -16647,8 +17135,8 @@ func (x codecSelfer2132) decCircles(v *Circles, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encPolygons(v Polygons, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encPolygons(v Polygons, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -16656,23 +17144,23 @@ func (x codecSelfer2132) encPolygons(v Polygons, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decPolygons(v *Polygons, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decPolygons(v *Polygons, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r @@ -16759,8 +17247,8 @@ func (x codecSelfer2132) decPolygons(v *Polygons, d *codec1978.Decoder) { } } -func (x codecSelfer2132) encSlicePtrtoPoint(v []*Point, e *codec1978.Encoder) { - var h codecSelfer2132 +func (x codecSelfer6263) encSlicePtrtoPoint(v []*Point, e *codec1978.Encoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Encoder(e) _, _, _ = h, z, r if v == nil { @@ -16768,23 +17256,23 @@ func (x codecSelfer2132) encSlicePtrtoPoint(v []*Point, e *codec1978.Encoder) { return } z.EncWriteArrayStart(len(v)) - for _, yyv1 := range v { + for yyv1 := range v { z.EncWriteArrayElem() - if yyv1 == nil { + if v[yyv1] == nil { r.EncodeNil() } else { - if yyxt2 := z.Extension(yyv1); yyxt2 != nil { - z.EncExtension(yyv1, yyxt2) + if yyxt2 := z.Extension(v[yyv1]); yyxt2 != nil { + z.EncExtension(v[yyv1], yyxt2) } else { - yyv1.CodecEncodeSelf(e) + v[yyv1].CodecEncodeSelf(e) } } } z.EncWriteArrayEnd() } -func (x codecSelfer2132) decSlicePtrtoPoint(v *[]*Point, d *codec1978.Decoder) { - var h codecSelfer2132 +func (x codecSelfer6263) decSlicePtrtoPoint(v *[]*Point, d *codec1978.Decoder) { + var h codecSelfer6263 z, r := codec1978.GenHelper().Decoder(d) _, _, _ = h, z, r