BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-01 03:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Union verification functions were not correctly namespaced.

Browse Source 
Bug: 18908613
Change-Id: Ifed8a33b6b976b64eed9d190d930b08de1d5f41e
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2015-01-07 13:29:59 -08:00
parent b7cb91c34e
commit 352b743c71
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/idl_gen_cpp.cpp
View File

@@ -39,6 +39,12 @@ static std::string WrapInNameSpace(const Parser &parser, const Namespace *ns,
} }
} }
static std::string WrapInNameSpace(const Parser &parser,
const Definition &def) {
return WrapInNameSpace(parser, def.defined_namespace, def.name);
}
// Return a C++ type from the table in idl.h // Return a C++ type from the table in idl.h
static std::string GenTypeBasic(const Parser &parser, const Type &type, static std::string GenTypeBasic(const Parser &parser, const Type &type,
bool real_enum) { bool real_enum) {
@@ -48,8 +54,7 @@ static std::string GenTypeBasic(const Parser &parser, const Type &type,
#undef FLATBUFFERS_TD #undef FLATBUFFERS_TD
}; };
return real_enum && type.enum_def return real_enum && type.enum_def
? WrapInNameSpace(parser, type.enum_def->defined_namespace, ? WrapInNameSpace(parser, *type.enum_def)
type.enum_def->name)
: ctypename[type.base_type]; : ctypename[type.base_type];
} }
@@ -66,8 +71,7 @@ static std::string GenTypePointer(const Parser &parser, const Type &type) {
return "flatbuffers::Vector<" + return "flatbuffers::Vector<" +
GenTypeWire(parser, type.VectorType(), "", false) + ">"; GenTypeWire(parser, type.VectorType(), "", false) + ">";
case BASE_TYPE_STRUCT: { case BASE_TYPE_STRUCT: {
return WrapInNameSpace(parser, type.struct_def->defined_namespace, return WrapInNameSpace(parser, *type.struct_def);
type.struct_def->name);
} }
case BASE_TYPE_UNION: case BASE_TYPE_UNION:
// fall through // fall through
@@ -114,8 +118,8 @@ static std::string GenEnumVal(const EnumDef &enum_def, const EnumVal &enum_val,
} }
// Generate an enum declaration and an enum string lookup table. // Generate an enum declaration and an enum string lookup table.
static void GenEnum(EnumDef &enum_def, std::string *code_ptr, static void GenEnum(const Parser &parser, EnumDef &enum_def,
std::string *code_ptr_post, std::string *code_ptr, std::string *code_ptr_post,
const GeneratorOptions &opts) { const GeneratorOptions &opts) {
if (enum_def.generated) return; if (enum_def.generated) return;
std::string &code = *code_ptr; std::string &code = *code_ptr;
@@ -180,7 +184,8 @@ static void GenEnum(EnumDef &enum_def, std::string *code_ptr,
code_post += ": return true;\n"; // "NONE" enum value. code_post += ": return true;\n"; // "NONE" enum value.
} else { } else {
code_post += ": return verifier.VerifyTable(reinterpret_cast<const "; code_post += ": return verifier.VerifyTable(reinterpret_cast<const ";
code_post += ev.struct_def->name + " *>(union_obj));\n"; code_post += WrapInNameSpace(parser, *ev.struct_def);
code_post += " *>(union_obj));\n";
} }
} }
code_post += " default: return false;\n }\n}\n\n"; code_post += " default: return false;\n }\n}\n\n";
@@ -517,7 +522,7 @@ std::string GenerateCPP(const Parser &parser,
std::string enum_code, enum_code_post; std::string enum_code, enum_code_post;
for (auto it = parser.enums_.vec.begin(); for (auto it = parser.enums_.vec.begin();
it != parser.enums_.vec.end(); ++it) { it != parser.enums_.vec.end(); ++it) {
GenEnum(**it, &enum_code, &enum_code_post, opts); GenEnum(parser, **it, &enum_code, &enum_code_post, opts);
} }
// Generate forward declarations for all structs/tables, since they may // Generate forward declarations for all structs/tables, since they may
@@ -625,38 +630,39 @@ std::string GenerateCPP(const Parser &parser,
// Generate convenient global helper functions: // Generate convenient global helper functions:
if (parser.root_struct_def) { if (parser.root_struct_def) {
auto &name = parser.root_struct_def->name;
// The root datatype accessor: // The root datatype accessor:
code += "inline const " + parser.root_struct_def->name + " *Get"; code += "inline const " + name + " *Get";
code += parser.root_struct_def->name; code += name;
code += "(const void *buf) { return flatbuffers::GetRoot<"; code += "(const void *buf) { return flatbuffers::GetRoot<";
code += parser.root_struct_def->name + ">(buf); }\n\n"; code += name + ">(buf); }\n\n";
// The root verifier: // The root verifier:
code += "inline bool Verify"; code += "inline bool Verify";
code += parser.root_struct_def->name; code += name;
code += "Buffer(flatbuffers::Verifier &verifier) { " code += "Buffer(flatbuffers::Verifier &verifier) { "
"return verifier.VerifyBuffer<"; "return verifier.VerifyBuffer<";
code += parser.root_struct_def->name + ">(); }\n\n"; code += name + ">(); }\n\n";
if (parser.file_identifier_.length()) { if (parser.file_identifier_.length()) {
// Return the identifier // Return the identifier
code += "inline const char *" + parser.root_struct_def->name; code += "inline const char *" + name;
code += "Identifier() { return \"" + parser.file_identifier_; code += "Identifier() { return \"" + parser.file_identifier_;
code += "\"; }\n\n"; code += "\"; }\n\n";
// Check if a buffer has the identifier. // Check if a buffer has the identifier.
code += "inline bool " + parser.root_struct_def->name; code += "inline bool " + name;
code += "BufferHasIdentifier(const void *buf) { return flatbuffers::"; code += "BufferHasIdentifier(const void *buf) { return flatbuffers::";
code += "BufferHasIdentifier(buf, "; code += "BufferHasIdentifier(buf, ";
code += parser.root_struct_def->name + "Identifier()); }\n\n"; code += name + "Identifier()); }\n\n";
} }
// Finish a buffer with a given root object: // Finish a buffer with a given root object:
code += "inline void Finish" + parser.root_struct_def->name; code += "inline void Finish" + name;
code += "Buffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<"; code += "Buffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<";
code += parser.root_struct_def->name + "> root) { fbb.Finish(root"; code += name + "> root) { fbb.Finish(root";
if (parser.file_identifier_.length()) if (parser.file_identifier_.length())
code += ", " + parser.root_struct_def->name + "Identifier()"; code += ", " + name + "Identifier()";
code += "); }\n\n"; code += "); }\n\n";
} }