Rooba
/
flatbuffers
mirror of https://github.com/google/flatbuffers.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed packing structs in nested buffers (#6509)

This commit is contained in:
Kamil Rojewski 2021-03-11 20:14:23 +01:00 committed by GitHub
parent 0e453ac352
commit 6543ba5297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/idl_gen_ts.cpp
View File

@ -856,7 +856,7 @@ class TsGenerator : public BaseGenerator {
const std::string field_accessor = "this." + field_name + "()";
field_val = GenNullCheckConditional(field_accessor,
field_accessor + "!.unpack()");
field_offset_val = GenNullCheckConditional(
field_offset_decl = GenNullCheckConditional(
"this." + field_name, "this." + field_name + "!.pack(builder)",
"0");

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

@ -1284,13 +1284,16 @@ constructor(
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 inventory = Monster.createInventoryVector(builder, this.inventory);
const test = builder.createObjectOffset(this.test);
const test4 = builder.createStructOffsetList(this.test4, Monster.startTest4Vector);
const testarrayofstring = Monster.createTestarrayofstringVector(builder, builder.createObjectOffsetList(this.testarrayofstring));
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 testempty = (this.testempty !== null ? this.testempty!.pack(builder) : 0);
const testarrayofbools = Monster.createTestarrayofboolsVector(builder, this.testarrayofbools);
const testarrayofstring2 = Monster.createTestarrayofstring2Vector(builder, builder.createObjectOffsetList(this.testarrayofstring2));
const testarrayofsortedstruct = builder.createStructOffsetList(this.testarrayofsortedstruct, Monster.startTestarrayofsortedstructVector);
@ -1298,6 +1301,7 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const test5 = builder.createStructOffsetList(this.test5, Monster.startTest5Vector);
const vectorOfLongs = Monster.createVectorOfLongsVector(builder, this.vectorOfLongs);
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 vectorOfWeakReferences = Monster.createVectorOfWeakReferencesVector(builder, this.vectorOfWeakReferences);
const vectorOfStrongReferrables = Monster.createVectorOfStrongReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfStrongReferrables));
@ -1310,7 +1314,7 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const scalarKeySortedTables = Monster.createScalarKeySortedTablesVector(builder, builder.createObjectOffsetList(this.scalarKeySortedTables));
Monster.startMonster(builder);
Monster.addPos(builder, (this.pos !== null ? this.pos!.pack(builder) : 0));
Monster.addPos(builder, pos);
Monster.addMana(builder, this.mana);
Monster.addHp(builder, this.hp);
Monster.addName(builder, name);
@ -1321,9 +1325,9 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset {
Monster.addTest4(builder, test4);
Monster.addTestarrayofstring(builder, testarrayofstring);
Monster.addTestarrayoftables(builder, testarrayoftables);
Monster.addEnemy(builder, (this.enemy !== null ? this.enemy!.pack(builder) : 0));
Monster.addEnemy(builder, enemy);
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.addTesthashs32Fnv1(builder, this.testhashs32Fnv1);
Monster.addTesthashu32Fnv1(builder, this.testhashu32Fnv1);
@ -1343,7 +1347,7 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset {
Monster.addTest5(builder, test5);
Monster.addVectorOfLongs(builder, vectorOfLongs);
Monster.addVectorOfDoubles(builder, vectorOfDoubles);
Monster.addParentNamespaceTest(builder, (this.parentNamespaceTest !== null ? this.parentNamespaceTest!.pack(builder) : 0));
Monster.addParentNamespaceTest(builder, parentNamespaceTest);
Monster.addVectorOfReferrables(builder, vectorOfReferrables);
Monster.addSingleWeakReference(builder, this.singleWeakReference);
Monster.addVectorOfWeakReferences(builder, vectorOfWeakReferences);

4
tests/namespace_test/namespace-a/second-table-in-a.ts
View File

@ -70,8 +70,10 @@ constructor(
pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const referToC = (this.referToC !== null ? this.referToC!.pack(builder) : 0);
return SecondTableInA.createSecondTableInA(builder,
(this.referToC !== null ? this.referToC!.pack(builder) : 0)
referToC
);
}
}

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

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

7
tests/namespace_test/namespace-c/table-in-c.ts
View File

@ -78,9 +78,12 @@ constructor(
pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const referToA1 = (this.referToA1 !== null ? this.referToA1!.pack(builder) : 0);
const referToA2 = (this.referToA2 !== null ? this.referToA2!.pack(builder) : 0);
TableInC.startTableInC(builder);
TableInC.addReferToA1(builder, (this.referToA1 !== null ? this.referToA1!.pack(builder) : 0));
TableInC.addReferToA2(builder, (this.referToA2 !== null ? this.referToA2!.pack(builder) : 0));
TableInC.addReferToA1(builder, referToA1);
TableInC.addReferToA2(builder, referToA2);
return TableInC.endTableInC(builder);
}