Skip to content

Commit 34af7ff

Browse files
souryavarenyasouryavarenya
authored
Fix native_type non-native_inline fields, add tests (#8655)
* Fix native_type non-native_inline fields, add tests * Format * Add 'native_type_test' and 'native_inline_table_test' to generate_code.py * Remove '--gen-compare' from native_type_test generation
1 parent 518bf42 commit 34af7ff

File tree

5 files changed

+110
-11
lines changed

5 files changed

+110
-11
lines changed

‎scripts/generate_code.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,16 @@ def glob(path, pattern):
333333
schema="arrays_test.fbs",
334334
)
335335

336+
flatc(
337+
["--cpp", "--gen-mutable", "--gen-object-api", "--reflect-names"],
338+
schema="native_type_test.fbs",
339+
)
340+
341+
flatc(
342+
["--cpp", "--gen-mutable", "--gen-compare", "--gen-object-api", "--reflect-names"],
343+
schema="native_inline_table_test.fbs",
344+
)
345+
336346
flatc(
337347
RUST_OPTS,
338348
prefix="arrays_test",

‎src/idl_gen_cpp.cpp‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3217,7 +3217,13 @@ class CppGenerator : public BaseGenerator {
32173217
const auto pack_name = struct_attrs.Lookup("native_type_pack_name");
32183218
if (pack_name) { unpack_call += pack_name->constant; }
32193219
unpack_call += "(*" + val + ")";
3220-
return unpack_call;
3220+
if (invector || afield.native_inline) {
3221+
return unpack_call;
3222+
} else {
3223+
const auto name = native_type->constant;
3224+
const auto ptype = GenTypeNativePtr(name, &afield, true);
3225+
return ptype + "(new " + name + "(" + unpack_call + "))";
3226+
}
32213227
} else if (invector || afield.native_inline) {
32223228
return "*" + val;
32233229
} else {
@@ -3601,12 +3607,16 @@ class CppGenerator : public BaseGenerator {
36013607
if (IsStruct(field.value.type)) {
36023608
const auto &struct_attribs = field.value.type.struct_def->attributes;
36033609
const auto native_type = struct_attribs.Lookup("native_type");
3604-
if (native_type) {
3610+
if (native_type && field.native_inline) {
36053611
code += "::flatbuffers::Pack";
36063612
const auto pack_name =
36073613
struct_attribs.Lookup("native_type_pack_name");
36083614
if (pack_name) { code += pack_name->constant; }
36093615
code += "(" + value + ")";
3616+
} else if (native_type && !field.native_inline) {
3617+
code += WrapInNameSpace(*field.value.type.struct_def) + "{};";
3618+
code += " if (_o->" + Name(field) + ") _" + Name(field) +
3619+
" = ::flatbuffers::Pack(*_o->" + Name(field) + ")";
36103620
} else if (field.native_inline) {
36113621
code += "&" + value;
36123622
} else {
@@ -3735,16 +3745,22 @@ class CppGenerator : public BaseGenerator {
37353745
if (field->deprecated) { continue; }
37363746

37373747
bool pass_by_address = false;
3748+
bool check_ptr = false;
37383749
if (field->value.type.base_type == BASE_TYPE_STRUCT) {
37393750
if (IsStruct(field->value.type)) {
37403751
auto native_type =
37413752
field->value.type.struct_def->attributes.Lookup("native_type");
3753+
auto native_inline = field->attributes.Lookup("native_inline");
37423754
if (native_type) { pass_by_address = true; }
3755+
if (native_type && !native_inline) { check_ptr = true; }
37433756
}
37443757
}
37453758

37463759
// Call the CreateX function using values from |_o|.
3747-
if (pass_by_address) {
3760+
if (pass_by_address && check_ptr) {
3761+
code_ += ",\n _o->" + Name(*field) + " ? &_" + Name(*field) +
3762+
" : nullptr\\";
3763+
} else if (pass_by_address) {
37483764
code_ += ",\n &_" + Name(*field) + "\\";
37493765
} else {
37503766
code_ += ",\n _" + Name(*field) + "\\";

‎tests/native_type_test.fbs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ struct Vector3DAlt (native_type:"Native::Vector3D", native_type_pack_name:"Vecto
1717
table ApplicationData {
1818
vectors:[Vector3D];
1919
vectors_alt:[Vector3DAlt];
20+
position:Vector3D;
21+
position_inline:Vector3D (native_inline);
2022
}
2123

2224
root_type ApplicationData;

‎tests/native_type_test_generated.h‎

Lines changed: 69 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ struct ApplicationDataT : public ::flatbuffers::NativeTable {
117117
typedef ApplicationData TableType;
118118
std::vector<Native::Vector3D> vectors{};
119119
std::vector<Native::Vector3D> vectors_alt{};
120+
std::unique_ptr<Native::Vector3D> position{};
121+
Native::Vector3D position_inline{};
122+
ApplicationDataT() = default;
123+
ApplicationDataT(const ApplicationDataT &o);
124+
ApplicationDataT(ApplicationDataT&&) FLATBUFFERS_NOEXCEPT = default;
125+
ApplicationDataT &operator=(ApplicationDataT o) FLATBUFFERS_NOEXCEPT;
120126
};
121127

122128
struct ApplicationData FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
@@ -127,7 +133,9 @@ struct ApplicationData FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
127133
}
128134
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
129135
VT_VECTORS = 4,
130-
VT_VECTORS_ALT = 6
136+
VT_VECTORS_ALT = 6,
137+
VT_POSITION = 8,
138+
VT_POSITION_INLINE = 10
131139
};
132140
const ::flatbuffers::Vector<const Geometry::Vector3D *> *vectors() const {
133141
return GetPointer<const ::flatbuffers::Vector<const Geometry::Vector3D *> *>(VT_VECTORS);
@@ -141,12 +149,26 @@ struct ApplicationData FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
141149
::flatbuffers::Vector<const Geometry::Vector3DAlt *> *mutable_vectors_alt() {
142150
return GetPointer<::flatbuffers::Vector<const Geometry::Vector3DAlt *> *>(VT_VECTORS_ALT);
143151
}
152+
const Geometry::Vector3D *position() const {
153+
return GetStruct<const Geometry::Vector3D *>(VT_POSITION);
154+
}
155+
Geometry::Vector3D *mutable_position() {
156+
return GetStruct<Geometry::Vector3D *>(VT_POSITION);
157+
}
158+
const Geometry::Vector3D *position_inline() const {
159+
return GetStruct<const Geometry::Vector3D *>(VT_POSITION_INLINE);
160+
}
161+
Geometry::Vector3D *mutable_position_inline() {
162+
return GetStruct<Geometry::Vector3D *>(VT_POSITION_INLINE);
163+
}
144164
bool Verify(::flatbuffers::Verifier &verifier) const {
145165
return VerifyTableStart(verifier) &&
146166
VerifyOffset(verifier, VT_VECTORS) &&
147167
verifier.VerifyVector(vectors()) &&
148168
VerifyOffset(verifier, VT_VECTORS_ALT) &&
149169
verifier.VerifyVector(vectors_alt()) &&
170+
VerifyField<Geometry::Vector3D>(verifier, VT_POSITION, 4) &&
171+
VerifyField<Geometry::Vector3D>(verifier, VT_POSITION_INLINE, 4) &&
150172
verifier.EndTable();
151173
}
152174
ApplicationDataT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const;
@@ -164,6 +186,12 @@ struct ApplicationDataBuilder {
164186
void add_vectors_alt(::flatbuffers::Offset<::flatbuffers::Vector<const Geometry::Vector3DAlt *>> vectors_alt) {
165187
fbb_.AddOffset(ApplicationData::VT_VECTORS_ALT, vectors_alt);
166188
}
189+
void add_position(const Geometry::Vector3D *position) {
190+
fbb_.AddStruct(ApplicationData::VT_POSITION, position);
191+
}
192+
void add_position_inline(const Geometry::Vector3D *position_inline) {
193+
fbb_.AddStruct(ApplicationData::VT_POSITION_INLINE, position_inline);
194+
}
167195
explicit ApplicationDataBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
168196
: fbb_(_fbb) {
169197
start_ = fbb_.StartTable();
@@ -178,8 +206,12 @@ struct ApplicationDataBuilder {
178206
inline ::flatbuffers::Offset<ApplicationData> CreateApplicationData(
179207
::flatbuffers::FlatBufferBuilder &_fbb,
180208
::flatbuffers::Offset<::flatbuffers::Vector<const Geometry::Vector3D *>> vectors = 0,
181-
::flatbuffers::Offset<::flatbuffers::Vector<const Geometry::Vector3DAlt *>> vectors_alt = 0) {
209+
::flatbuffers::Offset<::flatbuffers::Vector<const Geometry::Vector3DAlt *>> vectors_alt = 0,
210+
const Geometry::Vector3D *position = nullptr,
211+
const Geometry::Vector3D *position_inline = nullptr) {
182212
ApplicationDataBuilder builder_(_fbb);
213+
builder_.add_position_inline(position_inline);
214+
builder_.add_position(position);
183215
builder_.add_vectors_alt(vectors_alt);
184216
builder_.add_vectors(vectors);
185217
return builder_.Finish();
@@ -188,17 +220,36 @@ inline ::flatbuffers::Offset<ApplicationData> CreateApplicationData(
188220
inline ::flatbuffers::Offset<ApplicationData> CreateApplicationDataDirect(
189221
::flatbuffers::FlatBufferBuilder &_fbb,
190222
const std::vector<Geometry::Vector3D> *vectors = nullptr,
191-
const std::vector<Geometry::Vector3DAlt> *vectors_alt = nullptr) {
223+
const std::vector<Geometry::Vector3DAlt> *vectors_alt = nullptr,
224+
const Geometry::Vector3D *position = nullptr,
225+
const Geometry::Vector3D *position_inline = nullptr) {
192226
auto vectors__ = vectors ? _fbb.CreateVectorOfStructs<Geometry::Vector3D>(*vectors) : 0;
193227
auto vectors_alt__ = vectors_alt ? _fbb.CreateVectorOfStructs<Geometry::Vector3DAlt>(*vectors_alt) : 0;
194228
return Geometry::CreateApplicationData(
195229
_fbb,
196230
vectors__,
197-
vectors_alt__);
231+
vectors_alt__,
232+
position,
233+
position_inline);
198234
}
199235

200236
::flatbuffers::Offset<ApplicationData> CreateApplicationData(::flatbuffers::FlatBufferBuilder &_fbb, const ApplicationDataT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr);
201237

238+
inline ApplicationDataT::ApplicationDataT(const ApplicationDataT &o)
239+
: vectors(o.vectors),
240+
vectors_alt(o.vectors_alt),
241+
position((o.position) ? new Native::Vector3D(*o.position) : nullptr),
242+
position_inline(o.position_inline) {
243+
}
244+
245+
inline ApplicationDataT &ApplicationDataT::operator=(ApplicationDataT o) FLATBUFFERS_NOEXCEPT {
246+
std::swap(vectors, o.vectors);
247+
std::swap(vectors_alt, o.vectors_alt);
248+
std::swap(position, o.position);
249+
std::swap(position_inline, o.position_inline);
250+
return *this;
251+
}
252+
202253
inline ApplicationDataT *ApplicationData::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const {
203254
auto _o = std::unique_ptr<ApplicationDataT>(new ApplicationDataT());
204255
UnPackTo(_o.get(), _resolver);
@@ -210,6 +261,8 @@ inline void ApplicationData::UnPackTo(ApplicationDataT *_o, const ::flatbuffers:
210261
(void)_resolver;
211262
{ auto _e = vectors(); if (_e) { _o->vectors.resize(_e->size()); for (::flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->vectors[_i] = ::flatbuffers::UnPack(*_e->Get(_i)); } } else { _o->vectors.resize(0); } }
212263
{ auto _e = vectors_alt(); if (_e) { _o->vectors_alt.resize(_e->size()); for (::flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->vectors_alt[_i] = ::flatbuffers::UnPackVector3DAlt(*_e->Get(_i)); } } else { _o->vectors_alt.resize(0); } }
264+
{ auto _e = position(); if (_e) _o->position = std::unique_ptr<Native::Vector3D>(new Native::Vector3D(::flatbuffers::UnPack(*_e))); }
265+
{ auto _e = position_inline(); if (_e) _o->position_inline = ::flatbuffers::UnPack(*_e); }
213266
}
214267

215268
inline ::flatbuffers::Offset<ApplicationData> ApplicationData::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const ApplicationDataT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) {
@@ -222,10 +275,14 @@ inline ::flatbuffers::Offset<ApplicationData> CreateApplicationData(::flatbuffer
222275
struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const ApplicationDataT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
223276
auto _vectors = _o->vectors.size() ? _fbb.CreateVectorOfNativeStructs<Geometry::Vector3D, Native::Vector3D>(_o->vectors) : 0;
224277
auto _vectors_alt = _o->vectors_alt.size() ? _fbb.CreateVectorOfNativeStructs<Geometry::Vector3DAlt, Native::Vector3D>(_o->vectors_alt, ::flatbuffers::PackVector3DAlt) : 0;
278+
auto _position = Geometry::Vector3D{}; if (_o->position) _position = ::flatbuffers::Pack(*_o->position);
279+
auto _position_inline = ::flatbuffers::Pack(_o->position_inline);
225280
return Geometry::CreateApplicationData(
226281
_fbb,
227282
_vectors,
228-
_vectors_alt);
283+
_vectors_alt,
284+
_o->position ? &_position : nullptr,
285+
&_position_inline);
229286
}
230287

231288
inline const ::flatbuffers::TypeTable *Vector3DTypeTable() {
@@ -267,18 +324,22 @@ inline const ::flatbuffers::TypeTable *Vector3DAltTypeTable() {
267324
inline const ::flatbuffers::TypeTable *ApplicationDataTypeTable() {
268325
static const ::flatbuffers::TypeCode type_codes[] = {
269326
{ ::flatbuffers::ET_SEQUENCE, 1, 0 },
270-
{ ::flatbuffers::ET_SEQUENCE, 1, 1 }
327+
{ ::flatbuffers::ET_SEQUENCE, 1, 1 },
328+
{ ::flatbuffers::ET_SEQUENCE, 0, 0 },
329+
{ ::flatbuffers::ET_SEQUENCE, 0, 0 }
271330
};
272331
static const ::flatbuffers::TypeFunction type_refs[] = {
273332
Geometry::Vector3DTypeTable,
274333
Geometry::Vector3DAltTypeTable
275334
};
276335
static const char * const names[] = {
277336
"vectors",
278-
"vectors_alt"
337+
"vectors_alt",
338+
"position",
339+
"position_inline"
279340
};
280341
static const ::flatbuffers::TypeTable tt = {
281-
::flatbuffers::ST_TABLE, 2, type_codes, type_refs, nullptr, nullptr, names
342+
::flatbuffers::ST_TABLE, 4, type_codes, type_refs, nullptr, nullptr, names
282343
};
283344
return &tt;
284345
}

‎tests/test.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -909,6 +909,9 @@ void NativeTypeTest() {
909909
const int N = 3;
910910

911911
Geometry::ApplicationDataT src_data;
912+
src_data.position = flatbuffers::unique_ptr<Native::Vector3D>(
913+
new Native::Vector3D(1.0f, 2.0f, 3.0f));
914+
src_data.position_inline = Native::Vector3D(4.0f, 5.0f, 6.0f);
912915
src_data.vectors.reserve(N);
913916
src_data.vectors_alt.reserve(N);
914917

@@ -924,6 +927,13 @@ void NativeTypeTest() {
924927

925928
auto dstDataT = Geometry::UnPackApplicationData(fbb.GetBufferPointer());
926929

930+
TEST_EQ(dstDataT->position->x, 1.0f);
931+
TEST_EQ(dstDataT->position->y, 2.0f);
932+
TEST_EQ(dstDataT->position->z, 3.0f);
933+
TEST_EQ(dstDataT->position_inline.x, 4.0f);
934+
TEST_EQ(dstDataT->position_inline.y, 5.0f);
935+
TEST_EQ(dstDataT->position_inline.z, 6.0f);
936+
927937
for (int i = 0; i < N; ++i) {
928938
const Native::Vector3D &v = dstDataT->vectors[i];
929939
TEST_EQ(v.x, 10 * i + 0.1f);

0 commit comments

Comments
 (0)