From 35f6bb506018976a923b67fb14dd1eb5e30e08b9 Mon Sep 17 00:00:00 2001
From: Nnamdi <nnamdio@gmail.com>
Date: Tue, 29 Mar 2016 22:25:04 +0100
Subject: [PATCH] Added --gen-name-strings command line option.
To support the use case described in issue google/flatbuffers#3826, a new command line option --gen-name-strings
has been added, which will cause a static GetFullyQualifiedName function to be added
to the C++ output for tables/structs.
---
include/flatbuffers/flatbuffers.h | 8 +++++
include/flatbuffers/idl.h | 2 ++
src/flatc.cpp | 53 ++++++++++++++++---------------
src/idl_gen_cpp.cpp | 16 +++++++++-
4 files changed, 53 insertions(+), 26 deletions(-)
diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index ff9f7269..e08e9611 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -91,6 +91,14 @@
#else
#define FLATBUFFERS_FINAL_CLASS
#endif
+
+#if (!defined(_MSC_VER) || _MSC_VER >= 1900) && \
+ (!defined(__GNUC__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406))
+ #define FLATBUFFERS_CONSTEXPR constexpr
+#else
+ #define FLATBUFFERS_CONSTEXPR
+#endif
+
/// @endcond
/// @file
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index e16d3ca9..3229576c 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -321,6 +321,7 @@ struct IDLOptions {
bool proto_mode;
bool generate_all;
bool skip_unexpected_fields_in_json;
+ bool generate_name_strings;
// Possible options for the more general generator below.
enum Language { kJava, kCSharp, kGo, kMAX };
@@ -339,6 +340,7 @@ struct IDLOptions {
proto_mode(false),
generate_all(false),
skip_unexpected_fields_in_json(false),
+ generate_name_strings(false),
lang(IDLOptions::kJava) {}
};
diff --git a/src/flatc.cpp b/src/flatc.cpp
index c0696dd4..d4be151c 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -96,31 +96,32 @@ static void Error(const std::string &err, bool usage, bool show_exe_name) {
: " ",
generators[i].generator_help);
printf(
- " -o PATH Prefix PATH to all generated files.\n"
- " -I PATH Search for includes in the specified path.\n"
- " -M Print make rules for generated files.\n"
- " --version Print the version number of flatc and exit.\n"
- " --strict-json Strict JSON: field names must be / will be quoted,\n"
- " no trailing commas in tables/vectors.\n"
- " --defaults-json Output fields whose value is the default when\n"
- " writing JSON\n"
- " --unknown-json Allow fields in JSON that are not defined in the\n"
- " schema. These fields will be discared when generating\n"
- " binaries.\n"
- " --no-prefix Don\'t prefix enum values with the enum type in C++.\n"
- " --scoped-enums Use C++11 style scoped and strongly typed enums.\n"
- " also implies --no-prefix.\n"
- " --gen-includes (deprecated), this is the default behavior.\n"
- " If the original behavior is required (no include\n"
- " statements) use --no-includes.\n"
- " --no-includes Don\'t generate include statements for included\n"
- " schemas the generated file depends on (C++).\n"
- " --gen-mutable Generate accessors that can mutate buffers in-place.\n"
- " --gen-onefile Generate single output file for C#\n"
- " --raw-binary Allow binaries without file_indentifier to be read.\n"
- " This may crash flatc given a mismatched schema.\n"
- " --proto Input is a .proto, translate to .fbs.\n"
- " --schema Serialize schemas instead of JSON (use with -b)\n"
+ " -o PATH Prefix PATH to all generated files.\n"
+ " -I PATH Search for includes in the specified path.\n"
+ " -M Print make rules for generated files.\n"
+ " --version Print the version number of flatc and exit.\n"
+ " --strict-json Strict JSON: field names must be / will be quoted,\n"
+ " no trailing commas in tables/vectors.\n"
+ " --defaults-json Output fields whose value is the default when\n"
+ " writing JSON\n"
+ " --unknown-json Allow fields in JSON that are not defined in the\n"
+ " schema. These fields will be discared when generating\n"
+ " binaries.\n"
+ " --no-prefix Don\'t prefix enum values with the enum type in C++.\n"
+ " --scoped-enums Use C++11 style scoped and strongly typed enums.\n"
+ " also implies --no-prefix.\n"
+ " --gen-includes (deprecated), this is the default behavior.\n"
+ " If the original behavior is required (no include\n"
+ " statements) use --no-includes.\n"
+ " --no-includes Don\'t generate include statements for included\n"
+ " schemas the generated file depends on (C++).\n"
+ " --gen-mutable Generate accessors that can mutate buffers in-place.\n"
+ " --gen-onefile Generate single output file for C#\n"
+ " --gen-name-strings Generate type name functions for C++.\n"
+ " --raw-binary Allow binaries without file_indentifier to be read.\n"
+ " This may crash flatc given a mismatched schema.\n"
+ " --proto Input is a .proto, translate to .fbs.\n"
+ " --schema Serialize schemas instead of JSON (use with -b)\n"
"FILEs may be schemas, or JSON files (conforming to preceding schema)\n"
"FILEs after the -- must be binary flatbuffer format files.\n"
"Output files are named using the base file name of the input,\n"
@@ -171,6 +172,8 @@ int main(int argc, const char *argv[]) {
opts.scoped_enums = true;
} else if(arg == "--gen-mutable") {
opts.mutable_buffer = true;
+ } else if(arg == "--gen-name-strings") {
+ opts.generate_name_strings = true;
} else if(arg == "--gen-all") {
opts.generate_all = true;
opts.include_dependence_headers = false;
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index eb509346..cae3812d 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -267,6 +267,14 @@ std::string GenFieldOffsetName(const FieldDef &field) {
return "VT_" + uname;
}
+static void GenFullyQualifiedNameGetter(const Parser &parser, const std::string& name, std::string &code) {
+ if (parser.opts.generate_name_strings) {
+ code += " static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() {\n";
+ code += " return \"" + parser.namespaces_.back()->GetFullyQualifiedName(name) + "\";\n";
+ code += " }\n";
+ }
+}
+
// Generate an accessor struct, builder structs & function for a table.
static void GenTable(const Parser &parser, StructDef &struct_def,
std::string *code_ptr) {
@@ -277,6 +285,8 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
code += "struct " + struct_def.name;
code += " FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table";
code += " {\n";
+ // Generate GetFullyQualifiedName
+ GenFullyQualifiedNameGetter(parser, struct_def.name, code);
// Generate field id constants.
if (struct_def.fields.vec.size() > 0) {
code += " enum {\n";
@@ -583,8 +593,12 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
GenPadding(field, code, padding_id, PaddingDefinition);
}
+ // Generate GetFullyQualifiedName
+ code += "\n public:\n";
+ GenFullyQualifiedNameGetter(parser, struct_def.name, code);
+
// Generate a constructor that takes all fields as arguments.
- code += "\n public:\n " + struct_def.name + "(";
+ code += " " + struct_def.name + "(";
for (auto it = struct_def.fields.vec.begin();
it != struct_def.fields.vec.end();
++it) {
--
GitLab