vendor: Update everything
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4620
This commit is contained in:
Jakob Borg
78
vendor/github.com/gogo/protobuf/protoc-gen-gogo/generator/generator.go
generated
vendored
78
vendor/github.com/gogo/protobuf/protoc-gen-gogo/generator/generator.go
generated
vendored
@@ -715,6 +715,12 @@ var pkgNamesInUse = make(map[string][]*FileDescriptor)
|
||||
// Pkg is the candidate name. If f is nil, it's a builtin package like "proto" and
|
||||
// has no file descriptor.
|
||||
func RegisterUniquePackageName(pkg string, f *FileDescriptor) string {
|
||||
if f == nil {
|
||||
// For builtin and standard lib packages, try to use only
|
||||
// the last component of the package path.
|
||||
pkg = pkg[strings.LastIndex(pkg, "/")+1:]
|
||||
}
|
||||
|
||||
// Convert dots to underscores before finding a unique alias.
|
||||
pkg = strings.Map(badToUnderscore, pkg)
|
||||
|
||||
@@ -2210,6 +2216,15 @@ func (g *Generator) generateMessage(message *Descriptor) {
|
||||
}
|
||||
g.Out()
|
||||
g.P("}")
|
||||
} else {
|
||||
// Even if the type does not need to be generated, we need to iterate
|
||||
// over all its fields to be able to mark as used any imported types
|
||||
// used by those fields.
|
||||
for _, field := range message.Field {
|
||||
if !gogoproto.IsStdTime(field) && !gogoproto.IsStdDuration(field) {
|
||||
g.RecordTypeUse(field.GetTypeName())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Update g.Buffer to list valid oneof types.
|
||||
@@ -2328,7 +2343,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
|
||||
case typename == "string":
|
||||
def = strconv.Quote(def)
|
||||
case typename == "[]byte":
|
||||
def = "[]byte(" + strconv.Quote(def) + ")"
|
||||
def = "[]byte(" + strconv.Quote(unescape(def)) + ")"
|
||||
kind = "var "
|
||||
case def == "inf", def == "-inf", def == "nan":
|
||||
// These names are known to, and defined by, the protocol language.
|
||||
@@ -3046,6 +3061,67 @@ func (g *Generator) generateMessage(message *Descriptor) {
|
||||
}
|
||||
}
|
||||
|
||||
var escapeChars = [256]byte{
|
||||
'a': '\a', 'b': '\b', 'f': '\f', 'n': '\n', 'r': '\r', 't': '\t', 'v': '\v', '\\': '\\', '"': '"', '\'': '\'', '?': '?',
|
||||
}
|
||||
|
||||
// unescape reverses the "C" escaping that protoc does for default values of bytes fields.
|
||||
// It is best effort in that it effectively ignores malformed input. Seemingly invalid escape
|
||||
// sequences are conveyed, unmodified, into the decoded result.
|
||||
func unescape(s string) string {
|
||||
// NB: Sadly, we can't use strconv.Unquote because protoc will escape both
|
||||
// single and double quotes, but strconv.Unquote only allows one or the
|
||||
// other (based on actual surrounding quotes of its input argument).
|
||||
|
||||
var out []byte
|
||||
for len(s) > 0 {
|
||||
// regular character, or too short to be valid escape
|
||||
if s[0] != '\\' || len(s) < 2 {
|
||||
out = append(out, s[0])
|
||||
s = s[1:]
|
||||
} else if c := escapeChars[s[1]]; c != 0 {
|
||||
// escape sequence
|
||||
out = append(out, c)
|
||||
s = s[2:]
|
||||
} else if s[1] == 'x' || s[1] == 'X' {
|
||||
// hex escape, e.g. "\x80
|
||||
if len(s) < 4 {
|
||||
// too short to be valid
|
||||
out = append(out, s[:2]...)
|
||||
s = s[2:]
|
||||
continue
|
||||
}
|
||||
v, err := strconv.ParseUint(s[2:4], 16, 8)
|
||||
if err != nil {
|
||||
out = append(out, s[:4]...)
|
||||
} else {
|
||||
out = append(out, byte(v))
|
||||
}
|
||||
s = s[4:]
|
||||
} else if '0' <= s[1] && s[1] <= '7' {
|
||||
// octal escape, can vary from 1 to 3 octal digits; e.g., "\0" "\40" or "\164"
|
||||
// so consume up to 2 more bytes or up to end-of-string
|
||||
n := len(s[1:]) - len(strings.TrimLeft(s[1:], "01234567"))
|
||||
if n > 3 {
|
||||
n = 3
|
||||
}
|
||||
v, err := strconv.ParseUint(s[1:1+n], 8, 8)
|
||||
if err != nil {
|
||||
out = append(out, s[:1+n]...)
|
||||
} else {
|
||||
out = append(out, byte(v))
|
||||
}
|
||||
s = s[1+n:]
|
||||
} else {
|
||||
// bad escape, just propagate the slash as-is
|
||||
out = append(out, s[0])
|
||||
s = s[1:]
|
||||
}
|
||||
}
|
||||
|
||||
return string(out)
|
||||
}
|
||||
|
||||
func (g *Generator) generateExtension(ext *ExtensionDescriptor) {
|
||||
ccTypeName := ext.DescName()
|
||||
|
||||
|
||||
85
vendor/github.com/gogo/protobuf/protoc-gen-gogo/generator/name_test.go
generated
vendored
85
vendor/github.com/gogo/protobuf/protoc-gen-gogo/generator/name_test.go
generated
vendored
@@ -1,85 +0,0 @@
|
||||
// Go support for Protocol Buffers - Google's data interchange format
|
||||
//
|
||||
// Copyright 2013 The Go Authors. All rights reserved.
|
||||
// https://github.com/golang/protobuf
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
package generator
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
|
||||
)
|
||||
|
||||
func TestCamelCase(t *testing.T) {
|
||||
tests := []struct {
|
||||
in, want string
|
||||
}{
|
||||
{"one", "One"},
|
||||
{"one_two", "OneTwo"},
|
||||
{"_my_field_name_2", "XMyFieldName_2"},
|
||||
{"Something_Capped", "Something_Capped"},
|
||||
{"my_Name", "My_Name"},
|
||||
{"OneTwo", "OneTwo"},
|
||||
{"_", "X"},
|
||||
{"_a_", "XA_"},
|
||||
}
|
||||
for _, tc := range tests {
|
||||
if got := CamelCase(tc.in); got != tc.want {
|
||||
t.Errorf("CamelCase(%q) = %q, want %q", tc.in, got, tc.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestGoPackageOption(t *testing.T) {
|
||||
tests := []struct {
|
||||
in string
|
||||
impPath, pkg string
|
||||
ok bool
|
||||
}{
|
||||
{"", "", "", false},
|
||||
{"foo", "", "foo", true},
|
||||
{"github.com/golang/bar", "github.com/golang/bar", "bar", true},
|
||||
{"github.com/golang/bar;baz", "github.com/golang/bar", "baz", true},
|
||||
}
|
||||
for _, tc := range tests {
|
||||
d := &FileDescriptor{
|
||||
FileDescriptorProto: &descriptor.FileDescriptorProto{
|
||||
Options: &descriptor.FileOptions{
|
||||
GoPackage: &tc.in,
|
||||
},
|
||||
},
|
||||
}
|
||||
impPath, pkg, ok := d.goPackageOption()
|
||||
if impPath != tc.impPath || pkg != tc.pkg || ok != tc.ok {
|
||||
t.Errorf("go_package = %q => (%q, %q, %t), want (%q, %q, %t)", tc.in,
|
||||
impPath, pkg, ok, tc.impPath, tc.pkg, tc.ok)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user