From bc22f41f3251ab62301d6f3c42ca442d2f07922b Mon Sep 17 00:00:00 2001 From: Juanjo Alvarez Date: Fri, 22 Sep 2017 16:31:37 +0200 Subject: [PATCH 1/2] Regenerate pb files --- protocol/generated.pb.go | 11 -- protocol/generated.proto | 11 -- uast/generated.pb.go | 410 +++++++++++++++++++-------------------- uast/generated.proto | 18 +- 4 files changed, 205 insertions(+), 245 deletions(-) diff --git a/protocol/generated.pb.go b/protocol/generated.pb.go index 68e1e788..6b5a8024 100644 --- a/protocol/generated.pb.go +++ b/protocol/generated.pb.go @@ -1,14 +1,3 @@ -// Copyright 2017 Sourced Technologies SL -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. - // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: gopkg.in/bblfsh/sdk.v1/protocol/generated.proto diff --git a/protocol/generated.proto b/protocol/generated.proto index d0b548f2..593d92fa 100755 --- a/protocol/generated.proto +++ b/protocol/generated.proto @@ -1,14 +1,3 @@ -// Copyright 2017 Sourced Technologies SL -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. - syntax = "proto3"; package gopkg.in.bblfsh.sdk.v1.protocol; diff --git a/uast/generated.pb.go b/uast/generated.pb.go index f1c8cfed..1c9577b1 100644 --- a/uast/generated.pb.go +++ b/uast/generated.pb.go @@ -1,14 +1,3 @@ -// Copyright 2017 Sourced Technologies SL -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. - // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: gopkg.in/bblfsh/sdk.v1/uast/generated.proto @@ -158,6 +147,7 @@ var Role_name = map[int32]string{ 108: "WHITESPACE", 109: "INCOMPLETE", 110: "UNANNOTATED", + 111: "VISIBILITY", } var Role_value = map[string]int32{ "INVALID": 0, @@ -271,6 +261,7 @@ var Role_value = map[string]int32{ "WHITESPACE": 108, "INCOMPLETE": 109, "UNANNOTATED": 110, + "VISIBILITY": 111, } func (Role) EnumDescriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{0} } @@ -600,14 +591,51 @@ func (m *Node) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + var keykey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + keykey |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthGenerated + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey := string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey if m.Properties == nil { m.Properties = make(map[string]string) } - var mapkey string - var mapvalue string - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 + if iNdEx < postIndex { + var valuekey uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -617,80 +645,41 @@ func (m *Node) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + valuekey |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthGenerated - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var stringLenmapvalue uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapvalue |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapvalue := int(stringLenmapvalue) - if intStringLenmapvalue < 0 { - return ErrInvalidLengthGenerated + var stringLenmapvalue uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated } - postStringIndexmapvalue := iNdEx + intStringLenmapvalue - if postStringIndexmapvalue > l { + if iNdEx >= l { return io.ErrUnexpectedEOF } - mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) - iNdEx = postStringIndexmapvalue - } else { - iNdEx = entryPreIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF + b := dAtA[iNdEx] + iNdEx++ + stringLenmapvalue |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break } - iNdEx += skippy } + intStringLenmapvalue := int(stringLenmapvalue) + if intStringLenmapvalue < 0 { + return ErrInvalidLengthGenerated + } + postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue > l { + return io.ErrUnexpectedEOF + } + mapvalue := string(dAtA[iNdEx:postStringIndexmapvalue]) + iNdEx = postStringIndexmapvalue + m.Properties[mapkey] = mapvalue + } else { + var mapvalue string + m.Properties[mapkey] = mapvalue } - m.Properties[mapkey] = mapvalue iNdEx = postIndex case 3: if wireType != 2 { @@ -1118,136 +1107,137 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 2081 bytes of a gzipped FileDescriptorProto + // 2102 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x57, 0xdb, 0x92, 0xdb, 0xc6, 0x11, 0xdd, 0xfb, 0x65, 0xf6, 0xa2, 0x31, 0x6c, 0x2b, 0x34, 0x2d, 0x53, 0xb4, 0x7c, 0x89, 0x62, - 0xc5, 0xbb, 0x91, 0x9c, 0xc4, 0x8e, 0x12, 0x25, 0x19, 0x02, 0x43, 0x72, 0xb2, 0x20, 0x00, 0x0d, - 0x06, 0x7b, 0x51, 0x2e, 0x1b, 0x2c, 0x31, 0x24, 0x91, 0xc5, 0x02, 0x0c, 0x00, 0xae, 0xb4, 0xf9, - 0x02, 0x15, 0xbf, 0xc0, 0x2f, 0xac, 0x52, 0x2a, 0x7e, 0xc8, 0x57, 0xa4, 0xf2, 0x98, 0xc7, 0x7c, - 0x42, 0x4a, 0xfe, 0x81, 0xe4, 0x0f, 0x52, 0x33, 0x0d, 0xae, 0x54, 0x79, 0xb0, 0x2b, 0x6f, 0x44, - 0x77, 0xcf, 0x99, 0xee, 0x3e, 0xdd, 0x3d, 0x4d, 0x74, 0x6f, 0x98, 0x8d, 0xcf, 0x87, 0x7b, 0x71, - 0xba, 0x7f, 0x76, 0x96, 0x0c, 0x8a, 0xd1, 0x7e, 0x11, 0x9d, 0xef, 0x5d, 0xde, 0xdf, 0x9f, 0x84, - 0x45, 0xb9, 0x3f, 0x94, 0xa9, 0xcc, 0xc3, 0x52, 0x46, 0x7b, 0xe3, 0x3c, 0x2b, 0x33, 0xe3, 0xdd, - 0xb9, 0xf1, 0x1e, 0x18, 0xef, 0x81, 0xf1, 0x9e, 0x32, 0xae, 0x7f, 0x3a, 0x8c, 0xcb, 0xd1, 0xe4, - 0x6c, 0xaf, 0x9f, 0x5d, 0xec, 0x0f, 0xb3, 0x61, 0xb6, 0xaf, 0xcf, 0x9c, 0x4d, 0x06, 0xfa, 0x4b, - 0x7f, 0xe8, 0x5f, 0x80, 0x75, 0xe7, 0x3f, 0xcb, 0x68, 0xc5, 0xc9, 0x22, 0x69, 0x7c, 0x80, 0x76, - 0xe2, 0xb4, 0x94, 0x79, 0x1a, 0x26, 0xa7, 0xe5, 0xd5, 0x58, 0xd6, 0x16, 0x9b, 0x8b, 0x77, 0x37, - 0xf9, 0xf6, 0x5c, 0x28, 0xae, 0xc6, 0xd2, 0x78, 0x8c, 0xd0, 0x38, 0xcf, 0xc6, 0x32, 0x2f, 0x63, - 0x59, 0xd4, 0x96, 0x9a, 0xcb, 0x77, 0xb7, 0x1e, 0xdc, 0xdf, 0xfb, 0x06, 0x77, 0xf6, 0x14, 0xf6, - 0x9e, 0x77, 0x7d, 0x86, 0xa6, 0x65, 0x7e, 0xc5, 0x5f, 0x03, 0x31, 0x1e, 0xa1, 0x8d, 0xfe, 0x28, - 0x4e, 0xa2, 0x5c, 0xa6, 0xb5, 0x65, 0x0d, 0xf8, 0xfe, 0xb7, 0x02, 0xf2, 0xeb, 0x23, 0xc6, 0x5b, - 0x68, 0xb5, 0xcc, 0xce, 0x65, 0x5a, 0x5b, 0xd1, 0xee, 0xc2, 0x87, 0x61, 0xa3, 0xdd, 0xa2, 0x0c, - 0xf3, 0xf2, 0x74, 0x9c, 0x15, 0x71, 0x19, 0x67, 0x69, 0x6d, 0xb5, 0xb9, 0x78, 0x77, 0xeb, 0xc1, - 0x47, 0xdf, 0x08, 0xed, 0x55, 0xc6, 0x7c, 0x47, 0x1f, 0x9e, 0x7f, 0x1a, 0x5d, 0xb4, 0x2d, 0xd3, - 0xe8, 0x15, 0xd6, 0xda, 0xff, 0x83, 0xb5, 0x25, 0xd3, 0xe8, 0x1a, 0xe9, 0x73, 0xb4, 0x9a, 0x67, - 0x89, 0x2c, 0x6a, 0xeb, 0xcd, 0xe5, 0xbb, 0xbb, 0xdf, 0x12, 0x29, 0xcf, 0x12, 0xc9, 0xc1, 0xbe, - 0xfe, 0x08, 0xdd, 0xf8, 0x9f, 0x24, 0x1a, 0x18, 0x2d, 0x9f, 0xcb, 0xab, 0x8a, 0x26, 0xf5, 0x53, - 0xe5, 0xe2, 0x32, 0x4c, 0x26, 0xb2, 0xb6, 0x04, 0xb9, 0xd0, 0x1f, 0x0f, 0x97, 0xbe, 0x58, 0x7c, - 0xb8, 0xfd, 0xfc, 0xc5, 0xed, 0x85, 0x2f, 0x5f, 0xdc, 0x5e, 0xf8, 0xf7, 0x9f, 0x6f, 0x2f, 0xdc, - 0xe1, 0x68, 0xe3, 0xda, 0xa3, 0x9b, 0x68, 0x2d, 0x1b, 0x0c, 0x0a, 0x59, 0x6a, 0xa0, 0x1d, 0x5e, - 0x7d, 0x19, 0x06, 0x5a, 0x49, 0xe2, 0x14, 0xa0, 0x76, 0xb8, 0xfe, 0xad, 0x6e, 0xec, 0x67, 0x49, - 0x6d, 0x59, 0x8b, 0xd4, 0xcf, 0x87, 0x1b, 0xcf, 0x2b, 0xcc, 0x4f, 0xfe, 0x76, 0x13, 0xad, 0x28, - 0x87, 0x8d, 0x1a, 0x5a, 0x67, 0xce, 0x21, 0xb1, 0x99, 0x85, 0x17, 0xea, 0x5b, 0xd3, 0x59, 0x73, - 0x9d, 0xa5, 0x97, 0x61, 0x12, 0x47, 0x46, 0x03, 0x21, 0x66, 0x51, 0x47, 0xb0, 0x36, 0xa3, 0x1c, - 0x2f, 0xd6, 0x77, 0xa7, 0xb3, 0x26, 0x62, 0x91, 0x4c, 0xcb, 0x78, 0x10, 0xcb, 0xdc, 0xb8, 0x85, - 0x36, 0x1f, 0x07, 0xc4, 0x56, 0x6a, 0x0b, 0x2f, 0xd5, 0x77, 0xa6, 0xb3, 0xe6, 0xe6, 0xe3, 0x49, - 0x98, 0x28, 0x6d, 0x64, 0xd4, 0xd1, 0x86, 0xeb, 0x51, 0x4e, 0x84, 0xcb, 0xf1, 0x72, 0x7d, 0x7b, - 0x3a, 0x6b, 0x6e, 0xb8, 0x63, 0xd5, 0x16, 0x59, 0xae, 0x82, 0x68, 0x31, 0x87, 0xf0, 0x13, 0xbc, - 0x52, 0x47, 0xd3, 0x59, 0x73, 0xad, 0x15, 0xa7, 0x61, 0xae, 0x13, 0x12, 0x68, 0xf1, 0x6a, 0x7d, - 0x73, 0x3a, 0x6b, 0xae, 0x06, 0x5a, 0x6a, 0xa0, 0x15, 0x9b, 0xb6, 0x05, 0x5e, 0xab, 0x6f, 0x4c, - 0x67, 0xcd, 0x15, 0x5b, 0x0e, 0x4a, 0x65, 0xc9, 0x59, 0xa7, 0x2b, 0xf0, 0x3a, 0x58, 0xf2, 0x78, - 0x38, 0xd2, 0x52, 0xe6, 0xb4, 0xd9, 0x31, 0xde, 0x00, 0x29, 0x4b, 0x07, 0xf1, 0x33, 0x15, 0xa1, - 0xe7, 0xfa, 0x42, 0xc9, 0x37, 0x21, 0x42, 0x2f, 0x2b, 0xca, 0x4a, 0xd3, 0x62, 0xe2, 0x88, 0xf9, - 0x14, 0x23, 0xd0, 0xb4, 0xe2, 0xf2, 0x69, 0x5c, 0xe8, 0xac, 0xb4, 0x5c, 0xd7, 0xa6, 0xc4, 0xc1, - 0x5b, 0x95, 0x26, 0xcb, 0x12, 0x19, 0xa6, 0x2a, 0xae, 0xc0, 0xf1, 0x59, 0xc7, 0xa1, 0x16, 0xde, - 0x86, 0xb8, 0x82, 0xb4, 0x88, 0x87, 0xa9, 0x8c, 0x8c, 0xf7, 0x10, 0x52, 0x9e, 0x9e, 0xfa, 0x5d, - 0xd6, 0x16, 0x78, 0x07, 0x52, 0xa2, 0xfc, 0xf5, 0x47, 0xf1, 0xa0, 0x34, 0x6e, 0xa3, 0x2d, 0xed, - 0x74, 0xa5, 0xdf, 0x85, 0x8c, 0x6a, 0xd7, 0xc1, 0x60, 0x17, 0x2d, 0xb9, 0x1c, 0xdf, 0xa8, 0xaf, - 0x4d, 0x67, 0xcd, 0x25, 0x37, 0x57, 0x04, 0x1e, 0xbb, 0x1c, 0xe3, 0xfa, 0xfa, 0x74, 0xd6, 0x5c, - 0x3e, 0xce, 0xb4, 0x84, 0x38, 0x16, 0x7e, 0x03, 0x24, 0x24, 0xd5, 0x2c, 0xd1, 0x63, 0x8f, 0x53, - 0xdf, 0x67, 0xae, 0x83, 0x0d, 0xc0, 0xa4, 0xcf, 0xc6, 0xb9, 0x2c, 0x0a, 0x55, 0x30, 0xb7, 0xd0, - 0xa6, 0x2f, 0x88, 0xa0, 0x3d, 0xea, 0x08, 0xfc, 0x26, 0xb8, 0xe4, 0x97, 0x61, 0x29, 0x2f, 0x64, - 0xaa, 0x33, 0x46, 0x15, 0x89, 0xf8, 0x2d, 0xc8, 0x18, 0xfd, 0xe3, 0x24, 0x4c, 0xd4, 0x2d, 0x8e, - 0x2b, 0xf0, 0xdb, 0x70, 0x8b, 0x93, 0x95, 0xc6, 0xbb, 0x68, 0xd3, 0xa6, 0xbe, 0x7f, 0x2a, 0xba, - 0xc4, 0xc1, 0x37, 0x21, 0x6c, 0x5b, 0x16, 0x85, 0x18, 0x85, 0xa9, 0x71, 0x0f, 0x19, 0xd7, 0xca, - 0x53, 0x97, 0x9f, 0x02, 0xe2, 0x77, 0xea, 0x6f, 0x4e, 0x67, 0xcd, 0x1b, 0x73, 0x2b, 0x37, 0x07, - 0xec, 0xf7, 0xd1, 0x76, 0x87, 0x53, 0x22, 0x28, 0x07, 0xb0, 0x5a, 0xfd, 0xc6, 0x74, 0xd6, 0xdc, - 0xea, 0xe4, 0x32, 0x2c, 0x65, 0xae, 0xf1, 0xee, 0xa3, 0xb7, 0x5f, 0x37, 0x79, 0x05, 0xf9, 0x4e, - 0xfd, 0xe6, 0x74, 0xd6, 0x34, 0x5e, 0xb3, 0x9d, 0xa3, 0xde, 0x42, 0x9b, 0x50, 0xab, 0x26, 0xb1, - 0x71, 0x1d, 0xa2, 0x84, 0x52, 0xed, 0x87, 0x89, 0xe2, 0xcc, 0x74, 0x1d, 0x41, 0x98, 0xe3, 0xe3, - 0x77, 0xc1, 0x79, 0x33, 0x4b, 0xcb, 0x30, 0x4e, 0x0b, 0x7d, 0xd2, 0x31, 0x39, 0xe4, 0xe7, 0x56, - 0x75, 0x32, 0xed, 0xe7, 0x90, 0x9f, 0x5b, 0x68, 0xd3, 0xa2, 0x73, 0xed, 0x7b, 0xa0, 0xb5, 0xe4, - 0x5c, 0x5b, 0x47, 0x1b, 0x0e, 0xed, 0x10, 0xc1, 0x0e, 0x29, 0x6e, 0x00, 0xae, 0x23, 0x87, 0x61, - 0x19, 0x5f, 0x4a, 0xa5, 0xf3, 0x5c, 0x9f, 0x69, 0xdd, 0x6d, 0xd0, 0x41, 0x13, 0x5f, 0x4a, 0xa3, - 0x89, 0xb6, 0x2c, 0xca, 0x69, 0x9b, 0x72, 0xea, 0x98, 0x14, 0x37, 0x21, 0x05, 0x96, 0xcc, 0xe5, - 0x40, 0xe6, 0x32, 0xed, 0x4b, 0x95, 0x25, 0x41, 0x0e, 0xe8, 0x29, 0xb1, 0x2c, 0x45, 0x2d, 0x7e, - 0x1f, 0x4c, 0x44, 0x78, 0x2e, 0x49, 0x14, 0x29, 0x6e, 0x55, 0x5b, 0xb4, 0x99, 0x4d, 0xf1, 0x1d, - 0x68, 0x8b, 0x76, 0x9c, 0xe8, 0x8e, 0x27, 0x96, 0x85, 0x3f, 0xa8, 0xca, 0x23, 0x8a, 0x34, 0xfd, - 0x41, 0xcb, 0x17, 0x9c, 0x98, 0x02, 0x7f, 0x58, 0xd1, 0x3f, 0x39, 0x2b, 0xca, 0x3c, 0xec, 0xeb, - 0x00, 0x7a, 0x81, 0x2d, 0x98, 0x67, 0x9f, 0xe0, 0x8f, 0xc0, 0xc9, 0xde, 0x24, 0x29, 0xe3, 0x71, - 0x72, 0xa5, 0x9a, 0xd4, 0x62, 0x87, 0xcc, 0xa2, 0xf8, 0x63, 0x68, 0x52, 0x2b, 0xbe, 0x8c, 0x23, - 0xa9, 0xe4, 0x3d, 0xd7, 0x0a, 0x6c, 0x17, 0x7f, 0x17, 0xe4, 0xbd, 0x2c, 0x9a, 0x24, 0x99, 0x6e, - 0x33, 0x62, 0x1e, 0x90, 0x0e, 0xc5, 0x77, 0xab, 0x36, 0x0b, 0xfb, 0xe7, 0xe1, 0xb0, 0x0a, 0xd7, - 0xb4, 0x09, 0x27, 0x42, 0xd5, 0xe8, 0xf7, 0xe6, 0xe1, 0xf6, 0x93, 0x30, 0x0f, 0xe7, 0x53, 0x8d, - 0xf5, 0x3c, 0x97, 0x0b, 0xfc, 0x09, 0x60, 0xb2, 0x8b, 0x71, 0x96, 0x6b, 0xff, 0x3c, 0x22, 0xba, - 0x0e, 0xe9, 0x51, 0x7c, 0xaf, 0x4a, 0x62, 0x58, 0x8e, 0xd2, 0xf0, 0x42, 0xaa, 0xd2, 0x25, 0x36, - 0x23, 0x3e, 0xfe, 0x3e, 0x94, 0x2e, 0x49, 0xe2, 0xb0, 0x50, 0x27, 0xda, 0x81, 0x63, 0xea, 0x8b, - 0x3e, 0x85, 0x13, 0xed, 0x49, 0xda, 0xd7, 0xb7, 0x18, 0x68, 0xa5, 0xe5, 0x5a, 0x27, 0x78, 0x0f, - 0x32, 0xd6, 0xca, 0x22, 0x3d, 0x5c, 0x34, 0xfa, 0x3e, 0xc8, 0x1c, 0x85, 0x5c, 0x47, 0x1b, 0x9c, - 0x9a, 0x94, 0x1d, 0x52, 0x8e, 0x7f, 0x00, 0x18, 0x5c, 0xf6, 0x65, 0x7c, 0x29, 0x73, 0xa5, 0x23, - 0xbc, 0x13, 0xe8, 0x7a, 0xb8, 0x0f, 0x3a, 0x92, 0x0f, 0x27, 0xf3, 0x66, 0x3a, 0x24, 0x76, 0x40, - 0xf1, 0x03, 0xf0, 0xe8, 0x50, 0xcd, 0x73, 0xd5, 0x3a, 0x84, 0x77, 0xfc, 0x53, 0x9b, 0xf9, 0x02, - 0x7f, 0x76, 0x7d, 0xa4, 0xb0, 0xe3, 0x42, 0x8f, 0xed, 0x16, 0xf1, 0x29, 0xfe, 0x61, 0xe5, 0x52, - 0x58, 0x48, 0x3d, 0x77, 0x7b, 0x9e, 0xad, 0x6b, 0xce, 0xc7, 0x3f, 0xaa, 0xe6, 0xee, 0xc5, 0x38, - 0xd1, 0x45, 0xa7, 0x43, 0x64, 0x8e, 0x2f, 0x88, 0x2a, 0x9d, 0x1f, 0x03, 0x1e, 0x4b, 0x8b, 0x32, - 0x54, 0x75, 0x53, 0x43, 0xeb, 0x7e, 0xd0, 0x12, 0x27, 0x1e, 0xc5, 0x9f, 0x03, 0x09, 0xfe, 0xe4, - 0x4c, 0xad, 0x07, 0x0a, 0xd5, 0x0f, 0x5a, 0x73, 0x86, 0xbe, 0x00, 0x54, 0x7f, 0x72, 0x36, 0xae, - 0x48, 0x9a, 0xd3, 0x4a, 0xf1, 0x4f, 0x5e, 0xa3, 0x55, 0xcb, 0xdb, 0x9c, 0x51, 0xc7, 0xc2, 0x0f, - 0x41, 0xde, 0xce, 0x63, 0x99, 0x46, 0x2a, 0xd8, 0x23, 0x97, 0xdb, 0x16, 0xfe, 0x29, 0x04, 0x7b, - 0x94, 0xe5, 0x49, 0xa4, 0x26, 0x18, 0x6b, 0xe3, 0x9f, 0xc1, 0x04, 0x63, 0x03, 0x55, 0x7e, 0xa6, - 0xeb, 0x58, 0x4c, 0xf3, 0xf1, 0x08, 0xca, 0xcf, 0xcc, 0xd2, 0x28, 0x9e, 0x13, 0x22, 0xba, 0xd4, - 0xc1, 0x3f, 0x87, 0xe8, 0xc5, 0x48, 0x6a, 0x19, 0xb5, 0x7d, 0x8a, 0x7f, 0x01, 0x32, 0x9a, 0x14, - 0xda, 0x07, 0xff, 0x88, 0x09, 0xb3, 0x8b, 0x7f, 0x09, 0x3e, 0xf8, 0x4f, 0xe3, 0xb2, 0x3f, 0x52, - 0xb6, 0xa6, 0xca, 0x1e, 0x01, 0x5b, 0x33, 0x84, 0xc9, 0x6d, 0xd1, 0x36, 0x09, 0x6c, 0x81, 0x5b, - 0x90, 0x01, 0x4b, 0x0e, 0xc2, 0x49, 0x52, 0xaa, 0xe6, 0x68, 0xbb, 0x1c, 0x9b, 0xd0, 0x1c, 0xed, - 0x2c, 0x37, 0x3e, 0x46, 0xbb, 0xcc, 0x61, 0x82, 0x11, 0x9b, 0x3d, 0x81, 0xda, 0xb4, 0xea, 0xc6, - 0x74, 0xd6, 0xdc, 0x65, 0x69, 0x5c, 0xc6, 0x61, 0x12, 0xff, 0xe9, 0xba, 0x3c, 0x03, 0xcf, 0x22, - 0x82, 0x62, 0x0a, 0xf7, 0x07, 0xe3, 0x28, 0x2c, 0x75, 0xa1, 0x30, 0x51, 0xbd, 0x71, 0xed, 0x8a, - 0x89, 0xb2, 0x7a, 0xe3, 0x54, 0x7e, 0xba, 0xaa, 0x3f, 0x3b, 0x55, 0x7e, 0x46, 0xaa, 0x41, 0xdf, - 0x41, 0x1b, 0x96, 0x7b, 0x0a, 0x8a, 0x6e, 0xe5, 0x5e, 0x06, 0xaa, 0xb7, 0xd0, 0x6a, 0x8b, 0x53, - 0x72, 0x80, 0x19, 0x1c, 0x68, 0xe5, 0x32, 0x3c, 0x9f, 0x8f, 0x2e, 0xe6, 0x04, 0x14, 0xff, 0xea, - 0xd5, 0xe8, 0x8a, 0xd3, 0x89, 0x54, 0xe1, 0x77, 0x5c, 0xe1, 0xe2, 0x03, 0x08, 0xbf, 0xa3, 0x76, - 0x4d, 0x85, 0x62, 0xbb, 0xe6, 0x01, 0xb6, 0x2b, 0x94, 0x24, 0xeb, 0x9f, 0x2b, 0xa9, 0x6f, 0xba, - 0x1e, 0xc5, 0x3d, 0x90, 0xfa, 0xfd, 0x6c, 0xac, 0xd3, 0xca, 0xa9, 0x08, 0xb8, 0x83, 0x1d, 0x08, - 0x8b, 0xcb, 0x72, 0x92, 0xa7, 0x2a, 0x51, 0x82, 0x9f, 0x60, 0x17, 0x12, 0x25, 0xe0, 0x61, 0x36, - 0x89, 0xca, 0xbf, 0x07, 0xe7, 0xcd, 0x50, 0xa5, 0xbf, 0x86, 0xd6, 0xdb, 0xcc, 0x21, 0xb6, 0x7d, - 0x82, 0x1f, 0x43, 0x2c, 0xed, 0x38, 0x0d, 0x93, 0x44, 0xdb, 0x8b, 0x2e, 0x77, 0x8f, 0x30, 0x07, - 0x7b, 0x31, 0xca, 0xb3, 0xa7, 0xea, 0x3e, 0xe2, 0xfb, 0x94, 0x0b, 0xec, 0xc3, 0x7d, 0xa4, 0x28, - 0x64, 0x5e, 0x02, 0x8d, 0xb6, 0x8d, 0xc5, 0x9c, 0xc6, 0x24, 0x51, 0xb6, 0x4a, 0x46, 0x29, 0x0e, - 0xc0, 0x56, 0x49, 0xa5, 0x2e, 0x63, 0x18, 0xab, 0xae, 0x43, 0x6c, 0x7c, 0x08, 0x65, 0x3c, 0xdf, - 0x8e, 0xc2, 0x44, 0xf7, 0xb3, 0xeb, 0x7a, 0xf8, 0xa8, 0xea, 0xe7, 0x2c, 0x1b, 0x2b, 0x3f, 0x6d, - 0xcd, 0x93, 0x8d, 0x8f, 0xc1, 0x4f, 0x3b, 0x56, 0x34, 0x69, 0xeb, 0xd6, 0x89, 0xa0, 0xf8, 0xa4, - 0x6a, 0xbf, 0xab, 0x52, 0xaa, 0x57, 0x5a, 0xc9, 0x4e, 0x7d, 0xc1, 0x99, 0xd3, 0xc1, 0x4f, 0xe0, - 0x0a, 0xa5, 0xf2, 0xcb, 0x3c, 0x4e, 0x87, 0xba, 0xa6, 0xbb, 0x44, 0x0d, 0x54, 0xca, 0xf1, 0xaf, - 0xab, 0x9a, 0x1e, 0x85, 0x6a, 0xa0, 0xca, 0x5c, 0x6f, 0x2b, 0xaa, 0xd3, 0x7f, 0x53, 0x6d, 0x2b, - 0xaa, 0xcb, 0x31, 0x5a, 0xee, 0x11, 0x0f, 0xff, 0x16, 0x12, 0xda, 0x0b, 0xc7, 0xda, 0xcd, 0xc0, - 0xb6, 0xf1, 0xef, 0x2a, 0x37, 0x27, 0x10, 0xb2, 0x13, 0xf4, 0x5a, 0x94, 0xe3, 0x53, 0x08, 0xd9, - 0x99, 0x5c, 0x9c, 0xc9, 0x1c, 0x68, 0xea, 0xd0, 0x63, 0x0f, 0xff, 0x7e, 0x4e, 0xd3, 0x50, 0x3e, - 0x1b, 0x2b, 0x54, 0x9f, 0x0a, 0x1c, 0x02, 0xaa, 0x2f, 0x4b, 0xdd, 0x27, 0xe0, 0xf5, 0x59, 0xd5, - 0x27, 0xe0, 0xb1, 0xa2, 0x23, 0xf0, 0x6c, 0x8a, 0xfb, 0x15, 0x1d, 0x93, 0x71, 0xa2, 0xcb, 0x47, - 0x0f, 0x8a, 0xa8, 0xea, 0x3e, 0x35, 0x25, 0xd4, 0x3e, 0xe0, 0x28, 0xf2, 0x65, 0xb5, 0x0f, 0xcc, - 0x57, 0xd7, 0x03, 0x7a, 0x82, 0x07, 0x70, 0xd3, 0x81, 0xbc, 0x52, 0x39, 0xf0, 0x38, 0xeb, 0xc1, - 0xf3, 0x36, 0x84, 0x1c, 0x78, 0x79, 0x7c, 0x01, 0xef, 0x5b, 0x03, 0x21, 0xe2, 0xab, 0x1d, 0x49, - 0x8f, 0xc9, 0x11, 0x64, 0x90, 0x14, 0x6a, 0x4b, 0xd2, 0x83, 0x52, 0xf7, 0x3d, 0xf3, 0x71, 0x3c, - 0xef, 0xfb, 0xb8, 0x50, 0x24, 0x99, 0x6e, 0x4f, 0x1f, 0xf8, 0x03, 0x90, 0x64, 0x66, 0x17, 0xda, - 0xfa, 0x43, 0xb4, 0x63, 0xb9, 0xa6, 0x1e, 0xb9, 0xd0, 0xa4, 0xe7, 0xf5, 0x37, 0xa6, 0xb3, 0xe6, - 0x8e, 0x95, 0xf5, 0xf5, 0xdc, 0x85, 0x1e, 0x6d, 0x20, 0x74, 0xd4, 0x65, 0x82, 0xfa, 0x1e, 0x31, - 0x29, 0x4e, 0xe0, 0xce, 0xa3, 0x51, 0x5c, 0xca, 0x62, 0x1c, 0xf6, 0x61, 0xaa, 0x3a, 0xa6, 0xab, - 0x06, 0xab, 0xa0, 0xf8, 0xa2, 0x9a, 0xaa, 0x69, 0x3f, 0x53, 0x83, 0xb5, 0xd4, 0x8f, 0x54, 0xe0, - 0x10, 0xc7, 0x71, 0xd5, 0xb2, 0x64, 0xe1, 0x14, 0x1e, 0xa9, 0x20, 0x0d, 0xd3, 0x34, 0x53, 0xeb, - 0x52, 0x54, 0xdf, 0x7e, 0xfe, 0x97, 0xc6, 0xc2, 0x5f, 0xbf, 0x6a, 0x2c, 0xfc, 0xfd, 0xab, 0xc6, - 0x42, 0xab, 0xfe, 0x8f, 0x97, 0x8d, 0xc5, 0x7f, 0xbe, 0x6c, 0x2c, 0xfe, 0xeb, 0x65, 0x63, 0xe1, - 0xcb, 0xaf, 0x1b, 0x0b, 0x2f, 0xbe, 0x6e, 0x2c, 0x3e, 0x59, 0x51, 0xff, 0x04, 0xce, 0xd6, 0xf4, - 0x7f, 0xb5, 0xcf, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xcb, 0x48, 0x4f, 0xb1, 0x26, 0x0e, 0x00, - 0x00, + 0xc5, 0xbb, 0x91, 0x9c, 0xc4, 0x8e, 0x12, 0x25, 0x19, 0x02, 0x43, 0x72, 0xb2, 0x20, 0x40, 0x0d, + 0x06, 0x7b, 0x51, 0x2e, 0x1b, 0x2c, 0x39, 0x24, 0x27, 0x8b, 0x05, 0x18, 0x00, 0x5c, 0x69, 0xf3, + 0x05, 0x2a, 0x7e, 0x81, 0x5f, 0x58, 0xa5, 0x54, 0xfc, 0x90, 0xcf, 0xc8, 0x63, 0x1e, 0xf3, 0x05, + 0xa9, 0x94, 0xfc, 0x03, 0xc9, 0x1f, 0xa4, 0x66, 0x1a, 0x5c, 0xa9, 0xf2, 0x60, 0x57, 0xde, 0x88, + 0xee, 0x9e, 0x33, 0xdd, 0x7d, 0xba, 0x7b, 0x9a, 0xe8, 0xde, 0x30, 0x1d, 0x9f, 0x0f, 0xf7, 0x54, + 0xb2, 0x7f, 0x76, 0x16, 0x0f, 0xf2, 0xd1, 0x7e, 0xde, 0x3f, 0xdf, 0xbb, 0xbc, 0xbf, 0x3f, 0x89, + 0xf2, 0x62, 0x7f, 0x28, 0x13, 0x99, 0x45, 0x85, 0xec, 0xef, 0x8d, 0xb3, 0xb4, 0x48, 0xad, 0x77, + 0xe7, 0xc6, 0x7b, 0x60, 0xbc, 0x07, 0xc6, 0x7b, 0xda, 0xb8, 0xfa, 0xe9, 0x50, 0x15, 0xa3, 0xc9, + 0xd9, 0x5e, 0x2f, 0xbd, 0xd8, 0x1f, 0xa6, 0xc3, 0x74, 0xdf, 0x9c, 0x39, 0x9b, 0x0c, 0xcc, 0x97, + 0xf9, 0x30, 0xbf, 0x00, 0xeb, 0xce, 0x7f, 0x96, 0xd1, 0x8a, 0x97, 0xf6, 0xa5, 0xf5, 0x01, 0xda, + 0x51, 0x49, 0x21, 0xb3, 0x24, 0x8a, 0x4f, 0x8b, 0xab, 0xb1, 0xac, 0x2c, 0xd6, 0x17, 0xef, 0x6e, + 0xf2, 0xed, 0xb9, 0x50, 0x5c, 0x8d, 0xa5, 0xf5, 0x18, 0xa1, 0x71, 0x96, 0x8e, 0x65, 0x56, 0x28, + 0x99, 0x57, 0x96, 0xea, 0xcb, 0x77, 0xb7, 0x1e, 0xdc, 0xdf, 0xfb, 0x06, 0x77, 0xf6, 0x34, 0xf6, + 0x5e, 0xf7, 0xfa, 0x0c, 0x4d, 0x8a, 0xec, 0x8a, 0xbf, 0x06, 0x62, 0x3d, 0x42, 0x1b, 0xbd, 0x91, + 0x8a, 0xfb, 0x99, 0x4c, 0x2a, 0xcb, 0x06, 0xf0, 0xfd, 0x6f, 0x05, 0xe4, 0xd7, 0x47, 0xac, 0xb7, + 0xd0, 0x6a, 0x91, 0x9e, 0xcb, 0xa4, 0xb2, 0x62, 0xdc, 0x85, 0x0f, 0xcb, 0x45, 0xbb, 0x79, 0x11, + 0x65, 0xc5, 0xe9, 0x38, 0xcd, 0x55, 0xa1, 0xd2, 0xa4, 0xb2, 0x5a, 0x5f, 0xbc, 0xbb, 0xf5, 0xe0, + 0xa3, 0x6f, 0x84, 0xee, 0x96, 0xc6, 0x7c, 0xc7, 0x1c, 0x9e, 0x7f, 0x5a, 0x6d, 0xb4, 0x2d, 0x93, + 0xfe, 0x2b, 0xac, 0xb5, 0xff, 0x07, 0x6b, 0x4b, 0x26, 0xfd, 0x6b, 0xa4, 0xcf, 0xd1, 0x6a, 0x96, + 0xc6, 0x32, 0xaf, 0xac, 0xd7, 0x97, 0xef, 0xee, 0x7e, 0x4b, 0xa4, 0x3c, 0x8d, 0x25, 0x07, 0xfb, + 0xea, 0x23, 0x74, 0xe3, 0x7f, 0x92, 0x68, 0x61, 0xb4, 0x7c, 0x2e, 0xaf, 0x4a, 0x9a, 0xf4, 0x4f, + 0x9d, 0x8b, 0xcb, 0x28, 0x9e, 0xc8, 0xca, 0x12, 0xe4, 0xc2, 0x7c, 0x3c, 0x5c, 0xfa, 0x62, 0xf1, + 0xe1, 0xf6, 0xf3, 0x17, 0xb7, 0x17, 0xbe, 0x7c, 0x71, 0x7b, 0xe1, 0xdf, 0x7f, 0xbe, 0xbd, 0x70, + 0x87, 0xa3, 0x8d, 0x6b, 0x8f, 0x6e, 0xa2, 0xb5, 0x74, 0x30, 0xc8, 0x65, 0x61, 0x80, 0x76, 0x78, + 0xf9, 0x65, 0x59, 0x68, 0x25, 0x56, 0x09, 0x40, 0xed, 0x70, 0xf3, 0x5b, 0xdf, 0xd8, 0x4b, 0xe3, + 0xca, 0xb2, 0x11, 0xe9, 0x9f, 0x0f, 0x37, 0x9e, 0x97, 0x98, 0x9f, 0xfc, 0xf3, 0x26, 0x5a, 0xd1, + 0x0e, 0x5b, 0x15, 0xb4, 0xce, 0xbc, 0x43, 0xe2, 0x32, 0x07, 0x2f, 0x54, 0xb7, 0xa6, 0xb3, 0xfa, + 0x3a, 0x4b, 0x2e, 0xa3, 0x58, 0xf5, 0xad, 0x1a, 0x42, 0xcc, 0xa1, 0x9e, 0x60, 0x4d, 0x46, 0x39, + 0x5e, 0xac, 0xee, 0x4e, 0x67, 0x75, 0xc4, 0xfa, 0x32, 0x29, 0xd4, 0x40, 0xc9, 0xcc, 0xba, 0x85, + 0x36, 0x1f, 0x87, 0xc4, 0xd5, 0x6a, 0x07, 0x2f, 0x55, 0x77, 0xa6, 0xb3, 0xfa, 0xe6, 0xe3, 0x49, + 0x14, 0x6b, 0x6d, 0xdf, 0xaa, 0xa2, 0x0d, 0xbf, 0x4b, 0x39, 0x11, 0x3e, 0xc7, 0xcb, 0xd5, 0xed, + 0xe9, 0xac, 0xbe, 0xe1, 0x8f, 0x75, 0x5b, 0xa4, 0x99, 0x0e, 0xa2, 0xc1, 0x3c, 0xc2, 0x4f, 0xf0, + 0x4a, 0x15, 0x4d, 0x67, 0xf5, 0xb5, 0x86, 0x4a, 0xa2, 0xcc, 0x24, 0x24, 0x34, 0xe2, 0xd5, 0xea, + 0xe6, 0x74, 0x56, 0x5f, 0x0d, 0x8d, 0xd4, 0x42, 0x2b, 0x2e, 0x6d, 0x0a, 0xbc, 0x56, 0xdd, 0x98, + 0xce, 0xea, 0x2b, 0xae, 0x1c, 0x14, 0xda, 0x92, 0xb3, 0x56, 0x5b, 0xe0, 0x75, 0xb0, 0xe4, 0x6a, + 0x38, 0x32, 0x52, 0xe6, 0x35, 0xd9, 0x31, 0xde, 0x00, 0x29, 0x4b, 0x06, 0xea, 0x99, 0x8e, 0xb0, + 0xeb, 0x07, 0x42, 0xcb, 0x37, 0x21, 0xc2, 0x6e, 0x9a, 0x17, 0xa5, 0xa6, 0xc1, 0xc4, 0x11, 0x0b, + 0x28, 0x46, 0xa0, 0x69, 0xa8, 0xe2, 0xa9, 0xca, 0x4d, 0x56, 0x1a, 0xbe, 0xef, 0x52, 0xe2, 0xe1, + 0xad, 0x52, 0x93, 0xa6, 0xb1, 0x8c, 0x12, 0x1d, 0x57, 0xe8, 0x05, 0xac, 0xe5, 0x51, 0x07, 0x6f, + 0x43, 0x5c, 0x61, 0x92, 0xab, 0x61, 0x22, 0xfb, 0xd6, 0x7b, 0x08, 0x69, 0x4f, 0x4f, 0x83, 0x36, + 0x6b, 0x0a, 0xbc, 0x03, 0x29, 0xd1, 0xfe, 0x06, 0x23, 0x35, 0x28, 0xac, 0xdb, 0x68, 0xcb, 0x38, + 0x5d, 0xea, 0x77, 0x21, 0xa3, 0xc6, 0x75, 0x30, 0xd8, 0x45, 0x4b, 0x3e, 0xc7, 0x37, 0xaa, 0x6b, + 0xd3, 0x59, 0x7d, 0xc9, 0xcf, 0x34, 0x81, 0xc7, 0x3e, 0xc7, 0xb8, 0xba, 0x3e, 0x9d, 0xd5, 0x97, + 0x8f, 0x53, 0x23, 0x21, 0x9e, 0x83, 0xdf, 0x00, 0x09, 0x49, 0x0c, 0x4b, 0xf4, 0xb8, 0xcb, 0x69, + 0x10, 0x30, 0xdf, 0xc3, 0x16, 0x60, 0xd2, 0x67, 0xe3, 0x4c, 0xe6, 0xb9, 0x2e, 0x98, 0x5b, 0x68, + 0x33, 0x10, 0x44, 0xd0, 0x0e, 0xf5, 0x04, 0x7e, 0x13, 0x5c, 0x0a, 0x8a, 0xa8, 0x90, 0x17, 0x32, + 0x31, 0x19, 0xa3, 0x9a, 0x44, 0xfc, 0x16, 0x64, 0x8c, 0xfe, 0x71, 0x12, 0xc5, 0xfa, 0x16, 0xcf, + 0x17, 0xf8, 0x6d, 0xb8, 0xc5, 0x4b, 0x0b, 0xeb, 0x5d, 0xb4, 0xe9, 0xd2, 0x20, 0x38, 0x15, 0x6d, + 0xe2, 0xe1, 0x9b, 0x10, 0xb6, 0x2b, 0xf3, 0x5c, 0x8c, 0xa2, 0xc4, 0xba, 0x87, 0xac, 0x6b, 0xe5, + 0xa9, 0xcf, 0x4f, 0x01, 0xf1, 0x3b, 0xd5, 0x37, 0xa7, 0xb3, 0xfa, 0x8d, 0xb9, 0x95, 0x9f, 0x01, + 0xf6, 0xfb, 0x68, 0xbb, 0xc5, 0x29, 0x11, 0x94, 0x03, 0x58, 0xa5, 0x7a, 0x63, 0x3a, 0xab, 0x6f, + 0xb5, 0x32, 0x19, 0x15, 0x32, 0x33, 0x78, 0xf7, 0xd1, 0xdb, 0xaf, 0x9b, 0xbc, 0x82, 0x7c, 0xa7, + 0x7a, 0x73, 0x3a, 0xab, 0x5b, 0xaf, 0xd9, 0xce, 0x51, 0x6f, 0xa1, 0x4d, 0xa8, 0x55, 0x9b, 0xb8, + 0xb8, 0x0a, 0x51, 0x42, 0xa9, 0xf6, 0xa2, 0x58, 0x73, 0x66, 0xfb, 0x9e, 0x20, 0xcc, 0x0b, 0xf0, + 0xbb, 0xe0, 0xbc, 0x9d, 0x26, 0x45, 0xa4, 0x92, 0xdc, 0x9c, 0xf4, 0x6c, 0x0e, 0xf9, 0xb9, 0x55, + 0x9e, 0x4c, 0x7a, 0x19, 0xe4, 0xe7, 0x16, 0xda, 0x74, 0xe8, 0x5c, 0xfb, 0x1e, 0x68, 0x1d, 0x39, + 0xd7, 0x56, 0xd1, 0x86, 0x47, 0x5b, 0x44, 0xb0, 0x43, 0x8a, 0x6b, 0x80, 0xeb, 0xc9, 0x61, 0x54, + 0xa8, 0x4b, 0xa9, 0x75, 0x5d, 0x3f, 0x60, 0x46, 0x77, 0x1b, 0x74, 0xd0, 0xc4, 0x97, 0xd2, 0xaa, + 0xa3, 0x2d, 0x87, 0x72, 0xda, 0xa4, 0x9c, 0x7a, 0x36, 0xc5, 0x75, 0x48, 0x81, 0x23, 0x33, 0x39, + 0x90, 0x99, 0x4c, 0x7a, 0x52, 0x67, 0x49, 0x90, 0x03, 0x7a, 0x4a, 0x1c, 0x47, 0x53, 0x8b, 0xdf, + 0x07, 0x13, 0x11, 0x9d, 0x4b, 0xd2, 0xef, 0x6b, 0x6e, 0x75, 0x5b, 0x34, 0x99, 0x4b, 0xf1, 0x1d, + 0x68, 0x8b, 0xa6, 0x8a, 0x4d, 0xc7, 0x13, 0xc7, 0xc1, 0x1f, 0x94, 0xe5, 0xd1, 0xef, 0x1b, 0xfa, + 0xc3, 0x46, 0x20, 0x38, 0xb1, 0x05, 0xfe, 0xb0, 0xa4, 0x7f, 0x72, 0x96, 0x17, 0x59, 0xd4, 0x33, + 0x01, 0x74, 0x42, 0x57, 0xb0, 0xae, 0x7b, 0x82, 0x3f, 0x02, 0x27, 0x3b, 0x93, 0xb8, 0x50, 0xe3, + 0xf8, 0x4a, 0x37, 0xa9, 0xc3, 0x0e, 0x99, 0x43, 0xf1, 0xc7, 0xd0, 0xa4, 0x8e, 0xba, 0x54, 0x7d, + 0xa9, 0xe5, 0x1d, 0xdf, 0x09, 0x5d, 0x1f, 0x7f, 0x17, 0xe4, 0x9d, 0xb4, 0x3f, 0x89, 0x53, 0xd3, + 0x66, 0xc4, 0x3e, 0x20, 0x2d, 0x8a, 0xef, 0x96, 0x6d, 0x16, 0xf5, 0xce, 0xa3, 0x61, 0x19, 0xae, + 0xed, 0x12, 0x4e, 0x84, 0xae, 0xd1, 0xef, 0xcd, 0xc3, 0xed, 0xc5, 0x51, 0x16, 0xcd, 0xa7, 0x1a, + 0xeb, 0x74, 0x7d, 0x2e, 0xf0, 0x27, 0x80, 0xc9, 0x2e, 0xc6, 0x69, 0x66, 0xfc, 0xeb, 0x12, 0xd1, + 0xf6, 0x48, 0x87, 0xe2, 0x7b, 0x65, 0x12, 0xa3, 0x62, 0x94, 0x44, 0x17, 0x52, 0x97, 0x2e, 0x71, + 0x19, 0x09, 0xf0, 0xf7, 0xa1, 0x74, 0x49, 0xac, 0xa2, 0x5c, 0x9f, 0x68, 0x86, 0x9e, 0x6d, 0x2e, + 0xfa, 0x14, 0x4e, 0x34, 0x27, 0x49, 0xcf, 0xdc, 0x62, 0xa1, 0x95, 0x86, 0xef, 0x9c, 0xe0, 0x3d, + 0xc8, 0x58, 0x23, 0xed, 0x9b, 0xe1, 0x62, 0xd0, 0xf7, 0x41, 0xe6, 0x69, 0xe4, 0x2a, 0xda, 0xe0, + 0xd4, 0xa6, 0xec, 0x90, 0x72, 0xfc, 0x03, 0xc0, 0xe0, 0xb2, 0x27, 0xd5, 0xa5, 0xcc, 0xb4, 0x8e, + 0xf0, 0x56, 0x68, 0xea, 0xe1, 0x3e, 0xe8, 0x48, 0x36, 0x9c, 0xcc, 0x9b, 0xe9, 0x90, 0xb8, 0x21, + 0xc5, 0x0f, 0xc0, 0xa3, 0x43, 0x3d, 0xcf, 0x75, 0xeb, 0x10, 0xde, 0x0a, 0x4e, 0x5d, 0x16, 0x08, + 0xfc, 0xd9, 0xf5, 0x91, 0xdc, 0x55, 0xb9, 0x19, 0xdb, 0x0d, 0x12, 0x50, 0xfc, 0xc3, 0xd2, 0xa5, + 0x28, 0x97, 0x66, 0xee, 0x76, 0xba, 0xae, 0xa9, 0xb9, 0x00, 0xff, 0xa8, 0x9c, 0xbb, 0x17, 0xe3, + 0xd8, 0x14, 0x9d, 0x09, 0x91, 0x79, 0x81, 0x20, 0xba, 0x74, 0x7e, 0x0c, 0x78, 0x2c, 0xc9, 0x8b, + 0x48, 0xd7, 0x4d, 0x05, 0xad, 0x07, 0x61, 0x43, 0x9c, 0x74, 0x29, 0xfe, 0x1c, 0x48, 0x08, 0x26, + 0x67, 0x7a, 0x3d, 0xd0, 0xa8, 0x41, 0xd8, 0x98, 0x33, 0xf4, 0x05, 0xa0, 0x06, 0x93, 0xb3, 0x71, + 0x49, 0xd2, 0x9c, 0x56, 0x8a, 0x7f, 0xf2, 0x1a, 0xad, 0x46, 0xde, 0xe4, 0x8c, 0x7a, 0x0e, 0x7e, + 0x08, 0xf2, 0x66, 0xa6, 0x64, 0xd2, 0xd7, 0xc1, 0x1e, 0xf9, 0xdc, 0x75, 0xf0, 0x4f, 0x21, 0xd8, + 0xa3, 0x34, 0x8b, 0xfb, 0x7a, 0x82, 0xb1, 0x26, 0xfe, 0x19, 0x4c, 0x30, 0x36, 0xd0, 0xe5, 0x67, + 0xfb, 0x9e, 0xc3, 0x0c, 0x1f, 0x8f, 0xa0, 0xfc, 0xec, 0x34, 0xe9, 0xab, 0x39, 0x21, 0xa2, 0x4d, + 0x3d, 0xfc, 0x73, 0x88, 0x5e, 0x8c, 0xa4, 0x91, 0x51, 0x37, 0xa0, 0xf8, 0x17, 0x20, 0xa3, 0x71, + 0x6e, 0x7c, 0x08, 0x8e, 0x98, 0xb0, 0xdb, 0xf8, 0x97, 0xe0, 0x43, 0xf0, 0x54, 0x15, 0xbd, 0x91, + 0xb6, 0xb5, 0x75, 0xf6, 0x08, 0xd8, 0xda, 0x11, 0x4c, 0x6e, 0x87, 0x36, 0x49, 0xe8, 0x0a, 0xdc, + 0x80, 0x0c, 0x38, 0x72, 0x10, 0x4d, 0xe2, 0x42, 0x37, 0x47, 0xd3, 0xe7, 0xd8, 0x86, 0xe6, 0x68, + 0xa6, 0x99, 0xf5, 0x31, 0xda, 0x65, 0x1e, 0x13, 0x8c, 0xb8, 0xec, 0x09, 0xd4, 0xa6, 0x53, 0xb5, + 0xa6, 0xb3, 0xfa, 0x2e, 0x4b, 0x54, 0xa1, 0xa2, 0x58, 0xfd, 0xe9, 0xba, 0x3c, 0xc3, 0xae, 0x43, + 0x04, 0xc5, 0x14, 0xee, 0x0f, 0xc7, 0xfd, 0xa8, 0x30, 0x85, 0xc2, 0x44, 0xf9, 0xc6, 0x35, 0x4b, + 0x26, 0x8a, 0xf2, 0x8d, 0xd3, 0xf9, 0x69, 0xeb, 0xfe, 0x6c, 0x95, 0xf9, 0x19, 0xe9, 0x06, 0x7d, + 0x07, 0x6d, 0x38, 0xfe, 0x29, 0x28, 0xda, 0xa5, 0x7b, 0x29, 0xa8, 0xde, 0x42, 0xab, 0x0d, 0x4e, + 0xc9, 0x01, 0x66, 0x70, 0xa0, 0x91, 0xc9, 0xe8, 0x7c, 0x3e, 0xba, 0x98, 0x17, 0x52, 0xfc, 0xab, + 0x57, 0xa3, 0x4b, 0x25, 0x13, 0xa9, 0xc3, 0x6f, 0xf9, 0xc2, 0xc7, 0x07, 0x10, 0x7e, 0x4b, 0xef, + 0x9a, 0x1a, 0xc5, 0xf5, 0xed, 0x03, 0xec, 0x96, 0x28, 0x71, 0xda, 0x3b, 0xd7, 0xd2, 0xc0, 0xf6, + 0xbb, 0x14, 0x77, 0x40, 0x1a, 0xf4, 0xd2, 0xb1, 0x49, 0x2b, 0xa7, 0x22, 0xe4, 0x1e, 0xf6, 0x20, + 0x2c, 0x2e, 0x8b, 0x49, 0x96, 0xe8, 0x44, 0x09, 0x7e, 0x82, 0x7d, 0x48, 0x94, 0x80, 0x87, 0xd9, + 0x26, 0x3a, 0xff, 0x5d, 0x38, 0x6f, 0x47, 0x3a, 0xfd, 0x15, 0xb4, 0xde, 0x64, 0x1e, 0x71, 0xdd, + 0x13, 0xfc, 0x18, 0x62, 0x69, 0xaa, 0x24, 0x8a, 0x63, 0x63, 0x2f, 0xda, 0xdc, 0x3f, 0xc2, 0x1c, + 0xec, 0xc5, 0x28, 0x4b, 0x9f, 0xea, 0xfb, 0x48, 0x10, 0x50, 0x2e, 0x70, 0x00, 0xf7, 0x91, 0x3c, + 0x97, 0x59, 0x01, 0x34, 0xba, 0x2e, 0x16, 0x73, 0x1a, 0xe3, 0x58, 0xdb, 0x6a, 0x19, 0xa5, 0x38, + 0x04, 0x5b, 0x2d, 0x95, 0xa6, 0x8c, 0x61, 0xac, 0xfa, 0x1e, 0x71, 0xf1, 0x21, 0x94, 0xf1, 0x7c, + 0x3b, 0x8a, 0x62, 0xd3, 0xcf, 0xbe, 0xdf, 0xc5, 0x47, 0x65, 0x3f, 0xa7, 0xe9, 0x58, 0xfb, 0xe9, + 0x1a, 0x9e, 0x5c, 0x7c, 0x0c, 0x7e, 0xba, 0x4a, 0xd3, 0x64, 0xac, 0x1b, 0x27, 0x82, 0xe2, 0x93, + 0xb2, 0xfd, 0xae, 0x0a, 0xa9, 0x5f, 0x69, 0x2d, 0x3b, 0x0d, 0x04, 0x67, 0x5e, 0x0b, 0x3f, 0x81, + 0x2b, 0xb4, 0x2a, 0x28, 0x32, 0x95, 0x0c, 0x4d, 0x4d, 0xb7, 0x89, 0x1e, 0xa8, 0x94, 0xe3, 0x5f, + 0x97, 0x35, 0x3d, 0x8a, 0xf4, 0x40, 0x95, 0x99, 0xd9, 0x56, 0x74, 0xa7, 0xff, 0xa6, 0xdc, 0x56, + 0x74, 0x97, 0x63, 0xb4, 0xdc, 0x21, 0x5d, 0xfc, 0x5b, 0x48, 0x68, 0x27, 0x1a, 0x1b, 0x37, 0x43, + 0xd7, 0xc5, 0xbf, 0x2b, 0xdd, 0x9c, 0x40, 0xc8, 0x5e, 0xd8, 0x69, 0x50, 0x8e, 0x4f, 0x21, 0x64, + 0x6f, 0x72, 0x71, 0x26, 0x33, 0xa0, 0xa9, 0x45, 0x8f, 0xbb, 0xf8, 0xf7, 0x73, 0x9a, 0x86, 0xf2, + 0xd9, 0x58, 0xa3, 0x06, 0x54, 0xe0, 0x08, 0x50, 0x03, 0x59, 0x98, 0x3e, 0x01, 0xaf, 0xcf, 0xca, + 0x3e, 0x01, 0x8f, 0x35, 0x1d, 0x61, 0xd7, 0xa5, 0xb8, 0x57, 0xd2, 0x31, 0x19, 0xc7, 0xa6, 0x7c, + 0xcc, 0xa0, 0xe8, 0x97, 0xdd, 0xa7, 0xa7, 0x84, 0xde, 0x07, 0x3c, 0x4d, 0xbe, 0x2c, 0xf7, 0x81, + 0xf9, 0xea, 0x7a, 0x40, 0x4f, 0xf0, 0x00, 0x6e, 0x3a, 0x90, 0x57, 0x3a, 0x07, 0x5d, 0xce, 0x3a, + 0xf0, 0xbc, 0x0d, 0x21, 0x07, 0xdd, 0x4c, 0x5d, 0xc0, 0xfb, 0x56, 0x43, 0x88, 0x04, 0x7a, 0x47, + 0x32, 0x63, 0x72, 0x04, 0x19, 0x24, 0xb9, 0xde, 0x92, 0xcc, 0xa0, 0x34, 0x7d, 0xcf, 0x02, 0xac, + 0xe6, 0x7d, 0xaf, 0x72, 0x4d, 0x92, 0xed, 0x77, 0xcc, 0x81, 0x3f, 0x00, 0x49, 0x76, 0x7a, 0x61, + 0xac, 0x3f, 0x44, 0x3b, 0x8e, 0x6f, 0x9b, 0x91, 0x0b, 0x4d, 0x7a, 0x5e, 0x7d, 0x63, 0x3a, 0xab, + 0xef, 0x38, 0x69, 0xcf, 0xcc, 0x5d, 0xe8, 0xd1, 0x1a, 0x42, 0x47, 0x6d, 0x26, 0x68, 0xd0, 0x25, + 0x36, 0xc5, 0x31, 0xdc, 0x79, 0x34, 0x52, 0x85, 0xcc, 0xc7, 0x51, 0x0f, 0xa6, 0xaa, 0x67, 0xfb, + 0x7a, 0xb0, 0x0a, 0x8a, 0x2f, 0xca, 0xa9, 0x9a, 0xf4, 0x52, 0x3d, 0x58, 0x0b, 0xf3, 0x48, 0x85, + 0x1e, 0xf1, 0x3c, 0x5f, 0x2f, 0x4b, 0x0e, 0x4e, 0xe0, 0x91, 0x0a, 0x93, 0x28, 0x49, 0x52, 0xbd, + 0x2e, 0x99, 0x4d, 0xeb, 0x90, 0x05, 0xac, 0xc1, 0x5c, 0x26, 0x4e, 0x70, 0x0a, 0x08, 0x87, 0x2a, + 0x57, 0x67, 0x2a, 0x56, 0xc5, 0x55, 0x75, 0xfb, 0xf9, 0x5f, 0x6a, 0x0b, 0x7f, 0xfd, 0xaa, 0xb6, + 0xf0, 0xb7, 0xaf, 0x6a, 0x0b, 0x8d, 0xea, 0xdf, 0x5f, 0xd6, 0x16, 0xff, 0xf1, 0xb2, 0xb6, 0xf8, + 0xaf, 0x97, 0xb5, 0x85, 0x2f, 0xbf, 0xae, 0x2d, 0xbc, 0xf8, 0xba, 0xb6, 0xf8, 0x64, 0x45, 0xff, + 0x53, 0x38, 0x5b, 0x33, 0xff, 0xe5, 0x3e, 0xfb, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x3d, + 0x1f, 0xcd, 0x46, 0x0e, 0x00, 0x00, } diff --git a/uast/generated.proto b/uast/generated.proto index 3ddb8e54..795dbc0a 100755 --- a/uast/generated.proto +++ b/uast/generated.proto @@ -1,14 +1,3 @@ -// Copyright 2017 Sourced Technologies SL -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. - syntax = "proto3"; package gopkg.in.bblfsh.sdk.v1.uast; @@ -196,7 +185,7 @@ enum Role { // The Else node is optional. The order of Condition, Then and // Else is not defined. IF = 60 [(gogoproto.enumvalue_customname) = "If"]; - // IfCondition is a condition in an IfStatement or IfExpression. + // Condition is a condition in an IfStatement or IfExpression. CONDITION = 61 [(gogoproto.enumvalue_customname) = "Condition"]; // Then is the clause executed when the Condition is true. THEN = 62 [(gogoproto.enumvalue_customname) = "Then"]; @@ -221,6 +210,7 @@ enum Role { // Update is the assignment of a new value to a variable // (i.e. a for loop variable update.) UPDATE = 69 [(gogoproto.enumvalue_customname) = "Update"]; + // Iterator is the element that iterates over something. ITERATOR = 70 [(gogoproto.enumvalue_customname) = "Iterator"]; // While is a loop construct with a condition and a body. WHILE = 71 [(gogoproto.enumvalue_customname) = "While"]; @@ -262,7 +252,7 @@ enum Role { CALLEE = 85 [(gogoproto.enumvalue_customname) = "Callee"]; // Positional is an element which position has meaning (i.e. a positional argument in a call). POSITIONAL = 86 [(gogoproto.enumvalue_customname) = "Positional"]; - // A construct that does nothing. + // Noop is a construct that does nothing. NOOP = 87 [(gogoproto.enumvalue_customname) = "Noop"]; // Literal is a literal value. LITERAL = 88 [(gogoproto.enumvalue_customname) = "Literal"]; @@ -321,5 +311,7 @@ enum Role { // any annotations with the current version of the driver's `annotations.go` file. // Added in BIP-002. UNANNOTATED = 110 [(gogoproto.enumvalue_customname) = "Unannotated"]; + // Visibility is an access granter role, usually together with an specifier role + VISIBILITY = 111 [(gogoproto.enumvalue_customname) = "Visibility"]; } From 4426664d2a1f5f72ea0ce9fe81fbcba2fbbbab61 Mon Sep 17 00:00:00 2001 From: Juanjo Alvarez Date: Fri, 22 Sep 2017 16:49:10 +0200 Subject: [PATCH 2/2] Updated README --- README.md | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 1eb40531..5494fe63 100644 --- a/README.md +++ b/README.md @@ -87,22 +87,10 @@ $ go generate It regenerates all *[proto](https://developers.google.com/protocol-buffers/)* and *[proteus](https://github.com/src-d/proteus)* files under *[protocol/](https://github.com/bblfsh/sdk/tree/master/protocol)* and *[uast/](https://github.com/bblfsh/sdk/tree/master/uast)* directories. -These auto generated files shouldn't be edited by hand, however at the moment, you have to manually add a license header: - -``` -// Copyright 2017 Sourced Technologies SL -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. -``` - -It's necessary to modify *[protocol/generated.pb.go](https://github.com/bblfsh/sdk/blob/master/protocol/generated.pb.go)* too to change an import: +These auto generated files shouldn't be edited by hand, however at the moment, +tt's necessary to modify +*[protocol/generated.pb.go](https://github.com/bblfsh/sdk/blob/master/protocol/generated.pb.go)* +too to change an import: ```go import github_com_bblfsh_sdk_uast "github.com/bblfsh/sdk/uast"