build: update dependencies
This commit is contained in:
		
							
								
								
									
										78
									
								
								vendor/google.golang.org/protobuf/internal/encoding/defval/default.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										78
									
								
								vendor/google.golang.org/protobuf/internal/encoding/defval/default.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -15,8 +15,8 @@ import (
 | 
			
		||||
	"strconv"
 | 
			
		||||
 | 
			
		||||
	ptext "google.golang.org/protobuf/internal/encoding/text"
 | 
			
		||||
	errors "google.golang.org/protobuf/internal/errors"
 | 
			
		||||
	pref "google.golang.org/protobuf/reflect/protoreflect"
 | 
			
		||||
	"google.golang.org/protobuf/internal/errors"
 | 
			
		||||
	"google.golang.org/protobuf/reflect/protoreflect"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// Format is the serialization format used to represent the default value.
 | 
			
		||||
@@ -35,56 +35,56 @@ const (
 | 
			
		||||
 | 
			
		||||
// Unmarshal deserializes the default string s according to the given kind k.
 | 
			
		||||
// When k is an enum, a list of enum value descriptors must be provided.
 | 
			
		||||
func Unmarshal(s string, k pref.Kind, evs pref.EnumValueDescriptors, f Format) (pref.Value, pref.EnumValueDescriptor, error) {
 | 
			
		||||
func Unmarshal(s string, k protoreflect.Kind, evs protoreflect.EnumValueDescriptors, f Format) (protoreflect.Value, protoreflect.EnumValueDescriptor, error) {
 | 
			
		||||
	switch k {
 | 
			
		||||
	case pref.BoolKind:
 | 
			
		||||
	case protoreflect.BoolKind:
 | 
			
		||||
		if f == GoTag {
 | 
			
		||||
			switch s {
 | 
			
		||||
			case "1":
 | 
			
		||||
				return pref.ValueOfBool(true), nil, nil
 | 
			
		||||
				return protoreflect.ValueOfBool(true), nil, nil
 | 
			
		||||
			case "0":
 | 
			
		||||
				return pref.ValueOfBool(false), nil, nil
 | 
			
		||||
				return protoreflect.ValueOfBool(false), nil, nil
 | 
			
		||||
			}
 | 
			
		||||
		} else {
 | 
			
		||||
			switch s {
 | 
			
		||||
			case "true":
 | 
			
		||||
				return pref.ValueOfBool(true), nil, nil
 | 
			
		||||
				return protoreflect.ValueOfBool(true), nil, nil
 | 
			
		||||
			case "false":
 | 
			
		||||
				return pref.ValueOfBool(false), nil, nil
 | 
			
		||||
				return protoreflect.ValueOfBool(false), nil, nil
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	case pref.EnumKind:
 | 
			
		||||
	case protoreflect.EnumKind:
 | 
			
		||||
		if f == GoTag {
 | 
			
		||||
			// Go tags use the numeric form of the enum value.
 | 
			
		||||
			if n, err := strconv.ParseInt(s, 10, 32); err == nil {
 | 
			
		||||
				if ev := evs.ByNumber(pref.EnumNumber(n)); ev != nil {
 | 
			
		||||
					return pref.ValueOfEnum(ev.Number()), ev, nil
 | 
			
		||||
				if ev := evs.ByNumber(protoreflect.EnumNumber(n)); ev != nil {
 | 
			
		||||
					return protoreflect.ValueOfEnum(ev.Number()), ev, nil
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		} else {
 | 
			
		||||
			// Descriptor default_value use the enum identifier.
 | 
			
		||||
			ev := evs.ByName(pref.Name(s))
 | 
			
		||||
			ev := evs.ByName(protoreflect.Name(s))
 | 
			
		||||
			if ev != nil {
 | 
			
		||||
				return pref.ValueOfEnum(ev.Number()), ev, nil
 | 
			
		||||
				return protoreflect.ValueOfEnum(ev.Number()), ev, nil
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	case pref.Int32Kind, pref.Sint32Kind, pref.Sfixed32Kind:
 | 
			
		||||
	case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind:
 | 
			
		||||
		if v, err := strconv.ParseInt(s, 10, 32); err == nil {
 | 
			
		||||
			return pref.ValueOfInt32(int32(v)), nil, nil
 | 
			
		||||
			return protoreflect.ValueOfInt32(int32(v)), nil, nil
 | 
			
		||||
		}
 | 
			
		||||
	case pref.Int64Kind, pref.Sint64Kind, pref.Sfixed64Kind:
 | 
			
		||||
	case protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind:
 | 
			
		||||
		if v, err := strconv.ParseInt(s, 10, 64); err == nil {
 | 
			
		||||
			return pref.ValueOfInt64(int64(v)), nil, nil
 | 
			
		||||
			return protoreflect.ValueOfInt64(int64(v)), nil, nil
 | 
			
		||||
		}
 | 
			
		||||
	case pref.Uint32Kind, pref.Fixed32Kind:
 | 
			
		||||
	case protoreflect.Uint32Kind, protoreflect.Fixed32Kind:
 | 
			
		||||
		if v, err := strconv.ParseUint(s, 10, 32); err == nil {
 | 
			
		||||
			return pref.ValueOfUint32(uint32(v)), nil, nil
 | 
			
		||||
			return protoreflect.ValueOfUint32(uint32(v)), nil, nil
 | 
			
		||||
		}
 | 
			
		||||
	case pref.Uint64Kind, pref.Fixed64Kind:
 | 
			
		||||
	case protoreflect.Uint64Kind, protoreflect.Fixed64Kind:
 | 
			
		||||
		if v, err := strconv.ParseUint(s, 10, 64); err == nil {
 | 
			
		||||
			return pref.ValueOfUint64(uint64(v)), nil, nil
 | 
			
		||||
			return protoreflect.ValueOfUint64(uint64(v)), nil, nil
 | 
			
		||||
		}
 | 
			
		||||
	case pref.FloatKind, pref.DoubleKind:
 | 
			
		||||
	case protoreflect.FloatKind, protoreflect.DoubleKind:
 | 
			
		||||
		var v float64
 | 
			
		||||
		var err error
 | 
			
		||||
		switch s {
 | 
			
		||||
@@ -98,29 +98,29 @@ func Unmarshal(s string, k pref.Kind, evs pref.EnumValueDescriptors, f Format) (
 | 
			
		||||
			v, err = strconv.ParseFloat(s, 64)
 | 
			
		||||
		}
 | 
			
		||||
		if err == nil {
 | 
			
		||||
			if k == pref.FloatKind {
 | 
			
		||||
				return pref.ValueOfFloat32(float32(v)), nil, nil
 | 
			
		||||
			if k == protoreflect.FloatKind {
 | 
			
		||||
				return protoreflect.ValueOfFloat32(float32(v)), nil, nil
 | 
			
		||||
			} else {
 | 
			
		||||
				return pref.ValueOfFloat64(float64(v)), nil, nil
 | 
			
		||||
				return protoreflect.ValueOfFloat64(float64(v)), nil, nil
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	case pref.StringKind:
 | 
			
		||||
	case protoreflect.StringKind:
 | 
			
		||||
		// String values are already unescaped and can be used as is.
 | 
			
		||||
		return pref.ValueOfString(s), nil, nil
 | 
			
		||||
	case pref.BytesKind:
 | 
			
		||||
		return protoreflect.ValueOfString(s), nil, nil
 | 
			
		||||
	case protoreflect.BytesKind:
 | 
			
		||||
		if b, ok := unmarshalBytes(s); ok {
 | 
			
		||||
			return pref.ValueOfBytes(b), nil, nil
 | 
			
		||||
			return protoreflect.ValueOfBytes(b), nil, nil
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	return pref.Value{}, nil, errors.New("could not parse value for %v: %q", k, s)
 | 
			
		||||
	return protoreflect.Value{}, nil, errors.New("could not parse value for %v: %q", k, s)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Marshal serializes v as the default string according to the given kind k.
 | 
			
		||||
// When specifying the Descriptor format for an enum kind, the associated
 | 
			
		||||
// enum value descriptor must be provided.
 | 
			
		||||
func Marshal(v pref.Value, ev pref.EnumValueDescriptor, k pref.Kind, f Format) (string, error) {
 | 
			
		||||
func Marshal(v protoreflect.Value, ev protoreflect.EnumValueDescriptor, k protoreflect.Kind, f Format) (string, error) {
 | 
			
		||||
	switch k {
 | 
			
		||||
	case pref.BoolKind:
 | 
			
		||||
	case protoreflect.BoolKind:
 | 
			
		||||
		if f == GoTag {
 | 
			
		||||
			if v.Bool() {
 | 
			
		||||
				return "1", nil
 | 
			
		||||
@@ -134,17 +134,17 @@ func Marshal(v pref.Value, ev pref.EnumValueDescriptor, k pref.Kind, f Format) (
 | 
			
		||||
				return "false", nil
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	case pref.EnumKind:
 | 
			
		||||
	case protoreflect.EnumKind:
 | 
			
		||||
		if f == GoTag {
 | 
			
		||||
			return strconv.FormatInt(int64(v.Enum()), 10), nil
 | 
			
		||||
		} else {
 | 
			
		||||
			return string(ev.Name()), nil
 | 
			
		||||
		}
 | 
			
		||||
	case pref.Int32Kind, pref.Sint32Kind, pref.Sfixed32Kind, pref.Int64Kind, pref.Sint64Kind, pref.Sfixed64Kind:
 | 
			
		||||
	case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind, protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind:
 | 
			
		||||
		return strconv.FormatInt(v.Int(), 10), nil
 | 
			
		||||
	case pref.Uint32Kind, pref.Fixed32Kind, pref.Uint64Kind, pref.Fixed64Kind:
 | 
			
		||||
	case protoreflect.Uint32Kind, protoreflect.Fixed32Kind, protoreflect.Uint64Kind, protoreflect.Fixed64Kind:
 | 
			
		||||
		return strconv.FormatUint(v.Uint(), 10), nil
 | 
			
		||||
	case pref.FloatKind, pref.DoubleKind:
 | 
			
		||||
	case protoreflect.FloatKind, protoreflect.DoubleKind:
 | 
			
		||||
		f := v.Float()
 | 
			
		||||
		switch {
 | 
			
		||||
		case math.IsInf(f, -1):
 | 
			
		||||
@@ -154,16 +154,16 @@ func Marshal(v pref.Value, ev pref.EnumValueDescriptor, k pref.Kind, f Format) (
 | 
			
		||||
		case math.IsNaN(f):
 | 
			
		||||
			return "nan", nil
 | 
			
		||||
		default:
 | 
			
		||||
			if k == pref.FloatKind {
 | 
			
		||||
			if k == protoreflect.FloatKind {
 | 
			
		||||
				return strconv.FormatFloat(f, 'g', -1, 32), nil
 | 
			
		||||
			} else {
 | 
			
		||||
				return strconv.FormatFloat(f, 'g', -1, 64), nil
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	case pref.StringKind:
 | 
			
		||||
	case protoreflect.StringKind:
 | 
			
		||||
		// String values are serialized as is without any escaping.
 | 
			
		||||
		return v.String(), nil
 | 
			
		||||
	case pref.BytesKind:
 | 
			
		||||
	case protoreflect.BytesKind:
 | 
			
		||||
		if s, ok := marshalBytes(v.Bytes()); ok {
 | 
			
		||||
			return s, nil
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										7
									
								
								vendor/google.golang.org/protobuf/internal/encoding/messageset/messageset.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								vendor/google.golang.org/protobuf/internal/encoding/messageset/messageset.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -10,7 +10,7 @@ import (
 | 
			
		||||
 | 
			
		||||
	"google.golang.org/protobuf/encoding/protowire"
 | 
			
		||||
	"google.golang.org/protobuf/internal/errors"
 | 
			
		||||
	pref "google.golang.org/protobuf/reflect/protoreflect"
 | 
			
		||||
	"google.golang.org/protobuf/reflect/protoreflect"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// The MessageSet wire format is equivalent to a message defined as follows,
 | 
			
		||||
@@ -33,6 +33,7 @@ const (
 | 
			
		||||
// ExtensionName is the field name for extensions of MessageSet.
 | 
			
		||||
//
 | 
			
		||||
// A valid MessageSet extension must be of the form:
 | 
			
		||||
//
 | 
			
		||||
//	message MyMessage {
 | 
			
		||||
//		extend proto2.bridge.MessageSet {
 | 
			
		||||
//			optional MyMessage message_set_extension = 1234;
 | 
			
		||||
@@ -42,13 +43,13 @@ const (
 | 
			
		||||
const ExtensionName = "message_set_extension"
 | 
			
		||||
 | 
			
		||||
// IsMessageSet returns whether the message uses the MessageSet wire format.
 | 
			
		||||
func IsMessageSet(md pref.MessageDescriptor) bool {
 | 
			
		||||
func IsMessageSet(md protoreflect.MessageDescriptor) bool {
 | 
			
		||||
	xmd, ok := md.(interface{ IsMessageSet() bool })
 | 
			
		||||
	return ok && xmd.IsMessageSet()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// IsMessageSetExtension reports this field properly extends a MessageSet.
 | 
			
		||||
func IsMessageSetExtension(fd pref.FieldDescriptor) bool {
 | 
			
		||||
func IsMessageSetExtension(fd protoreflect.FieldDescriptor) bool {
 | 
			
		||||
	switch {
 | 
			
		||||
	case fd.Name() != ExtensionName:
 | 
			
		||||
		return false
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										96
									
								
								vendor/google.golang.org/protobuf/internal/encoding/tag/tag.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										96
									
								
								vendor/google.golang.org/protobuf/internal/encoding/tag/tag.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -11,10 +11,10 @@ import (
 | 
			
		||||
	"strconv"
 | 
			
		||||
	"strings"
 | 
			
		||||
 | 
			
		||||
	defval "google.golang.org/protobuf/internal/encoding/defval"
 | 
			
		||||
	fdesc "google.golang.org/protobuf/internal/filedesc"
 | 
			
		||||
	"google.golang.org/protobuf/internal/encoding/defval"
 | 
			
		||||
	"google.golang.org/protobuf/internal/filedesc"
 | 
			
		||||
	"google.golang.org/protobuf/internal/strs"
 | 
			
		||||
	pref "google.golang.org/protobuf/reflect/protoreflect"
 | 
			
		||||
	"google.golang.org/protobuf/reflect/protoreflect"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
var byteType = reflect.TypeOf(byte(0))
 | 
			
		||||
@@ -29,9 +29,9 @@ var byteType = reflect.TypeOf(byte(0))
 | 
			
		||||
// This does not populate the Enum or Message (except for weak message).
 | 
			
		||||
//
 | 
			
		||||
// This function is a best effort attempt; parsing errors are ignored.
 | 
			
		||||
func Unmarshal(tag string, goType reflect.Type, evs pref.EnumValueDescriptors) pref.FieldDescriptor {
 | 
			
		||||
	f := new(fdesc.Field)
 | 
			
		||||
	f.L0.ParentFile = fdesc.SurrogateProto2
 | 
			
		||||
func Unmarshal(tag string, goType reflect.Type, evs protoreflect.EnumValueDescriptors) protoreflect.FieldDescriptor {
 | 
			
		||||
	f := new(filedesc.Field)
 | 
			
		||||
	f.L0.ParentFile = filedesc.SurrogateProto2
 | 
			
		||||
	for len(tag) > 0 {
 | 
			
		||||
		i := strings.IndexByte(tag, ',')
 | 
			
		||||
		if i < 0 {
 | 
			
		||||
@@ -39,68 +39,68 @@ func Unmarshal(tag string, goType reflect.Type, evs pref.EnumValueDescriptors) p
 | 
			
		||||
		}
 | 
			
		||||
		switch s := tag[:i]; {
 | 
			
		||||
		case strings.HasPrefix(s, "name="):
 | 
			
		||||
			f.L0.FullName = pref.FullName(s[len("name="):])
 | 
			
		||||
			f.L0.FullName = protoreflect.FullName(s[len("name="):])
 | 
			
		||||
		case strings.Trim(s, "0123456789") == "":
 | 
			
		||||
			n, _ := strconv.ParseUint(s, 10, 32)
 | 
			
		||||
			f.L1.Number = pref.FieldNumber(n)
 | 
			
		||||
			f.L1.Number = protoreflect.FieldNumber(n)
 | 
			
		||||
		case s == "opt":
 | 
			
		||||
			f.L1.Cardinality = pref.Optional
 | 
			
		||||
			f.L1.Cardinality = protoreflect.Optional
 | 
			
		||||
		case s == "req":
 | 
			
		||||
			f.L1.Cardinality = pref.Required
 | 
			
		||||
			f.L1.Cardinality = protoreflect.Required
 | 
			
		||||
		case s == "rep":
 | 
			
		||||
			f.L1.Cardinality = pref.Repeated
 | 
			
		||||
			f.L1.Cardinality = protoreflect.Repeated
 | 
			
		||||
		case s == "varint":
 | 
			
		||||
			switch goType.Kind() {
 | 
			
		||||
			case reflect.Bool:
 | 
			
		||||
				f.L1.Kind = pref.BoolKind
 | 
			
		||||
				f.L1.Kind = protoreflect.BoolKind
 | 
			
		||||
			case reflect.Int32:
 | 
			
		||||
				f.L1.Kind = pref.Int32Kind
 | 
			
		||||
				f.L1.Kind = protoreflect.Int32Kind
 | 
			
		||||
			case reflect.Int64:
 | 
			
		||||
				f.L1.Kind = pref.Int64Kind
 | 
			
		||||
				f.L1.Kind = protoreflect.Int64Kind
 | 
			
		||||
			case reflect.Uint32:
 | 
			
		||||
				f.L1.Kind = pref.Uint32Kind
 | 
			
		||||
				f.L1.Kind = protoreflect.Uint32Kind
 | 
			
		||||
			case reflect.Uint64:
 | 
			
		||||
				f.L1.Kind = pref.Uint64Kind
 | 
			
		||||
				f.L1.Kind = protoreflect.Uint64Kind
 | 
			
		||||
			}
 | 
			
		||||
		case s == "zigzag32":
 | 
			
		||||
			if goType.Kind() == reflect.Int32 {
 | 
			
		||||
				f.L1.Kind = pref.Sint32Kind
 | 
			
		||||
				f.L1.Kind = protoreflect.Sint32Kind
 | 
			
		||||
			}
 | 
			
		||||
		case s == "zigzag64":
 | 
			
		||||
			if goType.Kind() == reflect.Int64 {
 | 
			
		||||
				f.L1.Kind = pref.Sint64Kind
 | 
			
		||||
				f.L1.Kind = protoreflect.Sint64Kind
 | 
			
		||||
			}
 | 
			
		||||
		case s == "fixed32":
 | 
			
		||||
			switch goType.Kind() {
 | 
			
		||||
			case reflect.Int32:
 | 
			
		||||
				f.L1.Kind = pref.Sfixed32Kind
 | 
			
		||||
				f.L1.Kind = protoreflect.Sfixed32Kind
 | 
			
		||||
			case reflect.Uint32:
 | 
			
		||||
				f.L1.Kind = pref.Fixed32Kind
 | 
			
		||||
				f.L1.Kind = protoreflect.Fixed32Kind
 | 
			
		||||
			case reflect.Float32:
 | 
			
		||||
				f.L1.Kind = pref.FloatKind
 | 
			
		||||
				f.L1.Kind = protoreflect.FloatKind
 | 
			
		||||
			}
 | 
			
		||||
		case s == "fixed64":
 | 
			
		||||
			switch goType.Kind() {
 | 
			
		||||
			case reflect.Int64:
 | 
			
		||||
				f.L1.Kind = pref.Sfixed64Kind
 | 
			
		||||
				f.L1.Kind = protoreflect.Sfixed64Kind
 | 
			
		||||
			case reflect.Uint64:
 | 
			
		||||
				f.L1.Kind = pref.Fixed64Kind
 | 
			
		||||
				f.L1.Kind = protoreflect.Fixed64Kind
 | 
			
		||||
			case reflect.Float64:
 | 
			
		||||
				f.L1.Kind = pref.DoubleKind
 | 
			
		||||
				f.L1.Kind = protoreflect.DoubleKind
 | 
			
		||||
			}
 | 
			
		||||
		case s == "bytes":
 | 
			
		||||
			switch {
 | 
			
		||||
			case goType.Kind() == reflect.String:
 | 
			
		||||
				f.L1.Kind = pref.StringKind
 | 
			
		||||
				f.L1.Kind = protoreflect.StringKind
 | 
			
		||||
			case goType.Kind() == reflect.Slice && goType.Elem() == byteType:
 | 
			
		||||
				f.L1.Kind = pref.BytesKind
 | 
			
		||||
				f.L1.Kind = protoreflect.BytesKind
 | 
			
		||||
			default:
 | 
			
		||||
				f.L1.Kind = pref.MessageKind
 | 
			
		||||
				f.L1.Kind = protoreflect.MessageKind
 | 
			
		||||
			}
 | 
			
		||||
		case s == "group":
 | 
			
		||||
			f.L1.Kind = pref.GroupKind
 | 
			
		||||
			f.L1.Kind = protoreflect.GroupKind
 | 
			
		||||
		case strings.HasPrefix(s, "enum="):
 | 
			
		||||
			f.L1.Kind = pref.EnumKind
 | 
			
		||||
			f.L1.Kind = protoreflect.EnumKind
 | 
			
		||||
		case strings.HasPrefix(s, "json="):
 | 
			
		||||
			jsonName := s[len("json="):]
 | 
			
		||||
			if jsonName != strs.JSONCamelCase(string(f.L0.FullName.Name())) {
 | 
			
		||||
@@ -111,23 +111,23 @@ func Unmarshal(tag string, goType reflect.Type, evs pref.EnumValueDescriptors) p
 | 
			
		||||
			f.L1.IsPacked = true
 | 
			
		||||
		case strings.HasPrefix(s, "weak="):
 | 
			
		||||
			f.L1.IsWeak = true
 | 
			
		||||
			f.L1.Message = fdesc.PlaceholderMessage(pref.FullName(s[len("weak="):]))
 | 
			
		||||
			f.L1.Message = filedesc.PlaceholderMessage(protoreflect.FullName(s[len("weak="):]))
 | 
			
		||||
		case strings.HasPrefix(s, "def="):
 | 
			
		||||
			// The default tag is special in that everything afterwards is the
 | 
			
		||||
			// default regardless of the presence of commas.
 | 
			
		||||
			s, i = tag[len("def="):], len(tag)
 | 
			
		||||
			v, ev, _ := defval.Unmarshal(s, f.L1.Kind, evs, defval.GoTag)
 | 
			
		||||
			f.L1.Default = fdesc.DefaultValue(v, ev)
 | 
			
		||||
			f.L1.Default = filedesc.DefaultValue(v, ev)
 | 
			
		||||
		case s == "proto3":
 | 
			
		||||
			f.L0.ParentFile = fdesc.SurrogateProto3
 | 
			
		||||
			f.L0.ParentFile = filedesc.SurrogateProto3
 | 
			
		||||
		}
 | 
			
		||||
		tag = strings.TrimPrefix(tag[i:], ",")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// The generator uses the group message name instead of the field name.
 | 
			
		||||
	// We obtain the real field name by lowercasing the group name.
 | 
			
		||||
	if f.L1.Kind == pref.GroupKind {
 | 
			
		||||
		f.L0.FullName = pref.FullName(strings.ToLower(string(f.L0.FullName)))
 | 
			
		||||
	if f.L1.Kind == protoreflect.GroupKind {
 | 
			
		||||
		f.L0.FullName = protoreflect.FullName(strings.ToLower(string(f.L0.FullName)))
 | 
			
		||||
	}
 | 
			
		||||
	return f
 | 
			
		||||
}
 | 
			
		||||
@@ -140,38 +140,38 @@ func Unmarshal(tag string, goType reflect.Type, evs pref.EnumValueDescriptors) p
 | 
			
		||||
// Depending on the context on how Marshal is called, there are different ways
 | 
			
		||||
// through which that information is determined. As such it is the caller's
 | 
			
		||||
// responsibility to provide a function to obtain that information.
 | 
			
		||||
func Marshal(fd pref.FieldDescriptor, enumName string) string {
 | 
			
		||||
func Marshal(fd protoreflect.FieldDescriptor, enumName string) string {
 | 
			
		||||
	var tag []string
 | 
			
		||||
	switch fd.Kind() {
 | 
			
		||||
	case pref.BoolKind, pref.EnumKind, pref.Int32Kind, pref.Uint32Kind, pref.Int64Kind, pref.Uint64Kind:
 | 
			
		||||
	case protoreflect.BoolKind, protoreflect.EnumKind, protoreflect.Int32Kind, protoreflect.Uint32Kind, protoreflect.Int64Kind, protoreflect.Uint64Kind:
 | 
			
		||||
		tag = append(tag, "varint")
 | 
			
		||||
	case pref.Sint32Kind:
 | 
			
		||||
	case protoreflect.Sint32Kind:
 | 
			
		||||
		tag = append(tag, "zigzag32")
 | 
			
		||||
	case pref.Sint64Kind:
 | 
			
		||||
	case protoreflect.Sint64Kind:
 | 
			
		||||
		tag = append(tag, "zigzag64")
 | 
			
		||||
	case pref.Sfixed32Kind, pref.Fixed32Kind, pref.FloatKind:
 | 
			
		||||
	case protoreflect.Sfixed32Kind, protoreflect.Fixed32Kind, protoreflect.FloatKind:
 | 
			
		||||
		tag = append(tag, "fixed32")
 | 
			
		||||
	case pref.Sfixed64Kind, pref.Fixed64Kind, pref.DoubleKind:
 | 
			
		||||
	case protoreflect.Sfixed64Kind, protoreflect.Fixed64Kind, protoreflect.DoubleKind:
 | 
			
		||||
		tag = append(tag, "fixed64")
 | 
			
		||||
	case pref.StringKind, pref.BytesKind, pref.MessageKind:
 | 
			
		||||
	case protoreflect.StringKind, protoreflect.BytesKind, protoreflect.MessageKind:
 | 
			
		||||
		tag = append(tag, "bytes")
 | 
			
		||||
	case pref.GroupKind:
 | 
			
		||||
	case protoreflect.GroupKind:
 | 
			
		||||
		tag = append(tag, "group")
 | 
			
		||||
	}
 | 
			
		||||
	tag = append(tag, strconv.Itoa(int(fd.Number())))
 | 
			
		||||
	switch fd.Cardinality() {
 | 
			
		||||
	case pref.Optional:
 | 
			
		||||
	case protoreflect.Optional:
 | 
			
		||||
		tag = append(tag, "opt")
 | 
			
		||||
	case pref.Required:
 | 
			
		||||
	case protoreflect.Required:
 | 
			
		||||
		tag = append(tag, "req")
 | 
			
		||||
	case pref.Repeated:
 | 
			
		||||
	case protoreflect.Repeated:
 | 
			
		||||
		tag = append(tag, "rep")
 | 
			
		||||
	}
 | 
			
		||||
	if fd.IsPacked() {
 | 
			
		||||
		tag = append(tag, "packed")
 | 
			
		||||
	}
 | 
			
		||||
	name := string(fd.Name())
 | 
			
		||||
	if fd.Kind() == pref.GroupKind {
 | 
			
		||||
	if fd.Kind() == protoreflect.GroupKind {
 | 
			
		||||
		// The name of the FieldDescriptor for a group field is
 | 
			
		||||
		// lowercased. To find the original capitalization, we
 | 
			
		||||
		// look in the field's MessageType.
 | 
			
		||||
@@ -189,10 +189,10 @@ func Marshal(fd pref.FieldDescriptor, enumName string) string {
 | 
			
		||||
	// The previous implementation does not tag extension fields as proto3,
 | 
			
		||||
	// even when the field is defined in a proto3 file. Match that behavior
 | 
			
		||||
	// for consistency.
 | 
			
		||||
	if fd.Syntax() == pref.Proto3 && !fd.IsExtension() {
 | 
			
		||||
	if fd.Syntax() == protoreflect.Proto3 && !fd.IsExtension() {
 | 
			
		||||
		tag = append(tag, "proto3")
 | 
			
		||||
	}
 | 
			
		||||
	if fd.Kind() == pref.EnumKind && enumName != "" {
 | 
			
		||||
	if fd.Kind() == protoreflect.EnumKind && enumName != "" {
 | 
			
		||||
		tag = append(tag, "enum="+enumName)
 | 
			
		||||
	}
 | 
			
		||||
	if fd.ContainingOneof() != nil {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										30
									
								
								vendor/google.golang.org/protobuf/internal/encoding/text/decode.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										30
									
								
								vendor/google.golang.org/protobuf/internal/encoding/text/decode.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -8,7 +8,6 @@ import (
 | 
			
		||||
	"bytes"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"io"
 | 
			
		||||
	"regexp"
 | 
			
		||||
	"strconv"
 | 
			
		||||
	"unicode/utf8"
 | 
			
		||||
 | 
			
		||||
@@ -421,7 +420,7 @@ func (d *Decoder) parseFieldName() (tok Token, err error) {
 | 
			
		||||
		return Token{}, d.newSyntaxError("invalid field number: %s", d.in[:num.size])
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return Token{}, d.newSyntaxError("invalid field name: %s", errRegexp.Find(d.in))
 | 
			
		||||
	return Token{}, d.newSyntaxError("invalid field name: %s", errId(d.in))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// parseTypeName parses Any type URL or extension field name. The name is
 | 
			
		||||
@@ -571,7 +570,7 @@ func (d *Decoder) parseScalar() (Token, error) {
 | 
			
		||||
		return tok, nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return Token{}, d.newSyntaxError("invalid scalar value: %s", errRegexp.Find(d.in))
 | 
			
		||||
	return Token{}, d.newSyntaxError("invalid scalar value: %s", errId(d.in))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// parseLiteralValue parses a literal value. A literal value is used for
 | 
			
		||||
@@ -653,8 +652,29 @@ func consume(b []byte, n int) []byte {
 | 
			
		||||
	return b
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Any sequence that looks like a non-delimiter (for error reporting).
 | 
			
		||||
var errRegexp = regexp.MustCompile(`^([-+._a-zA-Z0-9\/]+|.)`)
 | 
			
		||||
// errId extracts a byte sequence that looks like an invalid ID
 | 
			
		||||
// (for the purposes of error reporting).
 | 
			
		||||
func errId(seq []byte) []byte {
 | 
			
		||||
	const maxLen = 32
 | 
			
		||||
	for i := 0; i < len(seq); {
 | 
			
		||||
		if i > maxLen {
 | 
			
		||||
			return append(seq[:i:i], "…"...)
 | 
			
		||||
		}
 | 
			
		||||
		r, size := utf8.DecodeRune(seq[i:])
 | 
			
		||||
		if r > utf8.RuneSelf || (r != '/' && isDelim(byte(r))) {
 | 
			
		||||
			if i == 0 {
 | 
			
		||||
				// Either the first byte is invalid UTF-8 or a
 | 
			
		||||
				// delimiter, or the first rune is non-ASCII.
 | 
			
		||||
				// Return it as-is.
 | 
			
		||||
				i = size
 | 
			
		||||
			}
 | 
			
		||||
			return seq[:i:i]
 | 
			
		||||
		}
 | 
			
		||||
		i += size
 | 
			
		||||
	}
 | 
			
		||||
	// No delimiter found.
 | 
			
		||||
	return seq
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// isDelim returns true if given byte is a delimiter character.
 | 
			
		||||
func isDelim(c byte) bool {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6
									
								
								vendor/google.golang.org/protobuf/internal/encoding/text/decode_number.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								vendor/google.golang.org/protobuf/internal/encoding/text/decode_number.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -50,8 +50,10 @@ type number struct {
 | 
			
		||||
 | 
			
		||||
// parseNumber constructs a number object from given input. It allows for the
 | 
			
		||||
// following patterns:
 | 
			
		||||
//   integer: ^-?([1-9][0-9]*|0[xX][0-9a-fA-F]+|0[0-7]*)
 | 
			
		||||
//   float: ^-?((0|[1-9][0-9]*)?([.][0-9]*)?([eE][+-]?[0-9]+)?[fF]?)
 | 
			
		||||
//
 | 
			
		||||
//	integer: ^-?([1-9][0-9]*|0[xX][0-9a-fA-F]+|0[0-7]*)
 | 
			
		||||
//	float: ^-?((0|[1-9][0-9]*)?([.][0-9]*)?([eE][+-]?[0-9]+)?[fF]?)
 | 
			
		||||
//
 | 
			
		||||
// It also returns the number of parsed bytes for the given number, 0 if it is
 | 
			
		||||
// not a number.
 | 
			
		||||
func parseNumber(input []byte) number {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/google.golang.org/protobuf/internal/encoding/text/doc.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/google.golang.org/protobuf/internal/encoding/text/doc.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -24,6 +24,6 @@
 | 
			
		||||
// the Go implementation should as well.
 | 
			
		||||
//
 | 
			
		||||
// The text format is almost a superset of JSON except:
 | 
			
		||||
//	* message keys are not quoted strings, but identifiers
 | 
			
		||||
//	* the top-level value must be a message without the delimiters
 | 
			
		||||
//   - message keys are not quoted strings, but identifiers
 | 
			
		||||
//   - the top-level value must be a message without the delimiters
 | 
			
		||||
package text
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user