@ -94,7 +94,7 @@ using ::google::protobuf::internal::DownCast;
const int kPackageLimit = 100 ; const int kPackageLimit = 100 ;
std : : string ToCamelCase ( const std : : string & input , bool lower_first ) { std : : string ToCamelCase ( absl : : string_view input , bool lower_first ) {
bool capitalize_next = ! lower_first ; bool capitalize_next = ! lower_first ;
std : : string result ; std : : string result ;
result . reserve ( input . size ( ) ) ; result . reserve ( input . size ( ) ) ;
@ -118,7 +118,7 @@ std::string ToCamelCase(const std::string& input, bool lower_first) {
return result ; return result ;
} }
std : : string ToJsonName ( const std : : string & input ) { std : : string ToJsonName ( absl : : string_view input ) {
bool capitalize_next = false ; bool capitalize_next = false ;
std : : string result ; std : : string result ;
result . reserve ( input . size ( ) ) ; result . reserve ( input . size ( ) ) ;
@ -425,7 +425,7 @@ class FlatAllocatorImpl {
// It will dedup the strings when possible.
// It will dedup the strings when possible.
// The resulting array contains `name` at index 0, `full_name` at index 1
// The resulting array contains `name` at index 0, `full_name` at index 1
// and the other 3 indices are specified in the result.
// and the other 3 indices are specified in the result.
void PlanFieldNames ( const std : : string & name , void PlanFieldNames ( absl : : string_view name ,
const std : : string * opt_json_name ) { const std : : string * opt_json_name ) {
ABSL_CHECK ( ! has_allocated ( ) ) ; ABSL_CHECK ( ! has_allocated ( ) ) ;
@ -443,7 +443,7 @@ class FlatAllocatorImpl {
} }
} }
std : : string lowercase_name = name ; std : : string lowercase_name = std : : string ( name ) ;
absl : : AsciiStrToLower ( & lowercase_name ) ; absl : : AsciiStrToLower ( & lowercase_name ) ;
std : : string camelcase_name = ToCamelCase ( name , /* lower_first = */ true ) ; std : : string camelcase_name = ToCamelCase ( name , /* lower_first = */ true ) ;
@ -465,13 +465,13 @@ class FlatAllocatorImpl {
int camelcase_index ; int camelcase_index ;
int json_index ; int json_index ;
} ; } ;
FieldNamesResult AllocateFieldNames ( const std : : string & name , FieldNamesResult AllocateFieldNames ( absl : : string_view name ,
const std : : string & scope , absl : : string_view scope ,
const std : : string * opt_json_name ) { const std : : string * opt_json_name ) {
ABSL_CHECK ( has_allocated ( ) ) ; ABSL_CHECK ( has_allocated ( ) ) ;
std : : string full_name = std : : string full_name =
scope . empty ( ) ? name : absl : : StrCat ( scope , " . " , name ) ; scope . empty ( ) ? std : : string ( name ) : absl : : StrCat ( scope , " . " , name ) ;
// Fast path for snake_case names, which follow the style guide.
// Fast path for snake_case names, which follow the style guide.
if ( opt_json_name = = nullptr ) { if ( opt_json_name = = nullptr ) {
@ -490,7 +490,7 @@ class FlatAllocatorImpl {
} }
std : : vector < std : : string > names ; std : : vector < std : : string > names ;
names . push_back ( name ) ; names . push_back ( std : : string ( name ) ) ;
names . push_back ( std : : move ( full_name ) ) ; names . push_back ( std : : move ( full_name ) ) ;
const auto push_name = [ & ] ( std : : string new_name ) { const auto push_name = [ & ] ( std : : string new_name ) {
@ -507,7 +507,7 @@ class FlatAllocatorImpl {
FieldNamesResult result { nullptr , 0 , 0 , 0 } ; FieldNamesResult result { nullptr , 0 , 0 , 0 } ;
std : : string lowercase_name = name ; std : : string lowercase_name = std : : string ( name ) ;
absl : : AsciiStrToLower ( & lowercase_name ) ; absl : : AsciiStrToLower ( & lowercase_name ) ;
result . lowercase_index = push_name ( std : : move ( lowercase_name ) ) ; result . lowercase_index = push_name ( std : : move ( lowercase_name ) ) ;
result . camelcase_index = result . camelcase_index =
@ -547,8 +547,8 @@ class FlatAllocatorImpl {
static bool IsLowerOrDigit ( char c ) { return IsLower ( c ) | | IsDigit ( c ) ; } static bool IsLowerOrDigit ( char c ) { return IsLower ( c ) | | IsDigit ( c ) ; }
enum class FieldNameCase { kAllLower , kSnakeCase , kOther } ; enum class FieldNameCase { kAllLower , kSnakeCase , kOther } ;
FieldNameCase GetFieldNameCase ( const std : : string & name ) { FieldNameCase GetFieldNameCase ( absl : : string_view name ) {
if ( ! IsLower ( name [ 0 ] ) ) return FieldNameCase : : kOther ; if ( ! name . empty ( ) & & ! IsLower ( name [ 0 ] ) ) return FieldNameCase : : kOther ;
FieldNameCase best = FieldNameCase : : kAllLower ; FieldNameCase best = FieldNameCase : : kAllLower ;
for ( char c : name ) { for ( char c : name ) {
if ( IsLowerOrDigit ( c ) ) { if ( IsLowerOrDigit ( c ) ) {
@ -835,7 +835,7 @@ const int FieldDescriptor::kLastReservedNumber;
namespace { namespace {
std : : string EnumValueToPascalCase ( const std : : string & input ) { std : : string EnumValueToPascalCase ( absl : : string_view input ) {
bool next_upper = true ; bool next_upper = true ;
std : : string result ; std : : string result ;
result . reserve ( input . size ( ) ) ; result . reserve ( input . size ( ) ) ;
@ -1082,7 +1082,7 @@ absl::flat_hash_set<std::string>* NewAllowedProto3Extendee() {
// Only extensions to descriptor options are allowed. We use name comparison
// Only extensions to descriptor options are allowed. We use name comparison
// instead of comparing the descriptor directly because the extensions may be
// instead of comparing the descriptor directly because the extensions may be
// defined in a different pool.
// defined in a different pool.
bool AllowedExtendeeInProto3 ( const std : : string & name ) { bool AllowedExtendeeInProto3 ( absl : : string_view name ) {
static auto allowed_proto3_extendees = static auto allowed_proto3_extendees =
internal : : OnShutdownDelete ( NewAllowedProto3Extendee ( ) ) ; internal : : OnShutdownDelete ( NewAllowedProto3Extendee ( ) ) ;
return allowed_proto3_extendees - > find ( name ) ! = return allowed_proto3_extendees - > find ( name ) ! =
@ -3257,7 +3257,7 @@ bool FormatLineOptions(int depth, const Message& options,
std : : string prefix ( depth * 2 , ' ' ) ; std : : string prefix ( depth * 2 , ' ' ) ;
std : : vector < std : : string > all_options ; std : : vector < std : : string > all_options ;
if ( RetrieveOptions ( depth , options , pool , & all_options ) ) { if ( RetrieveOptions ( depth , options , pool , & all_options ) ) {
for ( const std : : string & option : all_options ) { for ( absl : : string_view option : all_options ) {
absl : : SubstituteAndAppend ( output , " $0option $1; \n " , prefix , option ) ; absl : : SubstituteAndAppend ( output , " $0option $1; \n " , prefix , option ) ;
} }
} }
@ -3275,7 +3275,7 @@ static std::string GetLegacySyntaxName(Edition edition) {
class SourceLocationCommentPrinter { class SourceLocationCommentPrinter {
public : public :
template < typename DescType > template < typename DescType >
SourceLocationCommentPrinter ( const DescType * desc , const std : : string & prefix , SourceLocationCommentPrinter ( const DescType * desc , absl : : string_view prefix ,
const DebugStringOptions & options ) const DebugStringOptions & options )
: options_ ( options ) , prefix_ ( prefix ) { : options_ ( options ) , prefix_ ( prefix ) {
// Perform the SourceLocation lookup only if we're including user comments,
// Perform the SourceLocation lookup only if we're including user comments,
@ -3285,7 +3285,7 @@ class SourceLocationCommentPrinter {
} }
SourceLocationCommentPrinter ( const FileDescriptor * file , SourceLocationCommentPrinter ( const FileDescriptor * file ,
const std : : vector < int > & path , const std : : vector < int > & path ,
const std : : string & prefix , absl : : string_view prefix ,
const DebugStringOptions & options ) const DebugStringOptions & options )
: options_ ( options ) , prefix_ ( prefix ) { : options_ ( options ) , prefix_ ( prefix ) {
// Perform the SourceLocation lookup only if we're including user comments,
// Perform the SourceLocation lookup only if we're including user comments,
@ -3296,7 +3296,7 @@ class SourceLocationCommentPrinter {
void AddPreComment ( std : : string * output ) { void AddPreComment ( std : : string * output ) {
if ( have_source_loc_ ) { if ( have_source_loc_ ) {
// Detached leading comments.
// Detached leading comments.
for ( const std : : string & leading_detached_comment : for ( absl : : string_view leading_detached_comment :
source_loc_ . leading_detached_comments ) { source_loc_ . leading_detached_comments ) {
absl : : StrAppend ( output , FormatComment ( leading_detached_comment ) , " \n " ) ; absl : : StrAppend ( output , FormatComment ( leading_detached_comment ) , " \n " ) ;
} }
@ -3314,9 +3314,9 @@ class SourceLocationCommentPrinter {
// Format comment such that each line becomes a full-line C++-style comment in
// Format comment such that each line becomes a full-line C++-style comment in
// the DebugString() output.
// the DebugString() output.
std : : string FormatComment ( const std : : string & comment_text ) { std : : string FormatComment ( absl : : string_view comment_text ) {
std : : string stripped_comment = comment_text ; absl : : string_view stripped_comment =
absl : : StripAsciiWhitespace ( & stripped_ comment) ; absl : : StripAsciiWhitespace ( comment_tex t ) ;
std : : string output ; std : : string output ;
for ( absl : : string_view line : absl : : StrSplit ( stripped_comment , ' \n ' ) ) { for ( absl : : string_view line : absl : : StrSplit ( stripped_comment , ' \n ' ) ) {
absl : : SubstituteAndAppend ( & output , " $0// $1 \n " , prefix_ , line ) ; absl : : SubstituteAndAppend ( & output , " $0// $1 \n " , prefix_ , line ) ;
@ -4219,10 +4219,10 @@ class DescriptorBuilder {
// The `const char*` overload should only be used for string literal messages
// The `const char*` overload should only be used for string literal messages
// where this is a frustrating amount of overhead and there is no harm in
// where this is a frustrating amount of overhead and there is no harm in
// directly using the literal.
// directly using the literal.
void AddError ( const std : : string & element_name , const Message & descriptor , void AddError ( absl : : string_view element_name , const Message & descriptor ,
DescriptorPool : : ErrorCollector : : ErrorLocation location , DescriptorPool : : ErrorCollector : : ErrorLocation location ,
absl : : FunctionRef < std : : string ( ) > make_error ) ; absl : : FunctionRef < std : : string ( ) > make_error ) ;
void AddError ( const std : : string & element_name , const Message & descriptor , void AddError ( absl : : string_view element_name , const Message & descriptor ,
DescriptorPool : : ErrorCollector : : ErrorLocation location , DescriptorPool : : ErrorCollector : : ErrorLocation location ,
const char * error ) ; const char * error ) ;
void AddRecursiveImportError ( const FileDescriptorProto & proto , int from_here ) ; void AddRecursiveImportError ( const FileDescriptorProto & proto , int from_here ) ;
@ -4232,14 +4232,14 @@ class DescriptorBuilder {
// Adds an error indicating that undefined_symbol was not defined. Must
// Adds an error indicating that undefined_symbol was not defined. Must
// only be called after LookupSymbol() fails.
// only be called after LookupSymbol() fails.
void AddNotDefinedError ( void AddNotDefinedError (
const std : : string & element_name , const Message & descriptor , absl : : string_view element_name , const Message & descriptor ,
DescriptorPool : : ErrorCollector : : ErrorLocation location , DescriptorPool : : ErrorCollector : : ErrorLocation location ,
const std : : string & undefined_symbol ) ; absl : : string_view undefined_symbol ) ;
void AddWarning ( const std : : string & element_name , const Message & descriptor , void AddWarning ( absl : : string_view element_name , const Message & descriptor ,
DescriptorPool : : ErrorCollector : : ErrorLocation location , DescriptorPool : : ErrorCollector : : ErrorLocation location ,
absl : : FunctionRef < std : : string ( ) > make_error ) ; absl : : FunctionRef < std : : string ( ) > make_error ) ;
void AddWarning ( const std : : string & element_name , const Message & descriptor , void AddWarning ( absl : : string_view element_name , const Message & descriptor ,
DescriptorPool : : ErrorCollector : : ErrorLocation location , DescriptorPool : : ErrorCollector : : ErrorLocation location ,
const char * error ) ; const char * error ) ;
@ -4256,16 +4256,16 @@ class DescriptorBuilder {
// - Search the pool's underlay if not found in tables_.
// - Search the pool's underlay if not found in tables_.
// - Insure that the resulting Symbol is from one of the file's declared
// - Insure that the resulting Symbol is from one of the file's declared
// dependencies.
// dependencies.
Symbol FindSymbol ( const std : : string & name , bool build_it = true ) ; Symbol FindSymbol ( absl : : string_view name , bool build_it = true ) ;
// Like FindSymbol() but does not require that the symbol is in one of the
// Like FindSymbol() but does not require that the symbol is in one of the
// file's declared dependencies.
// file's declared dependencies.
Symbol FindSymbolNotEnforcingDeps ( const std : : string & name , Symbol FindSymbolNotEnforcingDeps ( absl : : string_view name ,
bool build_it = true ) ; bool build_it = true ) ;
// This implements the body of FindSymbolNotEnforcingDeps().
// This implements the body of FindSymbolNotEnforcingDeps().
Symbol FindSymbolNotEnforcingDepsHelper ( const DescriptorPool * pool , Symbol FindSymbolNotEnforcingDepsHelper ( const DescriptorPool * pool ,
const std : : string & name , absl : : string_view name ,
bool build_it = true ) ; bool build_it = true ) ;
// Like FindSymbol(), but looks up the name relative to some other symbol
// Like FindSymbol(), but looks up the name relative to some other symbol
@ -4283,7 +4283,7 @@ class DescriptorBuilder {
// if it believes that's all it could refer to. The caller should always
// if it believes that's all it could refer to. The caller should always
// check that it receives the type of symbol it was expecting.
// check that it receives the type of symbol it was expecting.
enum ResolveMode { LOOKUP_ALL , LOOKUP_TYPES } ; enum ResolveMode { LOOKUP_ALL , LOOKUP_TYPES } ;
Symbol LookupSymbol ( const std : : string & name , const std : : string & relative_to , Symbol LookupSymbol ( absl : : string_view name , absl : : string_view relative_to ,
DescriptorPool : : PlaceholderType placeholder_type = DescriptorPool : : PlaceholderType placeholder_type =
DescriptorPool : : PLACEHOLDER_MESSAGE , DescriptorPool : : PLACEHOLDER_MESSAGE ,
ResolveMode resolve_mode = LOOKUP_ALL , ResolveMode resolve_mode = LOOKUP_ALL ,
@ -4291,28 +4291,28 @@ class DescriptorBuilder {
// Like LookupSymbol() but will not return a placeholder even if
// Like LookupSymbol() but will not return a placeholder even if
// AllowUnknownDependencies() has been used.
// AllowUnknownDependencies() has been used.
Symbol LookupSymbolNoPlaceholder ( const std : : string & name , Symbol LookupSymbolNoPlaceholder ( absl : : string_view name ,
const std : : string & relative_to , absl : : string_view relative_to ,
ResolveMode resolve_mode = LOOKUP_ALL , ResolveMode resolve_mode = LOOKUP_ALL ,
bool build_it = true ) ; bool build_it = true ) ;
// Calls tables_->AddSymbol() and records an error if it fails. Returns
// Calls tables_->AddSymbol() and records an error if it fails. Returns
// true if successful or false if failed, though most callers can ignore
// true if successful or false if failed, though most callers can ignore
// the return value since an error has already been recorded.
// the return value since an error has already been recorded.
bool AddSymbol ( const std : : string & full_name , const void * parent , bool AddSymbol ( absl : : string_view full_name , const void * parent ,
const std : : string & name , const Message & proto , Symbol symbol ) ; absl : : string_view name , const Message & proto , Symbol symbol ) ;
// Like AddSymbol(), but succeeds if the symbol is already defined as long
// Like AddSymbol(), but succeeds if the symbol is already defined as long
// as the existing definition is also a package (because it's OK to define
// as the existing definition is also a package (because it's OK to define
// the same package in two different files). Also adds all parents of the
// the same package in two different files). Also adds all parents of the
// package to the symbol table (e.g. AddPackage("foo.bar", ...) will add
// package to the symbol table (e.g. AddPackage("foo.bar", ...) will add
// "foo.bar" and "foo" to the table).
// "foo.bar" and "foo" to the table).
void AddPackage ( const std : : string & name , const Message & proto , void AddPackage ( absl : : string_view name , const Message & proto ,
FileDescriptor * file ) ; FileDescriptor * file , bool top_level ) ;
// Checks that the symbol name contains only alphanumeric characters and
// Checks that the symbol name contains only alphanumeric characters and
// underscores. Records an error otherwise.
// underscores. Records an error otherwise.
void ValidateSymbolName ( const std : : string & name , const std : : string & full_name , void ValidateSymbolName ( absl : : string_view name , absl : : string_view full_name ,
const Message & proto ) ; const Message & proto ) ;
// Allocates a copy of orig_options in tables_ and stores it in the
// Allocates a copy of orig_options in tables_ and stores it in the
@ -4365,8 +4365,8 @@ class DescriptorBuilder {
// Allocates an array of two strings, the first one is a copy of
// Allocates an array of two strings, the first one is a copy of
// `proto_name`, and the second one is the full name. Full proto name is
// `proto_name`, and the second one is the full name. Full proto name is
// "scope.proto_name" if scope is non-empty and "proto_name" otherwise.
// "scope.proto_name" if scope is non-empty and "proto_name" otherwise.
const std : : string * AllocateNameStrings ( const std : : string & scope , const std : : string * AllocateNameStrings ( absl : : string_view scope ,
const std : : string & proto_name , absl : : string_view proto_name ,
internal : : FlatAllocator & alloc ) ; internal : : FlatAllocator & alloc ) ;
// These methods all have the same signature for the sake of the BUILD_ARRAY
// These methods all have the same signature for the sake of the BUILD_ARRAY
@ -4411,7 +4411,7 @@ class DescriptorBuilder {
void CheckFieldJsonNameUniqueness ( const DescriptorProto & proto , void CheckFieldJsonNameUniqueness ( const DescriptorProto & proto ,
const Descriptor * result ) ; const Descriptor * result ) ;
void CheckFieldJsonNameUniqueness ( const std : : string & message_name , void CheckFieldJsonNameUniqueness ( absl : : string_view message_name ,
const DescriptorProto & message , const DescriptorProto & message ,
const Descriptor * descriptor , const Descriptor * descriptor ,
bool use_custom_names ) ; bool use_custom_names ) ;
@ -4510,7 +4510,7 @@ class DescriptorBuilder {
std : : vector < const FieldDescriptor * > : : const_iterator std : : vector < const FieldDescriptor * > : : const_iterator
intermediate_fields_end , intermediate_fields_end ,
const FieldDescriptor * innermost_field , const FieldDescriptor * innermost_field ,
const std : : string & debug_msg_name , absl : : string_view debug_msg_name ,
const UnknownFieldSet & unknown_fields ) ; const UnknownFieldSet & unknown_fields ) ;
// Validates the value for the option field of the currently interpreted
// Validates the value for the option field of the currently interpreted
@ -4641,7 +4641,7 @@ class DescriptorBuilder {
void ValidateExtensionRangeOptions ( const DescriptorProto & proto , void ValidateExtensionRangeOptions ( const DescriptorProto & proto ,
const Descriptor & message ) ; const Descriptor & message ) ;
void ValidateExtensionDeclaration ( void ValidateExtensionDeclaration (
const std : : string & full_name , absl : : string_view full_name ,
const RepeatedPtrField < ExtensionRangeOptions_Declaration > & declarations , const RepeatedPtrField < ExtensionRangeOptions_Declaration > & declarations ,
const DescriptorProto_ExtensionRange & proto , const DescriptorProto_ExtensionRange & proto ,
absl : : flat_hash_set < absl : : string_view > & full_name_set ) ; absl : : flat_hash_set < absl : : string_view > & full_name_set ) ;
@ -4780,7 +4780,7 @@ DescriptorBuilder::DescriptorBuilder(
DescriptorBuilder : : ~ DescriptorBuilder ( ) = default ; DescriptorBuilder : : ~ DescriptorBuilder ( ) = default ;
PROTOBUF_NOINLINE void DescriptorBuilder : : AddError ( PROTOBUF_NOINLINE void DescriptorBuilder : : AddError (
const std : : string & element_name , const Message & descriptor , absl : : string_view element_name , const Message & descriptor ,
DescriptorPool : : ErrorCollector : : ErrorLocation location , DescriptorPool : : ErrorCollector : : ErrorLocation location ,
absl : : FunctionRef < std : : string ( ) > make_error ) { absl : : FunctionRef < std : : string ( ) > make_error ) {
std : : string error = make_error ( ) ; std : : string error = make_error ( ) ;
@ -4798,15 +4798,15 @@ PROTOBUF_NOINLINE void DescriptorBuilder::AddError(
} }
PROTOBUF_NOINLINE void DescriptorBuilder : : AddError ( PROTOBUF_NOINLINE void DescriptorBuilder : : AddError (
const std : : string & element_name , const Message & descriptor , absl : : string_view element_name , const Message & descriptor ,
DescriptorPool : : ErrorCollector : : ErrorLocation location , const char * error ) { DescriptorPool : : ErrorCollector : : ErrorLocation location , const char * error ) {
AddError ( element_name , descriptor , location , [ error ] { return error ; } ) ; AddError ( element_name , descriptor , location , [ error ] { return error ; } ) ;
} }
PROTOBUF_NOINLINE void DescriptorBuilder : : AddNotDefinedError ( PROTOBUF_NOINLINE void DescriptorBuilder : : AddNotDefinedError (
const std : : string & element_name , const Message & descriptor , absl : : string_view element_name , const Message & descriptor ,
DescriptorPool : : ErrorCollector : : ErrorLocation location , DescriptorPool : : ErrorCollector : : ErrorLocation location ,
const std : : string & undefined_symbol ) { absl : : string_view undefined_symbol ) {
if ( possible_undeclared_dependency_ = = nullptr & & if ( possible_undeclared_dependency_ = = nullptr & &
undefine_resolved_name_ . empty ( ) ) { undefine_resolved_name_ . empty ( ) ) {
AddError ( element_name , descriptor , location , [ & ] { AddError ( element_name , descriptor , location , [ & ] {
@ -4840,7 +4840,7 @@ PROTOBUF_NOINLINE void DescriptorBuilder::AddNotDefinedError(
} }
PROTOBUF_NOINLINE void DescriptorBuilder : : AddWarning ( PROTOBUF_NOINLINE void DescriptorBuilder : : AddWarning (
const std : : string & element_name , const Message & descriptor , absl : : string_view element_name , const Message & descriptor ,
DescriptorPool : : ErrorCollector : : ErrorLocation location , DescriptorPool : : ErrorCollector : : ErrorLocation location ,
absl : : FunctionRef < std : : string ( ) > make_error ) { absl : : FunctionRef < std : : string ( ) > make_error ) {
std : : string error = make_error ( ) ; std : : string error = make_error ( ) ;
@ -4853,7 +4853,7 @@ PROTOBUF_NOINLINE void DescriptorBuilder::AddWarning(
} }
PROTOBUF_NOINLINE void DescriptorBuilder : : AddWarning ( PROTOBUF_NOINLINE void DescriptorBuilder : : AddWarning (
const std : : string & element_name , const Message & descriptor , absl : : string_view element_name , const Message & descriptor ,
DescriptorPool : : ErrorCollector : : ErrorLocation location , const char * error ) { DescriptorPool : : ErrorCollector : : ErrorLocation location , const char * error ) {
AddWarning ( element_name , descriptor , location , AddWarning ( element_name , descriptor , location ,
[ error ] ( ) - > std : : string { return error ; } ) ; [ error ] ( ) - > std : : string { return error ; } ) ;
@ -4874,7 +4874,7 @@ void DescriptorBuilder::RecordPublicDependencies(const FileDescriptor* file) {
} }
Symbol DescriptorBuilder : : FindSymbolNotEnforcingDepsHelper ( Symbol DescriptorBuilder : : FindSymbolNotEnforcingDepsHelper (
const DescriptorPool * pool , const std : : string & name , bool build_it ) { const DescriptorPool * pool , absl : : string_view name , bool build_it ) {
// If we are looking at an underlay, we must lock its mutex_, since we are
// If we are looking at an underlay, we must lock its mutex_, since we are
// accessing the underlay's tables_ directly.
// accessing the underlay's tables_ directly.
absl : : MutexLockMaybe lock ( ( pool = = pool_ ) ? nullptr : pool - > mutex_ ) ; absl : : MutexLockMaybe lock ( ( pool = = pool_ ) ? nullptr : pool - > mutex_ ) ;
@ -4902,7 +4902,7 @@ Symbol DescriptorBuilder::FindSymbolNotEnforcingDepsHelper(
return result ; return result ;
} }
Symbol DescriptorBuilder : : FindSymbolNotEnforcingDeps ( const std : : string & name , Symbol DescriptorBuilder : : FindSymbolNotEnforcingDeps ( absl : : string_view name ,
bool build_it ) { bool build_it ) {
Symbol result = FindSymbolNotEnforcingDepsHelper ( pool_ , name , build_it ) ; Symbol result = FindSymbolNotEnforcingDepsHelper ( pool_ , name , build_it ) ;
// Only find symbols which were defined in this file or one of its
// Only find symbols which were defined in this file or one of its
@ -4914,7 +4914,7 @@ Symbol DescriptorBuilder::FindSymbolNotEnforcingDeps(const std::string& name,
return result ; return result ;
} }
Symbol DescriptorBuilder : : FindSymbol ( const std : : string & name , bool build_it ) { Symbol DescriptorBuilder : : FindSymbol ( absl : : string_view name , bool build_it ) {
Symbol result = FindSymbolNotEnforcingDeps ( name , build_it ) ; Symbol result = FindSymbolNotEnforcingDeps ( name , build_it ) ;
if ( result . IsNull ( ) ) return result ; if ( result . IsNull ( ) ) return result ;
@ -4947,12 +4947,12 @@ Symbol DescriptorBuilder::FindSymbol(const std::string& name, bool build_it) {
} }
possible_undeclared_dependency_ = file ; possible_undeclared_dependency_ = file ;
possible_undeclared_dependency_name_ = name ; possible_undeclared_dependency_name_ = std : : string ( name ) ;
return Symbol ( ) ; return Symbol ( ) ;
} }
Symbol DescriptorBuilder : : LookupSymbolNoPlaceholder ( Symbol DescriptorBuilder : : LookupSymbolNoPlaceholder (
const std : : string & name , const std : : string & relative_to , absl : : string_view name , absl : : string_view relative_to ,
ResolveMode resolve_mode , bool build_it ) { ResolveMode resolve_mode , bool build_it ) {
possible_undeclared_dependency_ = nullptr ; possible_undeclared_dependency_ = nullptr ;
undefine_resolved_name_ . clear ( ) ; undefine_resolved_name_ . clear ( ) ;
@ -4973,9 +4973,9 @@ Symbol DescriptorBuilder::LookupSymbolNoPlaceholder(
// }
// }
// So, we look for just "Foo" first, then look for "Bar.baz" within it if
// So, we look for just "Foo" first, then look for "Bar.baz" within it if
// found.
// found.
std : : string : : size_type name_dot_pos = name . find_first_of ( ' . ' ) ; auto name_dot_pos = name . find_first_of ( ' . ' ) ;
std : : string first_part_of_name ; absl : : string_view first_part_of_name ;
if ( name_dot_pos = = std : : string : : npos ) { if ( name_dot_pos = = name . npos ) {
first_part_of_name = name ; first_part_of_name = name ;
} else { } else {
first_part_of_name = name . substr ( 0 , name_dot_pos ) ; first_part_of_name = name . substr ( 0 , name_dot_pos ) ;
@ -4995,14 +4995,14 @@ Symbol DescriptorBuilder::LookupSymbolNoPlaceholder(
// Append ".first_part_of_name" and try to find.
// Append ".first_part_of_name" and try to find.
std : : string : : size_type old_size = scope_to_try . size ( ) ; std : : string : : size_type old_size = scope_to_try . size ( ) ;
scope_to_try . append ( 1 , ' . ' ) ; scope_to_try . append ( 1 , ' . ' ) ;
scope_to_try . append ( first_part_of_name ) ; scope_to_try . append ( std : : string ( first_part_of_name ) ) ;
Symbol result = FindSymbol ( scope_to_try , build_it ) ; Symbol result = FindSymbol ( scope_to_try , build_it ) ;
if ( ! result . IsNull ( ) ) { if ( ! result . IsNull ( ) ) {
if ( first_part_of_name . size ( ) < name . size ( ) ) { if ( first_part_of_name . size ( ) < name . size ( ) ) {
// name is a compound symbol, of which we only found the first part.
// name is a compound symbol, of which we only found the first part.
// Now try to look up the rest of it.
// Now try to look up the rest of it.
if ( result . IsAggregate ( ) ) { if ( result . IsAggregate ( ) ) {
scope_to_try . append ( name , first_part_of_name . size ( ) , scope_to_try . append ( std : : string ( name ) , first_part_of_name . size ( ) ,
name . size ( ) - first_part_of_name . size ( ) ) ; name . size ( ) - first_part_of_name . size ( ) ) ;
result = FindSymbol ( scope_to_try , build_it ) ; result = FindSymbol ( scope_to_try , build_it ) ;
if ( result . IsNull ( ) ) { if ( result . IsNull ( ) ) {
@ -5027,7 +5027,7 @@ Symbol DescriptorBuilder::LookupSymbolNoPlaceholder(
} }
Symbol DescriptorBuilder : : LookupSymbol ( Symbol DescriptorBuilder : : LookupSymbol (
const std : : string & name , const std : : string & relative_to , absl : : string_view name , absl : : string_view relative_to ,
DescriptorPool : : PlaceholderType placeholder_type , ResolveMode resolve_mode , DescriptorPool : : PlaceholderType placeholder_type , ResolveMode resolve_mode ,
bool build_it ) { bool build_it ) {
Symbol result = Symbol result =
@ -5224,8 +5224,8 @@ FileDescriptor* DescriptorPool::NewPlaceholderFileWithMutexHeld(
return placeholder ; return placeholder ;
} }
bool DescriptorBuilder : : AddSymbol ( const std : : string & full_name , bool DescriptorBuilder : : AddSymbol ( absl : : string_view full_name ,
const void * parent , const std : : string & name , const void * parent , absl : : string_view name ,
const Message & proto , Symbol symbol ) { const Message & proto , Symbol symbol ) {
// If the caller passed nullptr for the parent, the symbol is at file scope.
// If the caller passed nullptr for the parent, the symbol is at file scope.
// Use its file as the parent instead.
// Use its file as the parent instead.
@ -5253,8 +5253,8 @@ bool DescriptorBuilder::AddSymbol(const std::string& full_name,
} else { } else {
const FileDescriptor * other_file = tables_ - > FindSymbol ( full_name ) . GetFile ( ) ; const FileDescriptor * other_file = tables_ - > FindSymbol ( full_name ) . GetFile ( ) ;
if ( other_file = = file_ ) { if ( other_file = = file_ ) {
std : : string : : size_type dot_pos = full_name . find_last_of ( ' . ' ) ; auto dot_pos = full_name . find_last_of ( ' . ' ) ;
if ( dot_pos = = std : : string : : npos ) { if ( dot_pos = = full_name . npos ) {
AddError ( full_name , proto , DescriptorPool : : ErrorCollector : : NAME , [ & ] { AddError ( full_name , proto , DescriptorPool : : ErrorCollector : : NAME , [ & ] {
return absl : : StrCat ( " \" " , full_name , " \" is already defined. " ) ; return absl : : StrCat ( " \" " , full_name , " \" is already defined. " ) ;
} ) ; } ) ;
@ -5277,8 +5277,8 @@ bool DescriptorBuilder::AddSymbol(const std::string& full_name,
} }
} }
void DescriptorBuilder : : AddPackage ( const std : : string & name , void DescriptorBuilder : : AddPackage ( absl : : string_view name , const Message & proto ,
const Message & proto , FileDescriptor * file ) { FileDescriptor * file , bool top_level ) {
if ( absl : : StrContains ( name , ' \0 ' ) ) { if ( absl : : StrContains ( name , ' \0 ' ) ) {
AddError ( name , proto , DescriptorPool : : ErrorCollector : : NAME , [ & ] { AddError ( name , proto , DescriptorPool : : ErrorCollector : : NAME , [ & ] {
return absl : : StrCat ( " \" " , name , " \" contains null character. " ) ; return absl : : StrCat ( " \" " , name , " \" contains null character. " ) ;
@ -5289,7 +5289,8 @@ void DescriptorBuilder::AddPackage(const std::string& name,
Symbol existing_symbol = tables_ - > FindSymbol ( name ) ; Symbol existing_symbol = tables_ - > FindSymbol ( name ) ;
// It's OK to redefine a package.
// It's OK to redefine a package.
if ( existing_symbol . IsNull ( ) ) { if ( existing_symbol . IsNull ( ) ) {
if ( name . data ( ) = = file - > package ( ) . data ( ) ) { if ( top_level ) {
ABSL_DCHECK_EQ ( name , file - > package ( ) ) ;
// It is the toplevel package name, so insert the descriptor directly.
// It is the toplevel package name, so insert the descriptor directly.
tables_ - > AddSymbol ( file - > package ( ) , Symbol ( file ) ) ; tables_ - > AddSymbol ( file - > package ( ) , Symbol ( file ) ) ;
} else { } else {
@ -5301,13 +5302,13 @@ void DescriptorBuilder::AddPackage(const std::string& name,
tables_ - > AddSymbol ( name , Symbol ( package ) ) ; tables_ - > AddSymbol ( name , Symbol ( package ) ) ;
} }
// Also add parent package, if any.
// Also add parent package, if any.
std : : string : : size_type dot_pos = name . find_last_of ( ' . ' ) ; auto dot_pos = name . find_last_of ( ' . ' ) ;
if ( dot_pos = = std : : string : : npos ) { if ( dot_pos = = name . npos ) {
// No parents.
// No parents.
ValidateSymbolName ( name , name , proto ) ; ValidateSymbolName ( name , name , proto ) ;
} else { } else {
// Has parent.
// Has parent.
AddPackage ( name . substr ( 0 , dot_pos ) , proto , file ) ; AddPackage ( name . substr ( 0 , dot_pos ) , proto , file , false ) ;
ValidateSymbolName ( name . substr ( dot_pos + 1 ) , name , proto ) ; ValidateSymbolName ( name . substr ( dot_pos + 1 ) , name , proto ) ;
} }
} else if ( ! existing_symbol . IsPackage ( ) ) { } else if ( ! existing_symbol . IsPackage ( ) ) {
@ -5323,8 +5324,8 @@ void DescriptorBuilder::AddPackage(const std::string& name,
} }
} }
void DescriptorBuilder : : ValidateSymbolName ( const std : : string & name , void DescriptorBuilder : : ValidateSymbolName ( absl : : string_view name ,
const std : : string & full_name , absl : : string_view full_name ,
const Message & proto ) { const Message & proto ) {
if ( name . empty ( ) ) { if ( name . empty ( ) ) {
AddError ( full_name , proto , DescriptorPool : : ErrorCollector : : NAME , AddError ( full_name , proto , DescriptorPool : : ErrorCollector : : NAME ,
@ -5949,7 +5950,7 @@ FileDescriptor* DescriptorBuilder::BuildFileImpl(
" Exceeds Maximum Package Depth " ) ; " Exceeds Maximum Package Depth " ) ;
return nullptr ; return nullptr ;
} }
AddPackage ( result - > package ( ) , proto , result ) ; AddPackage ( result - > package ( ) , proto , result , true ) ;
} }
// Make sure all dependencies are loaded.
// Make sure all dependencies are loaded.
@ -6225,7 +6226,7 @@ FileDescriptor* DescriptorBuilder::BuildFileImpl(
const std : : string * DescriptorBuilder : : AllocateNameStrings ( const std : : string * DescriptorBuilder : : AllocateNameStrings (
const std : : string & scope , const std : : string & proto_name , absl : : string_view scope , absl : : string_view proto_name ,
internal : : FlatAllocator & alloc ) { internal : : FlatAllocator & alloc ) {
if ( scope . empty ( ) ) { if ( scope . empty ( ) ) {
return alloc . AllocateStrings ( proto_name , proto_name ) ; return alloc . AllocateStrings ( proto_name , proto_name ) ;
@ -6261,7 +6262,7 @@ void DescriptorBuilder::BuildMessage(const DescriptorProto& proto,
const Descriptor * parent , const Descriptor * parent ,
Descriptor * result , Descriptor * result ,
internal : : FlatAllocator & alloc ) { internal : : FlatAllocator & alloc ) {
const std : : string & scope = absl : : string_view scope =
( parent = = nullptr ) ? file_ - > package ( ) : parent - > full_name ( ) ; ( parent = = nullptr ) ? file_ - > package ( ) : parent - > full_name ( ) ;
result - > all_names_ = AllocateNameStrings ( scope , proto . name ( ) , alloc ) ; result - > all_names_ = AllocateNameStrings ( scope , proto . name ( ) , alloc ) ;
ValidateSymbolName ( proto . name ( ) , result - > full_name ( ) , proto ) ; ValidateSymbolName ( proto . name ( ) , result - > full_name ( ) , proto ) ;
@ -6344,7 +6345,7 @@ void DescriptorBuilder::BuildMessage(const DescriptorProto& proto,
} }
absl : : flat_hash_set < absl : : string_view > reserved_name_set ; absl : : flat_hash_set < absl : : string_view > reserved_name_set ;
for ( const std : : string & name : proto . reserved_name ( ) ) { for ( absl : : string_view name : proto . reserved_name ( ) ) {
if ( ! reserved_name_set . insert ( name ) . second ) { if ( ! reserved_name_set . insert ( name ) . second ) {
AddError ( name , proto , DescriptorPool : : ErrorCollector : : NAME , [ & ] { AddError ( name , proto , DescriptorPool : : ErrorCollector : : NAME , [ & ] {
return absl : : Substitute ( " Field name \" $0 \" is reserved multiple times. " , return absl : : Substitute ( " Field name \" $0 \" is reserved multiple times. " ,
@ -6466,7 +6467,7 @@ bool JsonNameLooksLikeExtension(std::string name) {
} // namespace
} // namespace
void DescriptorBuilder : : CheckFieldJsonNameUniqueness ( void DescriptorBuilder : : CheckFieldJsonNameUniqueness (
const std : : string & message_name , const DescriptorProto & message , absl : : string_view message_name , const DescriptorProto & message ,
const Descriptor * descriptor , bool use_custom_names ) { const Descriptor * descriptor , bool use_custom_names ) {
absl : : flat_hash_map < std : : string , JsonNameDetails > name_to_field ; absl : : flat_hash_map < std : : string , JsonNameDetails > name_to_field ;
for ( const FieldDescriptorProto & field : message . field ( ) ) { for ( const FieldDescriptorProto & field : message . field ( ) ) {
@ -6530,7 +6531,7 @@ void DescriptorBuilder::BuildFieldOrExtension(const FieldDescriptorProto& proto,
FieldDescriptor * result , FieldDescriptor * result ,
bool is_extension , bool is_extension ,
internal : : FlatAllocator & alloc ) { internal : : FlatAllocator & alloc ) {
const std : : string & scope = absl : : string_view scope =
( parent = = nullptr ) ? file_ - > package ( ) : parent - > full_name ( ) ; ( parent = = nullptr ) ? file_ - > package ( ) : parent - > full_name ( ) ;
// We allocate all names in a single array, and dedup them.
// We allocate all names in a single array, and dedup them.
@ -6966,7 +6967,7 @@ void DescriptorBuilder::BuildEnum(const EnumDescriptorProto& proto,
const Descriptor * parent , const Descriptor * parent ,
EnumDescriptor * result , EnumDescriptor * result ,
internal : : FlatAllocator & alloc ) { internal : : FlatAllocator & alloc ) {
const std : : string & scope = absl : : string_view scope =
( parent = = nullptr ) ? file_ - > package ( ) : parent - > full_name ( ) ; ( parent = = nullptr ) ? file_ - > package ( ) : parent - > full_name ( ) ;
result - > all_names_ = AllocateNameStrings ( scope , proto . name ( ) , alloc ) ; result - > all_names_ = AllocateNameStrings ( scope , proto . name ( ) , alloc ) ;
@ -7036,7 +7037,7 @@ void DescriptorBuilder::BuildEnum(const EnumDescriptorProto& proto,
} }
absl : : flat_hash_set < absl : : string_view > reserved_name_set ; absl : : flat_hash_set < absl : : string_view > reserved_name_set ;
for ( const std : : string & name : proto . reserved_name ( ) ) { for ( absl : : string_view name : proto . reserved_name ( ) ) {
if ( ! reserved_name_set . insert ( name ) . second ) { if ( ! reserved_name_set . insert ( name ) . second ) {
AddError ( name , proto , DescriptorPool : : ErrorCollector : : NAME , [ & ] { AddError ( name , proto , DescriptorPool : : ErrorCollector : : NAME , [ & ] {
return absl : : Substitute ( " Enum value \" $0 \" is reserved multiple times. " , return absl : : Substitute ( " Enum value \" $0 \" is reserved multiple times. " ,
@ -7453,7 +7454,7 @@ void DescriptorBuilder::CrossLinkField(FieldDescriptor* field,
< < proto ; < < proto ;
// Save the symbol names for later for lookup, and allocate the once
// Save the symbol names for later for lookup, and allocate the once
// object needed for the accessors.
// object needed for the accessors.
const std : : string & name = proto . type_name ( ) ; absl : : string_view name = proto . type_name ( ) ;
int name_sizes = static_cast < int > ( name . size ( ) + 1 + int name_sizes = static_cast < int > ( name . size ( ) + 1 +
proto . default_value ( ) . size ( ) + 1 ) ; proto . default_value ( ) . size ( ) + 1 ) ;
@ -7463,7 +7464,8 @@ void DescriptorBuilder::CrossLinkField(FieldDescriptor* field,
absl : : once_flag { } ; absl : : once_flag { } ;
char * names = reinterpret_cast < char * > ( field - > type_once_ + 1 ) ; char * names = reinterpret_cast < char * > ( field - > type_once_ + 1 ) ;
memcpy ( names , name . c_str ( ) , name . size ( ) + 1 ) ; memcpy ( names , name . data ( ) , name . size ( ) ) ;
names [ name . size ( ) ] = 0 ;
memcpy ( names + name . size ( ) + 1 , proto . default_value ( ) . c_str ( ) , memcpy ( names + name . size ( ) + 1 , proto . default_value ( ) . c_str ( ) ,
proto . default_value ( ) . size ( ) + 1 ) ; proto . default_value ( ) . size ( ) + 1 ) ;
@ -8284,7 +8286,7 @@ absl::optional<std::string> ValidateSymbolForDeclaration(
void DescriptorBuilder : : ValidateExtensionDeclaration ( void DescriptorBuilder : : ValidateExtensionDeclaration (
const std : : string & full_name , absl : : string_view full_name ,
const RepeatedPtrField < ExtensionRangeOptions_Declaration > & declarations , const RepeatedPtrField < ExtensionRangeOptions_Declaration > & declarations ,
const DescriptorProto_ExtensionRange & proto , const DescriptorProto_ExtensionRange & proto ,
absl : : flat_hash_set < absl : : string_view > & full_name_set ) { absl : : flat_hash_set < absl : : string_view > & full_name_set ) {
@ -8764,7 +8766,7 @@ bool DescriptorBuilder::OptionInterpreter::InterpretSingleOption(
for ( int i = 0 ; i < uninterpreted_option_ - > name_size ( ) ; + + i ) { for ( int i = 0 ; i < uninterpreted_option_ - > name_size ( ) ; + + i ) {
builder_ - > undefine_resolved_name_ . clear ( ) ; builder_ - > undefine_resolved_name_ . clear ( ) ;
const std : : string & name_part = uninterpreted_option_ - > name ( i ) . name_part ( ) ; absl : : string_view name_part = uninterpreted_option_ - > name ( i ) . name_part ( ) ;
if ( ! debug_msg_name . empty ( ) ) { if ( ! debug_msg_name . empty ( ) ) {
absl : : StrAppend ( & debug_msg_name , " . " ) ; absl : : StrAppend ( & debug_msg_name , " . " ) ;
} }
@ -9047,7 +9049,7 @@ bool DescriptorBuilder::OptionInterpreter::ExamineIfOptionIsSet(
std : : vector < const FieldDescriptor * > : : const_iterator std : : vector < const FieldDescriptor * > : : const_iterator
intermediate_fields_iter , intermediate_fields_iter ,
std : : vector < const FieldDescriptor * > : : const_iterator intermediate_fields_end , std : : vector < const FieldDescriptor * > : : const_iterator intermediate_fields_end ,
const FieldDescriptor * innermost_field , const std : : string & debug_msg_name , const FieldDescriptor * innermost_field , absl : : string_view debug_msg_name ,
const UnknownFieldSet & unknown_fields ) { const UnknownFieldSet & unknown_fields ) {
// We do linear searches of the UnknownFieldSet and its sub-groups. This
// We do linear searches of the UnknownFieldSet and its sub-groups. This
// should be fine since it's unlikely that any one options structure will
// should be fine since it's unlikely that any one options structure will
@ -9294,7 +9296,7 @@ bool DescriptorBuilder::OptionInterpreter::SetOptionValue(
} ) ; } ) ;
} }
const EnumDescriptor * enum_type = option_field - > enum_type ( ) ; const EnumDescriptor * enum_type = option_field - > enum_type ( ) ;
const std : : string & value_name = uninterpreted_option_ - > identifier_value ( ) ; absl : : string_view value_name = uninterpreted_option_ - > identifier_value ( ) ;
const EnumValueDescriptor * enum_value = nullptr ; const EnumValueDescriptor * enum_value = nullptr ;
if ( enum_type - > file ( ) - > pool ( ) ! = DescriptorPool : : generated_pool ( ) ) { if ( enum_type - > file ( ) - > pool ( ) ! = DescriptorPool : : generated_pool ( ) ) {
@ -9303,7 +9305,7 @@ bool DescriptorBuilder::OptionInterpreter::SetOptionValue(
std : : string fully_qualified_name = enum_type - > full_name ( ) ; std : : string fully_qualified_name = enum_type - > full_name ( ) ;
fully_qualified_name . resize ( fully_qualified_name . size ( ) - fully_qualified_name . resize ( fully_qualified_name . size ( ) -
enum_type - > name ( ) . size ( ) ) ; enum_type - > name ( ) . size ( ) ) ;
fully_qualified_name + = value_name ; absl : : StrAppend ( & fully_qualified_name , value_name ) ;
// Search for the enum value's descriptor in the builder's pool. Note
// Search for the enum value's descriptor in the builder's pool. Note
// that we use DescriptorBuilder::FindSymbolNotEnforcingDeps(), not
// that we use DescriptorBuilder::FindSymbolNotEnforcingDeps(), not
Protobuf Team Bot
9 months ago
committed by
Copybara-Service