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

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

19
include/flatbuffers/idl.h
View File

@@ -100,19 +100,21 @@ struct EnumDef;
// Represents any type in the IDL, which is a combination of the BaseType
// and additional information for vectors/structs_.
struct Type {
explicit Type(BaseType _base_type = BASE_TYPE_NONE, StructDef *_sd = nullptr)
explicit Type(BaseType _base_type = BASE_TYPE_NONE,
StructDef *_sd = nullptr, EnumDef *_ed = nullptr)
: base_type(_base_type),
element(BASE_TYPE_NONE),
struct_def(_sd),
enum_def(nullptr)
enum_def(_ed)
{}
Type VectorType() const { return Type(element, struct_def); }
Type VectorType() const { return Type(element, struct_def, enum_def); }
BaseType base_type;
BaseType element; // only set if t == BASE_TYPE_VECTOR
StructDef *struct_def; // only set if t or element == BASE_TYPE_STRUCT
EnumDef *enum_def; // only set if t == BASE_TYPE_UNION / BASE_TYPE_UTYPE
EnumDef *enum_def; // set if t == BASE_TYPE_UNION / BASE_TYPE_UTYPE,
// or for an integral type derived from an enum.
};
// Represents a parsed scalar value, it's type, and field offset.
@@ -220,11 +222,10 @@ struct EnumVal {
struct EnumDef : public Definition {
EnumDef() : is_union(false) {}
StructDef *ReverseLookup(int enum_idx) {
assert(is_union);
EnumVal *ReverseLookup(int enum_idx) {
for (auto it = vals.vec.begin() + 1; it != vals.vec.end(); ++it) {
if ((*it)->value == enum_idx) {
return (*it)->struct_def;
return *it;
}
}
return nullptr;
@@ -294,8 +295,10 @@ class Parser {
struct GeneratorOptions {
bool strict_json;
int indent_step;
bool output_enum_identifiers;
GeneratorOptions() : strict_json(false), indent_step(2) {}
GeneratorOptions() : strict_json(false), indent_step(2),
output_enum_identifiers(true) {}
};
// Generate text (JSON) from a given FlatBuffer, and a given Parser