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

JSON parsing & text generation is now enum-identifier aware.

Browse Source 
When Parsing JSON, it will read enums either as int values, identifiers
specific to the enum type, or strings containing those identifiers.

When generating text, it will output enum identifiers by default
(this can be turned off in favor of integers, like before).

Change-Id: If28b0a1f8f27de79aff3e626f40c0c0b271c325a
Tested: on Windows and Linux
Bug: 16214968
This commit is contained in:
Wouter van Oortmerssen
2014-07-14 17:49:04 -07:00
parent 2811a3eac8
commit 3fb6a86d02
6 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/idl_gen_text.cpp
View File

@@ -32,14 +32,30 @@ const char *NewLine(int indent_step) {
return indent_step >= 0 ? "\n" : "";
}
// Output an identifier with or without quotes depending on strictness.
void OutputIdentifier(const std::string &name, const GeneratorOptions &opts,
std::string *_text) {
std::string &text = *_text;
if (opts.strict_json) text += "\"";
text += name;
if (opts.strict_json) text += "\"";
}
// Print (and its template specialization below for pointers) generate text
// for a single FlatBuffer value into JSON format.
// The general case for scalars:
template<typename T> void Print(T val, Type /*type*/, int /*indent*/,
template<typename T> void Print(T val, Type type, int /*indent*/,
StructDef * /*union_sd*/,
const GeneratorOptions & /*opts*/,
const GeneratorOptions &opts,
std::string *_text) {
std::string &text = *_text;
if (type.enum_def && opts.output_enum_identifiers) {
auto enum_val = type.enum_def->ReverseLookup(static_cast<int>(val));
if (enum_val) {
OutputIdentifier(enum_val->name, opts, _text);
return;
}
}
text += NumToString(val);
}
@@ -188,9 +204,7 @@ static void GenStruct(const StructDef &struct_def, const Table *table,
text += NewLine(opts.indent_step);
}
text.append(indent + opts.indent_step, ' ');
if (opts.strict_json) text += "\"";
text += fd.name;
if (opts.strict_json) text += "\"";
OutputIdentifier(fd.name, opts, _text);
text += ": ";
switch (fd.value.type.base_type) {
#define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE) \
@@ -210,8 +224,10 @@ static void GenStruct(const StructDef &struct_def, const Table *table,
break;
}
if (fd.value.type.base_type == BASE_TYPE_UTYPE) {
union_sd = fd.value.type.enum_def->ReverseLookup(
auto enum_val = fd.value.type.enum_def->ReverseLookup(
table->GetField<uint8_t>(fd.value.offset, 0));
assert(enum_val);
union_sd = enum_val->struct_def;
}
}
}