araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Contrib: Adjust protobuf generator to comply with codestyle checks on ci

Browse Source
This commit is contained in:
Shauren
2022-03-05 21:11:50 +01:00
parent 373ed8f46b
commit a7c56710f5
2 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
contrib/protoc-bnet/BnetFileGenerator.cpp
View File

@@ -201,10 +201,13 @@ void BnetFileGenerator::GenerateHeader(pb::io::Printer* printer)
"shutdownfilename", pbcpp::GlobalShutdownFileName(file_->name()));
// Generate forward declarations of classes.
for (int i = 0; i < file_->message_type_count(); i++)
message_generators_[i]->GenerateForwardDeclaration(printer);
if (file_->message_type_count() > 0)
{
for (int i = 0; i < file_->message_type_count(); i++)
message_generators_[i]->GenerateForwardDeclaration(printer);
printer->Print("\n");
printer->Print("\n");
}
// Generate enum definitions.
for (int i = 0; i < file_->message_type_count(); i++)
@@ -214,14 +217,13 @@ void BnetFileGenerator::GenerateHeader(pb::io::Printer* printer)
enum_generators_[i]->GenerateDefinition(printer);
printer->Print(pbcpp::kThickSeparator);
printer->Print("\n");
// Generate class definitions.
for (int i = 0; i < file_->message_type_count(); i++)
{
printer->Print("\n");
if (i > 0)
{
printer->Print("\n");
printer->Print(pbcpp::kThinSeparator);
printer->Print("\n");
}
@@ -230,14 +232,13 @@ void BnetFileGenerator::GenerateHeader(pb::io::Printer* printer)
printer->Print("\n");
printer->Print(pbcpp::kThickSeparator);
printer->Print("\n");
// Generate service definitions.
for (int i = 0; i < file_->service_count(); i++)
{
printer->Print("\n");
if (i > 0)
{
printer->Print("\n");
printer->Print(pbcpp::kThinSeparator);
printer->Print("\n");
}
@@ -246,32 +247,36 @@ void BnetFileGenerator::GenerateHeader(pb::io::Printer* printer)
printer->Print("\n");
printer->Print(pbcpp::kThickSeparator);
printer->Print("\n");
// Declare extension identifiers.
for (int i = 0; i < file_->extension_count(); i++)
if (file_->extension_count() > 0)
{
extension_generators_[i]->GenerateDeclaration(printer);
printer->Print("\n");
for (int i = 0; i < file_->extension_count(); i++)
{
extension_generators_[i]->GenerateDeclaration(printer);
}
}
printer->Print("\n");
printer->Print(pbcpp::kThickSeparator);
printer->Print("\n");
// Generate class inline methods.
for (int i = 0; i < file_->message_type_count(); i++)
if (file_->message_type_count() > 0)
{
if (i > 0)
printer->Print("\n");
for (int i = 0; i < file_->message_type_count(); i++)
{
printer->Print(pbcpp::kThinSeparator);
printer->Print("\n");
if (i > 0)
{
printer->Print(pbcpp::kThinSeparator);
printer->Print("\n");
}
message_generators_[i]->GenerateInlineMethods(printer);
}
message_generators_[i]->GenerateInlineMethods(printer);
}
printer->Print(
"\n"
"// @@protoc_insertion_point(namespace_scope)\n");
// Close up namespace.
@@ -287,8 +292,7 @@ void BnetFileGenerator::GenerateHeader(pb::io::Printer* printer)
printer->Print(
"\n"
"#ifndef SWIG\n"
"namespace google {\nnamespace protobuf {\n"
"\n");
"namespace google {\nnamespace protobuf {\n");
for (int i = 0; i < file_->message_type_count(); i++)
{
message_generators_[i]->GenerateGetEnumDescriptorSpecializations(printer);
@@ -298,7 +302,6 @@ void BnetFileGenerator::GenerateHeader(pb::io::Printer* printer)
enum_generators_[i]->GenerateGetEnumDescriptorSpecializations(printer);
}
printer->Print(
"\n"
"} // namespace google\n} // namespace protobuf\n"
"#endif // SWIG\n");
}
@@ -364,7 +367,10 @@ void BnetFileGenerator::GenerateSource(pb::io::Printer* printer)
GenerateNamespaceOpeners(printer);
if (pbcpp::HasDescriptorMethods(file_))
if (pbcpp::HasDescriptorMethods(file_)
&& (file_->message_type_count() > 0
|| file_->enum_type_count() > 0
|| file_->service_count() > 0))
{
printer->Print(
"\n"
@@ -390,8 +396,7 @@ void BnetFileGenerator::GenerateSource(pb::io::Printer* printer)
printer->Print(
"\n"
"} // namespace\n"
"\n");
"} // namespace\n");
}
// Define our externally-visible BuildDescriptors() function. (For the lite
@@ -407,7 +412,6 @@ void BnetFileGenerator::GenerateSource(pb::io::Printer* printer)
// Generate classes.
for (int i = 0; i < file_->message_type_count(); i++)
{
printer->Print("\n");
printer->Print(pbcpp::kThickSeparator);
printer->Print("\n");
message_generators_[i]->GenerateClassMethods(printer);
@@ -416,8 +420,6 @@ void BnetFileGenerator::GenerateSource(pb::io::Printer* printer)
// Generate services.
for (int i = 0; i < file_->service_count(); i++)
{
if (i == 0)
printer->Print("\n");
printer->Print(pbcpp::kThickSeparator);
printer->Print("\n");
service_generators_[i]->GenerateImplementation(printer);
@@ -430,7 +432,6 @@ void BnetFileGenerator::GenerateSource(pb::io::Printer* printer)
}
printer->Print(
"\n"
"// @@protoc_insertion_point(namespace_scope)\n");
GenerateNamespaceClosers(printer);

4
contrib/protoc-bnet/google/protobuf/compiler/cpp/cpp_message.cc
View File

@@ -1741,8 +1741,7 @@ GenerateOneofClear(io::Printer* printer) {
ToUpper(descriptor_->oneof_decl(i)->name()));
printer->Outdent();
printer->Print(
"}\n"
"\n");
"}\n");
}
}
@@ -2594,7 +2593,6 @@ GenerateIsInitialized(io::Printer* printer) {
}
// Now check that all embedded messages are initialized.
printer->Print("\n");
for (int i = 0; i < descriptor_->field_count(); i++) {
const FieldDescriptor* field = descriptor_->field(i);
if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&