BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-04 12:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

JSON Parser allows union type fields to come after unions.

Browse Source 
This is useful because many JSON generators will sort the fields,
cause X_type to follow X.

Change-Id: I00ef3ac05418224fc05aee93e6b3b3597e73ffe3
Tested: on Linux.
Bug: 29221752
This commit is contained in:
Wouter van Oortmerssen
2016-06-20 16:06:30 -07:00
parent 3639032d1e
commit 9e6c5f9f2c
5 changed files with 80 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/idl_gen_cpp.cpp
View File

@@ -604,8 +604,8 @@ class CppGenerator : public BaseGenerator {
switch (field.value.type.base_type) {
case BASE_TYPE_UNION:
code += prefix + "Verify" + field.value.type.enum_def->name;
code +=
"(verifier, " + field.name + "(), " + field.name + "_type())";
code += "(verifier, " + field.name + "(), " + field.name +
UnionTypeFieldSuffix() + "())";
break;
case BASE_TYPE_STRUCT:
if (!field.value.type.struct_def->fixed) {
@@ -868,8 +868,8 @@ class CppGenerator : public BaseGenerator {
// so that namespaces are properly opened and closed
void SetNameSpace(const Namespace *ns, std::string *code_ptr) {
if (cur_name_space_ == ns) return;
// compute the size of the longest common namespace prefix.
// if cur_name_space is A::B::C::D and ns is A::B::E::F::G,
// compute the size of the longest common namespace prefix.
// if cur_name_space is A::B::C::D and ns is A::B::E::F::G,
// the common prefix is A::B:: and we have old_size = 4, new_size = 5
// and common_prefix_size = 2
auto old_size =
@@ -881,13 +881,13 @@ class CppGenerator : public BaseGenerator {
cur_name_space_->components[common_prefix_size])
common_prefix_size++;
// close cur_name_space in reverse order to reach the common prefix
// in the previous example, D then C are closed
// in the previous example, D then C are closed
for (auto j = old_size; j > common_prefix_size; --j)
*code_ptr +=
"} // namespace " + cur_name_space_->components[j - 1] + "\n";
if (old_size != common_prefix_size) *code_ptr += "\n";
// open namespace parts to reach the ns namespace
// in the previous example, E, then F, then G are opened
// in the previous example, E, then F, then G are opened
for (auto j = common_prefix_size; j != new_size; ++j)
*code_ptr += "namespace " + ns->components[j] + " {\n";
if (new_size != common_prefix_size) *code_ptr += "\n";