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

Make Monster's Color unsigned (#5318)

Browse Source 
- update C++ monster_test::Color to unsigned type
- update Go Color:ubyte in the go_test.go
- add workaround for unsigned enum in java test
- sync generate.bat and generate.sh
This commit is contained in:
Vladimir Glavnyy
2019-05-10 00:07:38 +07:00
committed by Wouter van Oortmerssen
parent b701c7d56e
commit f9ebfcb9c4
37 changed files with 177 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
tests/monster_test_generated.h
View File

@@ -117,7 +117,7 @@ inline const Color (&EnumValuesColor())[3] {
}
inline const char * const *EnumNamesColor() {
static const char * const names[] = {
static const char * const names[9] = {
"Red",
"Green",
"",
@@ -157,7 +157,7 @@ inline const Any (&EnumValuesAny())[4] {
}
inline const char * const *EnumNamesAny() {
static const char * const names[] = {
static const char * const names[5] = {
"NONE",
"Monster",
"TestSimpleTableWithEnum",
@@ -299,7 +299,7 @@ inline const AnyUniqueAliases (&EnumValuesAnyUniqueAliases())[4] {
}
inline const char * const *EnumNamesAnyUniqueAliases() {
static const char * const names[] = {
static const char * const names[5] = {
"NONE",
"M",
"T",
@@ -441,7 +441,7 @@ inline const AnyAmbiguousAliases (&EnumValuesAnyAmbiguousAliases())[4] {
}
inline const char * const *EnumNamesAnyAmbiguousAliases() {
static const char * const names[] = {
static const char * const names[5] = {
"NONE",
"M1",
"M2",
@@ -587,7 +587,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS {
float z_;
int32_t padding0__;
double test1_;
int8_t test2_;
uint8_t test2_;
int8_t padding1__;
Test test3_;
int16_t padding2__;
@@ -605,7 +605,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS {
z_(flatbuffers::EndianScalar(_z)),
padding0__(0),
test1_(flatbuffers::EndianScalar(_test1)),
test2_(flatbuffers::EndianScalar(static_cast<int8_t>(_test2))),
test2_(flatbuffers::EndianScalar(static_cast<uint8_t>(_test2))),
padding1__(0),
test3_(_test3),
padding2__(0) {
@@ -641,7 +641,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS {
return static_cast<Color>(flatbuffers::EndianScalar(test2_));
}
void mutate_test2(Color _test2) {
flatbuffers::WriteScalar(&test2_, static_cast<int8_t>(_test2));
flatbuffers::WriteScalar(&test2_, static_cast<uint8_t>(_test2));
}
const Test &test3() const {
return test3_;
@@ -854,14 +854,14 @@ struct TestSimpleTableWithEnum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Ta
VT_COLOR = 4
};
Color color() const {
return static_cast<Color>(GetField<int8_t>(VT_COLOR, 2));
return static_cast<Color>(GetField<uint8_t>(VT_COLOR, 2));
}
bool mutate_color(Color _color) {
return SetField<int8_t>(VT_COLOR, static_cast<int8_t>(_color), 2);
return SetField<uint8_t>(VT_COLOR, static_cast<uint8_t>(_color), 2);
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyField<int8_t>(verifier, VT_COLOR) &&
VerifyField<uint8_t>(verifier, VT_COLOR) &&
verifier.EndTable();
}
TestSimpleTableWithEnumT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
@@ -873,7 +873,7 @@ struct TestSimpleTableWithEnumBuilder {
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
void add_color(Color color) {
fbb_.AddElement<int8_t>(TestSimpleTableWithEnum::VT_COLOR, static_cast<int8_t>(color), 2);
fbb_.AddElement<uint8_t>(TestSimpleTableWithEnum::VT_COLOR, static_cast<uint8_t>(color), 2);
}
explicit TestSimpleTableWithEnumBuilder(flatbuffers::FlatBufferBuilder &_fbb)
: fbb_(_fbb) {
@@ -1301,10 +1301,10 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_INVENTORY);
}
Color color() const {
return static_cast<Color>(GetField<int8_t>(VT_COLOR, 8));
return static_cast<Color>(GetField<uint8_t>(VT_COLOR, 8));
}
bool mutate_color(Color _color) {
return SetField<int8_t>(VT_COLOR, static_cast<int8_t>(_color), 8);
return SetField<uint8_t>(VT_COLOR, static_cast<uint8_t>(_color), 8);
}
Any test_type() const {
return static_cast<Any>(GetField<uint8_t>(VT_TEST_TYPE, 0));
@@ -1583,11 +1583,11 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
void *mutable_any_ambiguous() {
return GetPointer<void *>(VT_ANY_AMBIGUOUS);
}
const flatbuffers::Vector<int8_t> *vector_of_enums() const {
return GetPointer<const flatbuffers::Vector<int8_t> *>(VT_VECTOR_OF_ENUMS);
const flatbuffers::Vector<uint8_t> *vector_of_enums() const {
return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_VECTOR_OF_ENUMS);
}
flatbuffers::Vector<int8_t> *mutable_vector_of_enums() {
return GetPointer<flatbuffers::Vector<int8_t> *>(VT_VECTOR_OF_ENUMS);
flatbuffers::Vector<uint8_t> *mutable_vector_of_enums() {
return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_VECTOR_OF_ENUMS);
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
@@ -1598,7 +1598,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
verifier.VerifyString(name()) &&
VerifyOffset(verifier, VT_INVENTORY) &&
verifier.VerifyVector(inventory()) &&
VerifyField<int8_t>(verifier, VT_COLOR) &&
VerifyField<uint8_t>(verifier, VT_COLOR) &&
VerifyField<uint8_t>(verifier, VT_TEST_TYPE) &&
VerifyOffset(verifier, VT_TEST) &&
VerifyAny(verifier, test(), test_type()) &&
@@ -1718,7 +1718,7 @@ struct MonsterBuilder {
fbb_.AddOffset(Monster::VT_INVENTORY, inventory);
}
void add_color(Color color) {
fbb_.AddElement<int8_t>(Monster::VT_COLOR, static_cast<int8_t>(color), 8);
fbb_.AddElement<uint8_t>(Monster::VT_COLOR, static_cast<uint8_t>(color), 8);
}
void add_test_type(Any test_type) {
fbb_.AddElement<uint8_t>(Monster::VT_TEST_TYPE, static_cast<uint8_t>(test_type), 0);
@@ -1840,7 +1840,7 @@ struct MonsterBuilder {
void add_any_ambiguous(flatbuffers::Offset<void> any_ambiguous) {
fbb_.AddOffset(Monster::VT_ANY_AMBIGUOUS, any_ambiguous);
}
void add_vector_of_enums(flatbuffers::Offset<flatbuffers::Vector<int8_t>> vector_of_enums) {
void add_vector_of_enums(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> vector_of_enums) {
fbb_.AddOffset(Monster::VT_VECTOR_OF_ENUMS, vector_of_enums);
}
explicit MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb)
@@ -1904,7 +1904,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(
flatbuffers::Offset<void> any_unique = 0,
AnyAmbiguousAliases any_ambiguous_type = AnyAmbiguousAliases_NONE,
flatbuffers::Offset<void> any_ambiguous = 0,
flatbuffers::Offset<flatbuffers::Vector<int8_t>> vector_of_enums = 0) {
flatbuffers::Offset<flatbuffers::Vector<uint8_t>> vector_of_enums = 0) {
MonsterBuilder builder_(_fbb);
builder_.add_non_owning_reference(non_owning_reference);
builder_.add_co_owning_reference(co_owning_reference);
@@ -2004,7 +2004,7 @@ inline flatbuffers::Offset<Monster> CreateMonsterDirect(
flatbuffers::Offset<void> any_unique = 0,
AnyAmbiguousAliases any_ambiguous_type = AnyAmbiguousAliases_NONE,
flatbuffers::Offset<void> any_ambiguous = 0,
const std::vector<int8_t> *vector_of_enums = nullptr) {
const std::vector<uint8_t> *vector_of_enums = nullptr) {
auto name__ = name ? _fbb.CreateString(name) : 0;
auto inventory__ = inventory ? _fbb.CreateVector<uint8_t>(*inventory) : 0;
auto test4__ = test4 ? _fbb.CreateVectorOfStructs<Test>(*test4) : 0;
@@ -2023,7 +2023,7 @@ inline flatbuffers::Offset<Monster> CreateMonsterDirect(
auto vector_of_strong_referrables__ = vector_of_strong_referrables ? _fbb.CreateVector<flatbuffers::Offset<Referrable>>(*vector_of_strong_referrables) : 0;
auto vector_of_co_owning_references__ = vector_of_co_owning_references ? _fbb.CreateVector<uint64_t>(*vector_of_co_owning_references) : 0;
auto vector_of_non_owning_references__ = vector_of_non_owning_references ? _fbb.CreateVector<uint64_t>(*vector_of_non_owning_references) : 0;
auto vector_of_enums__ = vector_of_enums ? _fbb.CreateVector<int8_t>(*vector_of_enums) : 0;
auto vector_of_enums__ = vector_of_enums ? _fbb.CreateVector<uint8_t>(*vector_of_enums) : 0;
return MyGame::Example::CreateMonster(
_fbb,
pos,
@@ -2612,7 +2612,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
auto _any_unique = _o->any_unique.Pack(_fbb);
auto _any_ambiguous_type = _o->any_ambiguous.type;
auto _any_ambiguous = _o->any_ambiguous.Pack(_fbb);
auto _vector_of_enums = _o->vector_of_enums.size() ? _fbb.CreateVectorScalarCast<int8_t>(flatbuffers::data(_o->vector_of_enums), _o->vector_of_enums.size()) : 0;
auto _vector_of_enums = _o->vector_of_enums.size() ? _fbb.CreateVectorScalarCast<uint8_t>(flatbuffers::data(_o->vector_of_enums), _o->vector_of_enums.size()) : 0;
return MyGame::Example::CreateMonster(
_fbb,
_pos,
@@ -3058,9 +3058,9 @@ inline void AnyAmbiguousAliasesUnion::Reset() {
inline const flatbuffers::TypeTable *ColorTypeTable() {
static const flatbuffers::TypeCode type_codes[] = {
{ flatbuffers::ET_CHAR, 0, 0 },
{ flatbuffers::ET_CHAR, 0, 0 },
{ flatbuffers::ET_CHAR, 0, 0 }
{ flatbuffers::ET_UCHAR, 0, 0 },
{ flatbuffers::ET_UCHAR, 0, 0 },
{ flatbuffers::ET_UCHAR, 0, 0 }
};
static const flatbuffers::TypeFunction type_refs[] = {
ColorTypeTable
@@ -3187,7 +3187,7 @@ inline const flatbuffers::TypeTable *TestTypeTable() {
inline const flatbuffers::TypeTable *TestSimpleTableWithEnumTypeTable() {
static const flatbuffers::TypeCode type_codes[] = {
{ flatbuffers::ET_CHAR, 0, 0 }
{ flatbuffers::ET_UCHAR, 0, 0 }
};
static const flatbuffers::TypeFunction type_refs[] = {
ColorTypeTable
@@ -3207,7 +3207,7 @@ inline const flatbuffers::TypeTable *Vec3TypeTable() {
{ flatbuffers::ET_FLOAT, 0, -1 },
{ flatbuffers::ET_FLOAT, 0, -1 },
{ flatbuffers::ET_DOUBLE, 0, -1 },
{ flatbuffers::ET_CHAR, 0, 0 },
{ flatbuffers::ET_UCHAR, 0, 0 },
{ flatbuffers::ET_SEQUENCE, 0, 1 }
};
static const flatbuffers::TypeFunction type_refs[] = {
@@ -3283,7 +3283,7 @@ inline const flatbuffers::TypeTable *MonsterTypeTable() {
{ flatbuffers::ET_STRING, 0, -1 },
{ flatbuffers::ET_BOOL, 0, -1 },
{ flatbuffers::ET_UCHAR, 1, -1 },
{ flatbuffers::ET_CHAR, 0, 1 },
{ flatbuffers::ET_UCHAR, 0, 1 },
{ flatbuffers::ET_UTYPE, 0, 2 },
{ flatbuffers::ET_SEQUENCE, 0, 2 },
{ flatbuffers::ET_SEQUENCE, 1, 3 },
@@ -3324,7 +3324,7 @@ inline const flatbuffers::TypeTable *MonsterTypeTable() {
{ flatbuffers::ET_SEQUENCE, 0, 9 },
{ flatbuffers::ET_UTYPE, 0, 10 },
{ flatbuffers::ET_SEQUENCE, 0, 10 },
{ flatbuffers::ET_CHAR, 1, 1 }
{ flatbuffers::ET_UCHAR, 1, 1 }
};
static const flatbuffers::TypeFunction type_refs[] = {
Vec3TypeTable,