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

Added min/max values for enums/unions.

Browse Source 
Bug: 21642898
Change-Id: Ifaf0b3c4274fe30ef29507ba1c1216d700efe85b
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2016-01-08 14:31:26 -08:00
parent f8c1980fdf
commit e848137ded
5 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/idl_gen_cpp.cpp
View File

@@ -131,10 +131,10 @@ static std::string GenEnumDecl(const EnumDef &enum_def,
return (opts.scoped_enums ? "enum class " : "enum ") + enum_def.name;
}
static std::string GenEnumVal(const EnumDef &enum_def, const EnumVal &enum_val,
static std::string GenEnumVal(const EnumDef &enum_def,
const std::string &enum_val,
const IDLOptions &opts) {
return opts.prefixed_enums ? enum_def.name + "_" + enum_val.name
: enum_val.name;
return opts.prefixed_enums ? enum_def.name + "_" + enum_val : enum_val;
}
static std::string GetEnumVal(const EnumDef &enum_def, const EnumVal &enum_val,
@@ -159,15 +159,22 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
if (parser.opts.scoped_enums)
code += " : " + GenTypeBasic(parser, enum_def.underlying_type, false);
code += " {\n";
EnumVal *minv = nullptr, *maxv = nullptr;
for (auto it = enum_def.vals.vec.begin();
it != enum_def.vals.vec.end();
++it) {
auto &ev = **it;
GenComment(ev.doc_comment, code_ptr, nullptr, " ");
code += " " + GenEnumVal(enum_def, ev, parser.opts) + " = ";
code += NumToString(ev.value);
code += (it + 1) != enum_def.vals.vec.end() ? ",\n" : "\n";
code += " " + GenEnumVal(enum_def, ev.name, parser.opts) + " = ";
code += NumToString(ev.value) + ",\n";
minv = !minv || minv->value > ev.value ? &ev : minv;
maxv = !maxv || maxv->value < ev.value ? &ev : maxv;
}
assert(minv && maxv);
code += " " + GenEnumVal(enum_def, "MIN", parser.opts) + " = ";
code += GenEnumVal(enum_def, minv->name, parser.opts) + ",\n";
code += " " + GenEnumVal(enum_def, "MAX", parser.opts) + " = ";
code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
code += "};\n\n";
// Generate a generate string table for enum values.