BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-08 14:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "grpc/compiler: Respect filename suffix and extension during code generation (#7343)" (#7406)

Browse Source 
This reverts commit 97e89c5acd.
This commit is contained in:
Derek Bailey
2022-08-05 23:20:33 -07:00
committed by GitHub
parent ebbed05137
commit 359e0f9d66
14 changed files with 25 additions and 13596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/idl_gen_grpc.cpp
View File

@@ -242,6 +242,12 @@ class FlatBufFile : public grpc_generator::File {
return StripExtension(file_name_);
}
std::string message_header_ext() const {
return parser_.opts.filename_suffix + ".h";
}
std::string service_header_ext() const { return ".grpc.fb.h"; }
std::string package() const {
return parser_.current_namespace_->GetFullyQualifiedName("");
}
@@ -341,7 +347,6 @@ bool GenerateGoGRPC(const Parser &parser, const std::string &path,
bool GenerateCppGRPC(const Parser &parser, const std::string &path,
const std::string &file_name) {
const auto &opts = parser.opts;
int nservices = 0;
for (auto it = parser.services_.vec.begin(); it != parser.services_.vec.end();
++it) {
@@ -349,15 +354,9 @@ bool GenerateCppGRPC(const Parser &parser, const std::string &path,
}
if (!nservices) return true;
std::string suffix = "";
suffix += opts.filename_suffix.empty() ? "_generated" : opts.filename_suffix;
suffix += ".";
suffix += opts.filename_extension.empty() ? "h" : opts.filename_extension;
grpc_cpp_generator::Parameters generator_parameters;
// TODO(wvo): make the other parameters in this struct configurable.
generator_parameters.use_system_headers = true;
generator_parameters.message_header_extension = suffix;
FlatBufFile fbfile(parser, file_name, FlatBufFile::kLanguageCpp);