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

fixed packing structs (#6530)

Browse Source 
* fixed packing structs in nested buffers

* fixed packing structs
This commit is contained in:
Kamil Rojewski
2021-03-25 18:25:00 +01:00
committed by GitHub
parent 3b7d1e86b4
commit 124654ffc4
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/idl_gen_ts.cpp
View File

@@ -856,10 +856,16 @@ class TsGenerator : public BaseGenerator {
const std::string field_accessor = "this." + field_name + "()"; const std::string field_accessor = "this." + field_name + "()";
field_val = GenNullCheckConditional(field_accessor, field_val = GenNullCheckConditional(field_accessor,
field_accessor + "!.unpack()"); field_accessor + "!.unpack()");
field_offset_decl = GenNullCheckConditional( auto packing = GenNullCheckConditional(
"this." + field_name, "this." + field_name + "!.pack(builder)", "this." + field_name, "this." + field_name + "!.pack(builder)",
"0"); "0");
if (sd.fixed) {
field_offset_val = std::move(packing);
} else {
field_offset_decl = std::move(packing);
}
break; break;
} }

3
tests/my-game/example/monster.ts
View File

@@ -1284,7 +1284,6 @@ constructor(
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const pos = (this.pos !== null ? this.pos!.pack(builder) : 0);
const name = (this.name !== null ? builder.createString(this.name!) : 0); const name = (this.name !== null ? builder.createString(this.name!) : 0);
const inventory = Monster.createInventoryVector(builder, this.inventory); const inventory = Monster.createInventoryVector(builder, this.inventory);
const test = builder.createObjectOffset(this.test); const test = builder.createObjectOffset(this.test);
@@ -1314,7 +1313,7 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const scalarKeySortedTables = Monster.createScalarKeySortedTablesVector(builder, builder.createObjectOffsetList(this.scalarKeySortedTables)); const scalarKeySortedTables = Monster.createScalarKeySortedTablesVector(builder, builder.createObjectOffsetList(this.scalarKeySortedTables));
Monster.startMonster(builder); Monster.startMonster(builder);
Monster.addPos(builder, pos); Monster.addPos(builder, (this.pos !== null ? this.pos!.pack(builder) : 0));
Monster.addMana(builder, this.mana); Monster.addMana(builder, this.mana);
Monster.addHp(builder, this.hp); Monster.addHp(builder, this.hp);
Monster.addName(builder, name); Monster.addName(builder, name);

3
tests/namespace_test/namespace-a/table-in-first-n-s.ts
View File

@@ -137,14 +137,13 @@ constructor(
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const fooTable = (this.fooTable !== null ? this.fooTable!.pack(builder) : 0); const fooTable = (this.fooTable !== null ? this.fooTable!.pack(builder) : 0);
const fooUnion = builder.createObjectOffset(this.fooUnion); const fooUnion = builder.createObjectOffset(this.fooUnion);
const fooStruct = (this.fooStruct !== null ? this.fooStruct!.pack(builder) : 0);
TableInFirstNS.startTableInFirstNS(builder); TableInFirstNS.startTableInFirstNS(builder);
TableInFirstNS.addFooTable(builder, fooTable); TableInFirstNS.addFooTable(builder, fooTable);
TableInFirstNS.addFooEnum(builder, this.fooEnum); TableInFirstNS.addFooEnum(builder, this.fooEnum);
TableInFirstNS.addFooUnionType(builder, this.fooUnionType); TableInFirstNS.addFooUnionType(builder, this.fooUnionType);
TableInFirstNS.addFooUnion(builder, fooUnion); TableInFirstNS.addFooUnion(builder, fooUnion);
TableInFirstNS.addFooStruct(builder, fooStruct); TableInFirstNS.addFooStruct(builder, (this.fooStruct !== null ? this.fooStruct!.pack(builder) : 0));
return TableInFirstNS.endTableInFirstNS(builder); return TableInFirstNS.endTableInFirstNS(builder);
} }

9
tests/ts/my-game/example/monster.ts
View File

