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

Merge pull request #3891 from bog-dan-ro/master

Browse Source 
More bit fields patches
This commit is contained in:
Wouter van Oortmerssen
2016-06-02 11:24:48 -07:00
parent 7d1f372ba6 3e52fecd1e
commit e02ceca54b
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/flatbuffers/flatbuffers.h
View File

@@ -1485,21 +1485,17 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
#endif // !defined(_WIN32) && !defined(__CYGWIN__) #endif // !defined(_WIN32) && !defined(__CYGWIN__)
#define DEFINE_BITMASK_OPERATORS(E)\ #define DEFINE_BITMASK_OPERATORS(E, T)\
inline E operator | (E lhs, E rhs){\ inline E operator | (E lhs, E rhs){\
using T = std::underlying_type<E>::type;\
return E(T(lhs) | T(rhs));\ return E(T(lhs) | T(rhs));\
}\ }\
inline E operator & (E lhs, E rhs){\ inline E operator & (E lhs, E rhs){\
using T = std::underlying_type<E>::type;\
return E(T(lhs) & T(rhs));\ return E(T(lhs) & T(rhs));\
}\ }\
inline E operator ^ (E lhs, E rhs){\ inline E operator ^ (E lhs, E rhs){\
using T = std::underlying_type<E>::type;\
return E(T(lhs) ^ T(rhs));\ return E(T(lhs) ^ T(rhs));\
}\ }\
inline E operator ~ (E lhs){\ inline E operator ~ (E lhs){\
using T = std::underlying_type<E>::type;\
return E(~T(lhs));\ return E(~T(lhs));\
}\ }\
inline E operator |= (E &lhs, E rhs){\ inline E operator |= (E &lhs, E rhs){\
@@ -1513,6 +1509,10 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
inline E operator ^= (E &lhs, E rhs){\ inline E operator ^= (E &lhs, E rhs){\
lhs = lhs ^ rhs;\ lhs = lhs ^ rhs;\
return lhs;\ return lhs;\
}\
inline bool operator !(E rhs) \
{\
return !bool(T(rhs)); \
} }
/// @endcond /// @endcond
} // namespace flatbuffers } // namespace flatbuffers

23
src/idl_gen_cpp.cpp
View File

@@ -166,6 +166,7 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
if (parser.opts.scoped_enums) if (parser.opts.scoped_enums)
code += " : " + GenTypeBasic(enum_def.underlying_type, false); code += " : " + GenTypeBasic(enum_def.underlying_type, false);
code += " {\n"; code += " {\n";
int64_t anyv = 0;
EnumVal *minv = nullptr, *maxv = nullptr; EnumVal *minv = nullptr, *maxv = nullptr;
for (auto it = enum_def.vals.vec.begin(); for (auto it = enum_def.vals.vec.begin();
it != enum_def.vals.vec.end(); it != enum_def.vals.vec.end();
@@ -176,15 +177,25 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
code += NumToString(ev.value) + ",\n"; code += NumToString(ev.value) + ",\n";
minv = !minv || minv->value > ev.value ? &ev : minv; minv = !minv || minv->value > ev.value ? &ev : minv;
maxv = !maxv || maxv->value < ev.value ? &ev : maxv; maxv = !maxv || maxv->value < ev.value ? &ev : maxv;
anyv |= ev.value;
}
if (parser.opts.scoped_enums || parser.opts.prefixed_enums) {
assert(minv && maxv);
if (enum_def.attributes.Lookup("bit_flags")) {
if (minv->value != 0) // If the user didn't defined NONE value
code += " " + GenEnumVal(enum_def, "NONE", parser.opts) + " = 0,\n";
if (maxv->value != anyv) // If the user didn't defined ANY value
code += " " + GenEnumVal(enum_def, "ANY", parser.opts) + " = " + NumToString(anyv) + "\n";
} else { // MIN & MAX are useless for bit_flags
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";
}
} }
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"; code += "};\n";
if (parser.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags")) if (parser.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags"))
code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ")\n"; code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ", " + GenTypeBasic(enum_def.underlying_type, false) + ")\n";
code += "\n"; code += "\n";
// Generate a generate string table for enum values. // Generate a generate string table for enum values.