From 05e00f2f739e1bed1744e950a90305c339d1d4c5 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期四, 13 二月 2020 20:27:06 +0800 Subject: [PATCH] re make --- base.pb.go | 136 +++++++++++++++++++++++++-------------------- 1 files changed, 75 insertions(+), 61 deletions(-) diff --git a/base.pb.go b/base.pb.go index 940f3f4..28e3465 100644 --- a/base.pb.go +++ b/base.pb.go @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package // struct for sdk type Point struct { @@ -42,7 +42,7 @@ return xxx_messageInfo_Point.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) + n, err := m.MarshalTo(b) if err != nil { return nil, err } @@ -96,7 +96,7 @@ return xxx_messageInfo_Rect.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) + n, err := m.MarshalTo(b) if err != nil { return nil, err } @@ -168,7 +168,7 @@ func (m *Point) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) + n, err := m.MarshalTo(dAtA) if err != nil { return nil, err } @@ -176,32 +176,27 @@ } func (m *Point) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Point) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) + var i int _ = i var l int _ = l - if m.Y != 0 { - i = encodeVarintBase(dAtA, i, uint64(m.Y)) - i-- - dAtA[i] = 0x10 - } if m.X != 0 { - i = encodeVarintBase(dAtA, i, uint64(m.X)) - i-- dAtA[i] = 0x8 + i++ + i = encodeVarintBase(dAtA, i, uint64(m.X)) } - return len(dAtA) - i, nil + if m.Y != 0 { + dAtA[i] = 0x10 + i++ + i = encodeVarintBase(dAtA, i, uint64(m.Y)) + } + return i, nil } func (m *Rect) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) + n, err := m.MarshalTo(dAtA) if err != nil { return nil, err } @@ -209,48 +204,41 @@ } func (m *Rect) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Rect) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) + var i int _ = i var l int _ = l - if m.Bottom != 0 { - i = encodeVarintBase(dAtA, i, uint64(m.Bottom)) - i-- - dAtA[i] = 0x20 - } - if m.Right != 0 { - i = encodeVarintBase(dAtA, i, uint64(m.Right)) - i-- - dAtA[i] = 0x18 + if m.Left != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintBase(dAtA, i, uint64(m.Left)) } if m.Top != 0 { - i = encodeVarintBase(dAtA, i, uint64(m.Top)) - i-- dAtA[i] = 0x10 + i++ + i = encodeVarintBase(dAtA, i, uint64(m.Top)) } - if m.Left != 0 { - i = encodeVarintBase(dAtA, i, uint64(m.Left)) - i-- - dAtA[i] = 0x8 + if m.Right != 0 { + dAtA[i] = 0x18 + i++ + i = encodeVarintBase(dAtA, i, uint64(m.Right)) } - return len(dAtA) - i, nil + if m.Bottom != 0 { + dAtA[i] = 0x20 + i++ + i = encodeVarintBase(dAtA, i, uint64(m.Bottom)) + } + return i, nil } func encodeVarintBase(dAtA []byte, offset int, v uint64) int { - offset -= sovBase(v) - base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return base + return offset + 1 } func (m *Point) Size() (n int) { if m == nil { @@ -517,7 +505,6 @@ func skipBase(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 - depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -549,8 +536,10 @@ break } } + return iNdEx, nil case 1: iNdEx += 8 + return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -571,30 +560,55 @@ return 0, ErrInvalidLengthBase } iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupBase + if iNdEx < 0 { + return 0, ErrInvalidLengthBase } - depth-- + return iNdEx, nil + case 3: + for { + var innerWire uint64 + var start int = iNdEx + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowBase + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + innerWire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + innerWireType := int(innerWire & 0x7) + if innerWireType == 4 { + break + } + next, err := skipBase(dAtA[start:]) + if err != nil { + return 0, err + } + iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthBase + } + } + return iNdEx, nil + case 4: + return iNdEx, nil case 5: iNdEx += 4 + return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } - if iNdEx < 0 { - return 0, ErrInvalidLengthBase - } - if depth == 0 { - return iNdEx, nil - } } - return 0, io.ErrUnexpectedEOF + panic("unreachable") } var ( - ErrInvalidLengthBase = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowBase = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupBase = fmt.Errorf("proto: unexpected end of group") + ErrInvalidLengthBase = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowBase = fmt.Errorf("proto: integer overflow") ) -- Gitblit v1.8.0