@@ -1294,7 +1294,9 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const test4 = builder.createStructOffsetList(this.test4, Monster.startTest4Vector); const test4 = builder.createStructOffsetList(this.test4, Monster.startTest4Vector);
const testarrayofstring = Monster.createTestarrayofstringVector(builder, builder.createObjectOffsetList(this.testarrayofstring)); const testarrayofstring = Monster.createTestarrayofstringVector(builder, builder.createObjectOffsetList(this.testarrayofstring));
const testarrayoftables = Monster.createTestarrayoftablesVector(builder, builder.createObjectOffsetList(this.testarrayoftables)); const testarrayoftables = Monster.createTestarrayoftablesVector(builder, builder.createObjectOffsetList(this.testarrayoftables));
const enemy = (this.enemy !== null ? this.enemy!.pack(builder) : 0);
const testnestedflatbuffer = Monster.createTestnestedflatbufferVector(builder, this.testnestedflatbuffer); const testnestedflatbuffer = Monster.createTestnestedflatbufferVector(builder, this.testnestedflatbuffer);
const testempty = (this.testempty !== null ? this.testempty!.pack(builder) : 0);
const testarrayofbools = Monster.createTestarrayofboolsVector(builder, this.testarrayofbools); const testarrayofbools = Monster.createTestarrayofboolsVector(builder, this.testarrayofbools);
const testarrayofstring2 = Monster.createTestarrayofstring2Vector(builder, builder.createObjectOffsetList(this.testarrayofstring2)); const testarrayofstring2 = Monster.createTestarrayofstring2Vector(builder, builder.createObjectOffsetList(this.testarrayofstring2));
const testarrayofsortedstruct = builder.createStructOffsetList(this.testarrayofsortedstruct, Monster.startTestarrayofsortedstructVector); const testarrayofsortedstruct = builder.createStructOffsetList(this.testarrayofsortedstruct, Monster.startTestarrayofsortedstructVector);
@@ -1302,6 +1304,7 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const test5 = builder.createStructOffsetList(this.test5, Monster.startTest5Vector); const test5 = builder.createStructOffsetList(this.test5, Monster.startTest5Vector);
const vectorOfLongs = Monster.createVectorOfLongsVector(builder, this.vectorOfLongs); const vectorOfLongs = Monster.createVectorOfLongsVector(builder, this.vectorOfLongs);
const vectorOfDoubles = Monster.createVectorOfDoublesVector(builder, this.vectorOfDoubles); const vectorOfDoubles = Monster.createVectorOfDoublesVector(builder, this.vectorOfDoubles);
const parentNamespaceTest = (this.parentNamespaceTest !== null ? this.parentNamespaceTest!.pack(builder) : 0);
const vectorOfReferrables = Monster.createVectorOfReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfReferrables)); const vectorOfReferrables = Monster.createVectorOfReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfReferrables));
const vectorOfWeakReferences = Monster.createVectorOfWeakReferencesVector(builder, this.vectorOfWeakReferences); const vectorOfWeakReferences = Monster.createVectorOfWeakReferencesVector(builder, this.vectorOfWeakReferences);
const vectorOfStrongReferrables = Monster.createVectorOfStrongReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfStrongReferrables)); const vectorOfStrongReferrables = Monster.createVectorOfStrongReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfStrongReferrables));
@@ -1325,9 +1328,9 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset {
Monster.addTest4(builder, test4); Monster.addTest4(builder, test4);
Monster.addTestarrayofstring(builder, testarrayofstring); Monster.addTestarrayofstring(builder, testarrayofstring);
Monster.addTestarrayoftables(builder, testarrayoftables); Monster.addTestarrayoftables(builder, testarrayoftables);
Monster.addEnemy(builder, (this.enemy !== null ? this.enemy!.pack(builder) : 0)); Monster.addEnemy(builder, enemy);
Monster.addTestnestedflatbuffer(builder, testnestedflatbuffer); Monster.addTestnestedflatbuffer(builder, testnestedflatbuffer);
Monster.addTestempty(builder, (this.testempty !== null ? this.testempty!.pack(builder) : 0)); Monster.addTestempty(builder, testempty);
Monster.addTestbool(builder, this.testbool); Monster.addTestbool(builder, this.testbool);
Monster.addTesthashs32Fnv1(builder, this.testhashs32Fnv1); Monster.addTesthashs32Fnv1(builder, this.testhashs32Fnv1);
Monster.addTesthashu32Fnv1(builder, this.testhashu32Fnv1); Monster.addTesthashu32Fnv1(builder, this.testhashu32Fnv1);
@@ -1347,7 +1350,7 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset {
Monster.addTest5(builder, test5); Monster.addTest5(builder, test5);
Monster.addVectorOfLongs(builder, vectorOfLongs); Monster.addVectorOfLongs(builder, vectorOfLongs);
Monster.addVectorOfDoubles(builder, vectorOfDoubles); Monster.addVectorOfDoubles(builder, vectorOfDoubles);
Monster.addParentNamespaceTest(builder, (this.parentNamespaceTest !== null ? this.parentNamespaceTest!.pack(builder) : 0)); Monster.addParentNamespaceTest(builder, parentNamespaceTest);
Monster.addVectorOfReferrables(builder, vectorOfReferrables); Monster.addVectorOfReferrables(builder, vectorOfReferrables);
Monster.addSingleWeakReference(builder, this.singleWeakReference); Monster.addSingleWeakReference(builder, this.singleWeakReference);
Monster.addVectorOfWeakReferences(builder, vectorOfWeakReferences); Monster.addVectorOfWeakReferences(builder, vectorOfWeakReferences);