BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-04 10:41:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dart - make vTable fixed size (expect the number of fields when creating) (#6735)

Browse Source
This commit is contained in:
Ivan Dlugos
2021-07-19 20:27:01 +02:00
committed by GitHub
parent dd5bb55cad
commit 65700441d3
14 changed files with 103 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dart/example/monster_my_game.sample_generated.dart
View File

@@ -220,7 +220,7 @@ class MonsterBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(10);
} }
int addPos(int offset) { int addPos(int offset) {
@@ -315,7 +315,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
final int? equippedOffset = _equipped?.getOrCreateOffset(fbBuilder); final int? equippedOffset = _equipped?.getOrCreateOffset(fbBuilder);
final int? pathOffset = _path == null ? null final int? pathOffset = _path == null ? null
: fbBuilder.writeListOfStructs(_path!); : fbBuilder.writeListOfStructs(_path!);
fbBuilder.startTable(); fbBuilder.startTable(10);
if (_pos != null) { if (_pos != null) {
fbBuilder.addStruct(0, _pos!.finish(fbBuilder)); fbBuilder.addStruct(0, _pos!.finish(fbBuilder));
} }
@@ -375,7 +375,7 @@ class WeaponBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(2);
} }
int addNameOffset(int? offset) { int addNameOffset(int? offset) {
@@ -407,7 +407,7 @@ class WeaponObjectBuilder extends fb.ObjectBuilder {
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
final int? nameOffset = fbBuilder.writeString(_name); final int? nameOffset = fbBuilder.writeString(_name);
fbBuilder.startTable(); fbBuilder.startTable(2);
fbBuilder.addOffset(0, nameOffset); fbBuilder.addOffset(0, nameOffset);
fbBuilder.addInt16(1, _damage); fbBuilder.addInt16(1, _damage);
return fbBuilder.endTable(); return fbBuilder.endTable();

48
dart/lib/flat_buffers.dart
View File

@@ -472,12 +472,12 @@ class Builder {
} }
} }
/// Start a new table. Must be finished with [endTable] invocation. /// Start a new table. Must be finished with [endTable] invocation.
void startTable() { void startTable(int numFields) {
if (_currentVTable != null) { if (_currentVTable != null) {
throw new StateError('Inline tables are not supported.'); throw new StateError('Inline tables are not supported.');
} }
_currentVTable = new _VTable(); _currentVTable = new _VTable(numFields);
_currentTableEndTail = _tail; _currentTableEndTail = _tail;
} }
@@ -1229,8 +1229,14 @@ class _FbBoolList extends _FbList<bool> {
class _VTable { class _VTable {
static const int _metadataLength = 4; static const int _metadataLength = 4;
final fieldTails = <int?>[]; final int numFields;
final fieldOffsets = <int>[];
// Note: fieldOffsets start as "tail offsets" and are then transformed by
// [computeFieldOffsets()] to actual offsets when a table is finished.
final Uint32List fieldOffsets;
bool offsetsComputed = false;
_VTable(this.numFields) : fieldOffsets = Uint32List(numFields);
/// The size of the table that uses this VTable. /// The size of the table that uses this VTable.
int tableSize = 0; int tableSize = 0;
@@ -1241,17 +1247,20 @@ class _VTable {
int get _vTableSize => numOfUint16 * _sizeofUint16; int get _vTableSize => numOfUint16 * _sizeofUint16;
int get numOfUint16 => 1 + 1 + fieldTails.length; int get numOfUint16 => 1 + 1 + numFields;
@pragma('vm:prefer-inline')
void addField(int field, int offset) { void addField(int field, int offset) {
while (fieldTails.length <= field) { assert(!offsetsComputed);
fieldTails.add(null); assert(offset > 0); // it's impossible for field to start at the buffer end
} assert(offset <= 4294967295); // uint32 max
fieldTails[field] = offset; fieldOffsets[field] = offset;
} }
@pragma('vm:prefer-inline')
bool _offsetsMatch(int vt2Start, ByteData buf) { bool _offsetsMatch(int vt2Start, ByteData buf) {
for (int i = 0; i < fieldOffsets.length; i++) { assert(offsetsComputed);
for (int i = 0; i < numFields; i++) {
if (fieldOffsets[i] != if (fieldOffsets[i] !=
buf.getUint16(vt2Start + _metadataLength + (2 * i), Endian.little)) { buf.getUint16(vt2Start + _metadataLength + (2 * i), Endian.little)) {
return false; return false;
@@ -1261,17 +1270,22 @@ class _VTable {
} }
/// Fill the [fieldOffsets] field. /// Fill the [fieldOffsets] field.
@pragma('vm:prefer-inline')
void computeFieldOffsets(int tableTail) { void computeFieldOffsets(int tableTail) {
assert(fieldOffsets.isEmpty); assert(!offsetsComputed);
for (int? fieldTail in fieldTails) { offsetsComputed = true;
int fieldOffset = fieldTail == null ? 0 : tableTail - fieldTail; for (var i = 0; i < numFields; i++) {
fieldOffsets.add(fieldOffset); if (fieldOffsets[i] != 0) {
fieldOffsets[i] = tableTail - fieldOffsets[i];
}
} }
} }
/// Outputs this VTable to [buf], which is is expected to be aligned to 16-bit /// Outputs this VTable to [buf], which is is expected to be aligned to 16-bit
/// and have at least [numOfUint16] 16-bit words available. /// and have at least [numOfUint16] 16-bit words available.
@pragma('vm:prefer-inline')
void output(ByteData buf, int bufOffset) { void output(ByteData buf, int bufOffset) {
assert(offsetsComputed);
// VTable size. // VTable size.
buf.setUint16(bufOffset, numOfUint16 * 2, Endian.little); buf.setUint16(bufOffset, numOfUint16 * 2, Endian.little);
bufOffset += 2; bufOffset += 2;
@@ -1279,8 +1293,8 @@ class _VTable {
buf.setUint16(bufOffset, tableSize, Endian.little); buf.setUint16(bufOffset, tableSize, Endian.little);
bufOffset += 2; bufOffset += 2;
// Field offsets. // Field offsets.
for (int fieldOffset in fieldOffsets) { for (int i = 0; i < numFields; i++) {
buf.setUint16(bufOffset, fieldOffset, Endian.little); buf.setUint16(bufOffset, fieldOffsets[i], Endian.little);
bufOffset += 2; bufOffset += 2;
} }
} }

22
dart/test/flat_buffers_test.dart
View File

@@ -224,15 +224,15 @@ class BuilderTest {
void test_error_startTable_duringTable() { void test_error_startTable_duringTable() {
Builder builder = new Builder(); Builder builder = new Builder();
builder.startTable(); builder.startTable(0);
expect(() { expect(() {
builder.startTable(); builder.startTable(0);
}, throwsStateError); }, throwsStateError);
} }
void test_error_writeString_duringTable() { void test_error_writeString_duringTable() {
Builder builder = new Builder(); Builder builder = new Builder();
builder.startTable(); builder.startTable(1);
expect(() { expect(() {
builder.writeString('12345'); builder.writeString('12345');
}, throwsStateError); }, throwsStateError);
@@ -242,7 +242,7 @@ class BuilderTest {
Uint8List byteList; Uint8List byteList;
{ {
Builder builder = new Builder(initialSize: 0); Builder builder = new Builder(initialSize: 0);
builder.startTable(); builder.startTable(0);
int offset = builder.endTable(); int offset = builder.endTable();
builder.finish(offset, 'Az~ÿ'); builder.finish(offset, 'Az~ÿ');
byteList = builder.buffer; byteList = builder.buffer;
@@ -298,7 +298,7 @@ class BuilderTest {
List<int> byteList; List<int> byteList;
{ {
final builder = Builder(initialSize: 0, allocator: CustomAllocator()); final builder = Builder(initialSize: 0, allocator: CustomAllocator());
builder.startTable(); builder.startTable(2);
builder.addInt32(0, 10, 10); builder.addInt32(0, 10, 10);
builder.addInt32(1, 20, 10); builder.addInt32(1, 20, 10);
int offset = builder.endTable(); int offset = builder.endTable();
@@ -325,7 +325,7 @@ class BuilderTest {
Uint8List byteList; Uint8List byteList;
{ {
builder ??= new Builder(initialSize: 0); builder ??= new Builder(initialSize: 0);
builder.startTable(); builder.startTable(3);
builder.addInt32(0, 10); builder.addInt32(0, 10);
builder.addInt32(1, 20); builder.addInt32(1, 20);
builder.addInt32(2, 30); builder.addInt32(2, 30);
@@ -362,7 +362,7 @@ class BuilderTest {
Builder builder = new Builder(initialSize: 0); Builder builder = new Builder(initialSize: 0);
int? latinStringOffset = builder.writeString(latinString); int? latinStringOffset = builder.writeString(latinString);
int? unicodeStringOffset = builder.writeString(unicodeString); int? unicodeStringOffset = builder.writeString(unicodeString);
builder.startTable(); builder.startTable(2);
builder.addOffset(0, latinStringOffset); builder.addOffset(0, latinStringOffset);
builder.addOffset(1, unicodeStringOffset); builder.addOffset(1, unicodeStringOffset);
int offset = builder.endTable(); int offset = builder.endTable();
@@ -387,7 +387,7 @@ class BuilderTest {
{ {
builder ??= new Builder(initialSize: 0); builder ??= new Builder(initialSize: 0);
int? stringOffset = builder.writeString('12345'); int? stringOffset = builder.writeString('12345');
builder.startTable(); builder.startTable(7);
builder.addBool(0, true); builder.addBool(0, true);
builder.addInt8(1, 10); builder.addInt8(1, 10);
builder.addInt32(2, 20); builder.addInt32(2, 20);
@@ -554,7 +554,7 @@ class BuilderTest {
// write the object #1 // write the object #1
int object1; int object1;
{ {
builder.startTable(); builder.startTable(2);
builder.addInt32(0, 10); builder.addInt32(0, 10);
builder.addInt32(1, 20); builder.addInt32(1, 20);
object1 = builder.endTable(); object1 = builder.endTable();
@@ -562,7 +562,7 @@ class BuilderTest {
// write the object #1 // write the object #1
int object2; int object2;
{ {
builder.startTable(); builder.startTable(2);
builder.addInt32(0, 100); builder.addInt32(0, 100);
builder.addInt32(1, 200); builder.addInt32(1, 200);
object2 = builder.endTable(); object2 = builder.endTable();
@@ -608,7 +608,7 @@ class BuilderTest {
builder ??= new Builder(initialSize: 0); builder ??= new Builder(initialSize: 0);
int listOffset = builder.writeList( int listOffset = builder.writeList(
[builder.writeString('12345')!, builder.writeString('ABC')!]); [builder.writeString('12345')!, builder.writeString('ABC')!]);
builder.startTable(); builder.startTable(1);
builder.addOffset(0, listOffset); builder.addOffset(0, listOffset);
int offset = builder.endTable(); int offset = builder.endTable();
builder.finish(offset); builder.finish(offset);

4
dart/test/monster_test_my_game.example2_generated.dart
View File

@@ -37,7 +37,7 @@ class Monster {
class MonsterT { class MonsterT {
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(0);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -62,7 +62,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
/// Finish building, and store into the [fbBuilder]. /// Finish building, and store into the [fbBuilder].
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(0);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }

30
dart/test/monster_test_my_game.example_generated.dart
View File

@@ -387,7 +387,7 @@ class TestSimpleTableWithEnumT {
this.color = Color.Green}); this.color = Color.Green});
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addUint8(0, color.value); fbBuilder.addUint8(0, color.value);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -412,7 +412,7 @@ class TestSimpleTableWithEnumBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(1);
} }
int addColor(Color? color) { int addColor(Color? color) {
@@ -436,7 +436,7 @@ class TestSimpleTableWithEnumObjectBuilder extends fb.ObjectBuilder {
/// Finish building, and store into the [fbBuilder]. /// Finish building, and store into the [fbBuilder].
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addUint8(0, _color?.value); fbBuilder.addUint8(0, _color?.value);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -847,7 +847,7 @@ class StatT {
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
final int? idOffset = fbBuilder.writeString(id); final int? idOffset = fbBuilder.writeString(id);
fbBuilder.startTable(); fbBuilder.startTable(3);
fbBuilder.addOffset(0, idOffset); fbBuilder.addOffset(0, idOffset);
fbBuilder.addInt64(1, val); fbBuilder.addInt64(1, val);
fbBuilder.addUint16(2, count); fbBuilder.addUint16(2, count);
@@ -874,7 +874,7 @@ class StatBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(3);
} }
int addIdOffset(int? offset) { int addIdOffset(int? offset) {
@@ -913,7 +913,7 @@ class StatObjectBuilder extends fb.ObjectBuilder {
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
final int? idOffset = fbBuilder.writeString(_id); final int? idOffset = fbBuilder.writeString(_id);
fbBuilder.startTable(); fbBuilder.startTable(3);
fbBuilder.addOffset(0, idOffset); fbBuilder.addOffset(0, idOffset);
fbBuilder.addInt64(1, _val); fbBuilder.addInt64(1, _val);
fbBuilder.addUint16(2, _count); fbBuilder.addUint16(2, _count);
@@ -964,7 +964,7 @@ class ReferrableT {
this.id = 0}); this.id = 0});
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addUint64(0, id); fbBuilder.addUint64(0, id);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -989,7 +989,7 @@ class ReferrableBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(1);
} }
int addId(int? id) { int addId(int? id) {
@@ -1013,7 +1013,7 @@ class ReferrableObjectBuilder extends fb.ObjectBuilder {
/// Finish building, and store into the [fbBuilder]. /// Finish building, and store into the [fbBuilder].
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addUint64(0, _id); fbBuilder.addUint64(0, _id);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -1341,7 +1341,7 @@ class MonsterT {
: fbBuilder.writeListUint8(testrequirednestedflatbuffer!); : fbBuilder.writeListUint8(testrequirednestedflatbuffer!);
final int? scalarKeySortedTablesOffset = scalarKeySortedTables == null ? null final int? scalarKeySortedTablesOffset = scalarKeySortedTables == null ? null
: fbBuilder.writeList(scalarKeySortedTables!.map((b) => b.pack(fbBuilder)).toList()); : fbBuilder.writeList(scalarKeySortedTables!.map((b) => b.pack(fbBuilder)).toList());
fbBuilder.startTable(); fbBuilder.startTable(50);
if (pos != null) { if (pos != null) {
fbBuilder.addStruct(0, pos!.pack(fbBuilder)); fbBuilder.addStruct(0, pos!.pack(fbBuilder));
} }
@@ -1417,7 +1417,7 @@ class MonsterBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(50);
} }
int addPos(int offset) { int addPos(int offset) {
@@ -1831,7 +1831,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
: fbBuilder.writeListUint8(_testrequirednestedflatbuffer!); : fbBuilder.writeListUint8(_testrequirednestedflatbuffer!);
final int? scalarKeySortedTablesOffset = _scalarKeySortedTables == null ? null final int? scalarKeySortedTablesOffset = _scalarKeySortedTables == null ? null
: fbBuilder.writeList(_scalarKeySortedTables!.map((b) => b.getOrCreateOffset(fbBuilder)).toList()); : fbBuilder.writeList(_scalarKeySortedTables!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
fbBuilder.startTable(); fbBuilder.startTable(50);
if (_pos != null) { if (_pos != null) {
fbBuilder.addStruct(0, _pos!.finish(fbBuilder)); fbBuilder.addStruct(0, _pos!.finish(fbBuilder));
} }
@@ -1979,7 +1979,7 @@ class TypeAliasesT {
: fbBuilder.writeListInt8(v8!); : fbBuilder.writeListInt8(v8!);
final int? vf64Offset = vf64 == null ? null final int? vf64Offset = vf64 == null ? null
: fbBuilder.writeListFloat64(vf64!); : fbBuilder.writeListFloat64(vf64!);
fbBuilder.startTable(); fbBuilder.startTable(12);
fbBuilder.addInt8(0, i8); fbBuilder.addInt8(0, i8);
fbBuilder.addUint8(1, u8); fbBuilder.addUint8(1, u8);
fbBuilder.addInt16(2, i16); fbBuilder.addInt16(2, i16);
@@ -2015,7 +2015,7 @@ class TypeAliasesBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(12);
} }
int addI8(int? i8) { int addI8(int? i8) {
@@ -2120,7 +2120,7 @@ class TypeAliasesObjectBuilder extends fb.ObjectBuilder {
: fbBuilder.writeListInt8(_v8!); : fbBuilder.writeListInt8(_v8!);
final int? vf64Offset = _vf64 == null ? null final int? vf64Offset = _vf64 == null ? null
: fbBuilder.writeListFloat64(_vf64!); : fbBuilder.writeListFloat64(_vf64!);
fbBuilder.startTable(); fbBuilder.startTable(12);
fbBuilder.addInt8(0, _i8); fbBuilder.addInt8(0, _i8);
fbBuilder.addUint8(1, _u8); fbBuilder.addUint8(1, _u8);
fbBuilder.addInt16(2, _i16); fbBuilder.addInt16(2, _i16);

4
dart/test/monster_test_my_game_generated.dart
View File

@@ -37,7 +37,7 @@ class InParentNamespace {
class InParentNamespaceT { class InParentNamespaceT {
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(0);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -62,7 +62,7 @@ class InParentNamespaceObjectBuilder extends fb.ObjectBuilder {
/// Finish building, and store into the [fbBuilder]. /// Finish building, and store into the [fbBuilder].
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(0);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }

6
src/idl_gen_dart.cpp
View File

@@ -850,7 +850,8 @@ class DartGenerator : public BaseGenerator {
auto &code = *code_ptr; auto &code = *code_ptr;
code += " void begin() {\n"; code += " void begin() {\n";
code += " fbBuilder.startTable();\n"; code += " fbBuilder.startTable(" +
NumToString(non_deprecated_fields.size()) + ");\n";
code += " }\n\n"; code += " }\n\n";
for (auto it = non_deprecated_fields.begin(); for (auto it = non_deprecated_fields.begin();
@@ -1071,7 +1072,8 @@ class DartGenerator : public BaseGenerator {
const std::vector<std::pair<int, FieldDef *>> &non_deprecated_fields, const std::vector<std::pair<int, FieldDef *>> &non_deprecated_fields,
bool prependUnderscore = true, bool pack = false) { bool prependUnderscore = true, bool pack = false) {
std::string code; std::string code;
code += " fbBuilder.startTable();\n"; code += " fbBuilder.startTable(" +
NumToString(non_deprecated_fields.size()) + ");\n";
for (auto it = non_deprecated_fields.begin(); for (auto it = non_deprecated_fields.begin();
it != non_deprecated_fields.end(); ++it) { it != non_deprecated_fields.end(); ++it) {

6
tests/monster_extra_my_game_generated.dart
View File

@@ -82,7 +82,7 @@ class MonsterExtraT {
: fbBuilder.writeListFloat64(dvec!); : fbBuilder.writeListFloat64(dvec!);
final int? fvecOffset = fvec == null ? null final int? fvecOffset = fvec == null ? null
: fbBuilder.writeListFloat32(fvec!); : fbBuilder.writeListFloat32(fvec!);
fbBuilder.startTable(); fbBuilder.startTable(10);
fbBuilder.addFloat64(0, d0); fbBuilder.addFloat64(0, d0);
fbBuilder.addFloat64(1, d1); fbBuilder.addFloat64(1, d1);
fbBuilder.addFloat64(2, d2); fbBuilder.addFloat64(2, d2);
@@ -116,7 +116,7 @@ class MonsterExtraBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(10);
} }
int addD0(double? d0) { int addD0(double? d0) {
@@ -207,7 +207,7 @@ class MonsterExtraObjectBuilder extends fb.ObjectBuilder {
: fbBuilder.writeListFloat64(_dvec!); : fbBuilder.writeListFloat64(_dvec!);
final int? fvecOffset = _fvec == null ? null final int? fvecOffset = _fvec == null ? null
: fbBuilder.writeListFloat32(_fvec!); : fbBuilder.writeListFloat32(_fvec!);
fbBuilder.startTable(); fbBuilder.startTable(10);
fbBuilder.addFloat64(0, _d0); fbBuilder.addFloat64(0, _d0);
fbBuilder.addFloat64(1, _d1); fbBuilder.addFloat64(1, _d1);
fbBuilder.addFloat64(2, _d2); fbBuilder.addFloat64(2, _d2);

4
tests/monster_test_my_game.example2_generated.dart
View File

@@ -37,7 +37,7 @@ class Monster {
class MonsterT { class MonsterT {
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(0);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -62,7 +62,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
/// Finish building, and store into the [fbBuilder]. /// Finish building, and store into the [fbBuilder].
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(0);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }

30
tests/monster_test_my_game.example_generated.dart
View File

@@ -387,7 +387,7 @@ class TestSimpleTableWithEnumT {
this.color = Color.Green}); this.color = Color.Green});
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addUint8(0, color.value); fbBuilder.addUint8(0, color.value);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -412,7 +412,7 @@ class TestSimpleTableWithEnumBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(1);
} }
int addColor(Color? color) { int addColor(Color? color) {
@@ -436,7 +436,7 @@ class TestSimpleTableWithEnumObjectBuilder extends fb.ObjectBuilder {
/// Finish building, and store into the [fbBuilder]. /// Finish building, and store into the [fbBuilder].
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addUint8(0, _color?.value); fbBuilder.addUint8(0, _color?.value);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -847,7 +847,7 @@ class StatT {
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
final int? idOffset = fbBuilder.writeString(id); final int? idOffset = fbBuilder.writeString(id);
fbBuilder.startTable(); fbBuilder.startTable(3);
fbBuilder.addOffset(0, idOffset); fbBuilder.addOffset(0, idOffset);
fbBuilder.addInt64(1, val); fbBuilder.addInt64(1, val);
fbBuilder.addUint16(2, count); fbBuilder.addUint16(2, count);
@@ -874,7 +874,7 @@ class StatBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(3);
} }
int addIdOffset(int? offset) { int addIdOffset(int? offset) {
@@ -913,7 +913,7 @@ class StatObjectBuilder extends fb.ObjectBuilder {
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
final int? idOffset = fbBuilder.writeString(_id); final int? idOffset = fbBuilder.writeString(_id);
fbBuilder.startTable(); fbBuilder.startTable(3);
fbBuilder.addOffset(0, idOffset); fbBuilder.addOffset(0, idOffset);
fbBuilder.addInt64(1, _val); fbBuilder.addInt64(1, _val);
fbBuilder.addUint16(2, _count); fbBuilder.addUint16(2, _count);
@@ -964,7 +964,7 @@ class ReferrableT {
this.id = 0}); this.id = 0});
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addUint64(0, id); fbBuilder.addUint64(0, id);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -989,7 +989,7 @@ class ReferrableBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(1);
} }
int addId(int? id) { int addId(int? id) {
@@ -1013,7 +1013,7 @@ class ReferrableObjectBuilder extends fb.ObjectBuilder {
/// Finish building, and store into the [fbBuilder]. /// Finish building, and store into the [fbBuilder].
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addUint64(0, _id); fbBuilder.addUint64(0, _id);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -1341,7 +1341,7 @@ class MonsterT {
: fbBuilder.writeListUint8(testrequirednestedflatbuffer!); : fbBuilder.writeListUint8(testrequirednestedflatbuffer!);
final int? scalarKeySortedTablesOffset = scalarKeySortedTables == null ? null final int? scalarKeySortedTablesOffset = scalarKeySortedTables == null ? null
: fbBuilder.writeList(scalarKeySortedTables!.map((b) => b.pack(fbBuilder)).toList()); : fbBuilder.writeList(scalarKeySortedTables!.map((b) => b.pack(fbBuilder)).toList());
fbBuilder.startTable(); fbBuilder.startTable(50);
if (pos != null) { if (pos != null) {
fbBuilder.addStruct(0, pos!.pack(fbBuilder)); fbBuilder.addStruct(0, pos!.pack(fbBuilder));
} }
@@ -1417,7 +1417,7 @@ class MonsterBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(50);
} }
int addPos(int offset) { int addPos(int offset) {
@@ -1831,7 +1831,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
: fbBuilder.writeListUint8(_testrequirednestedflatbuffer!); : fbBuilder.writeListUint8(_testrequirednestedflatbuffer!);
final int? scalarKeySortedTablesOffset = _scalarKeySortedTables == null ? null final int? scalarKeySortedTablesOffset = _scalarKeySortedTables == null ? null
: fbBuilder.writeList(_scalarKeySortedTables!.map((b) => b.getOrCreateOffset(fbBuilder)).toList()); : fbBuilder.writeList(_scalarKeySortedTables!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
fbBuilder.startTable(); fbBuilder.startTable(50);
if (_pos != null) { if (_pos != null) {
fbBuilder.addStruct(0, _pos!.finish(fbBuilder)); fbBuilder.addStruct(0, _pos!.finish(fbBuilder));
} }
@@ -1979,7 +1979,7 @@ class TypeAliasesT {
: fbBuilder.writeListInt8(v8!); : fbBuilder.writeListInt8(v8!);
final int? vf64Offset = vf64 == null ? null final int? vf64Offset = vf64 == null ? null
: fbBuilder.writeListFloat64(vf64!); : fbBuilder.writeListFloat64(vf64!);
fbBuilder.startTable(); fbBuilder.startTable(12);
fbBuilder.addInt8(0, i8); fbBuilder.addInt8(0, i8);
fbBuilder.addUint8(1, u8); fbBuilder.addUint8(1, u8);
fbBuilder.addInt16(2, i16); fbBuilder.addInt16(2, i16);
@@ -2015,7 +2015,7 @@ class TypeAliasesBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(12);
} }
int addI8(int? i8) { int addI8(int? i8) {
@@ -2120,7 +2120,7 @@ class TypeAliasesObjectBuilder extends fb.ObjectBuilder {
: fbBuilder.writeListInt8(_v8!); : fbBuilder.writeListInt8(_v8!);
final int? vf64Offset = _vf64 == null ? null final int? vf64Offset = _vf64 == null ? null
: fbBuilder.writeListFloat64(_vf64!); : fbBuilder.writeListFloat64(_vf64!);
fbBuilder.startTable(); fbBuilder.startTable(12);
fbBuilder.addInt8(0, _i8); fbBuilder.addInt8(0, _i8);
fbBuilder.addUint8(1, _u8); fbBuilder.addUint8(1, _u8);
fbBuilder.addInt16(2, _i16); fbBuilder.addInt16(2, _i16);

4
tests/monster_test_my_game_generated.dart
View File

@@ -37,7 +37,7 @@ class InParentNamespace {
class InParentNamespaceT { class InParentNamespaceT {
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(0);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -62,7 +62,7 @@ class InParentNamespaceObjectBuilder extends fb.ObjectBuilder {
/// Finish building, and store into the [fbBuilder]. /// Finish building, and store into the [fbBuilder].
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(0);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }

6
tests/namespace_test/namespace_test1_namespace_a.namespace_b_generated.dart
View File

@@ -132,7 +132,7 @@ class TableInNestedNST {
this.foo = 0}); this.foo = 0});
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addInt32(0, foo); fbBuilder.addInt32(0, foo);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -157,7 +157,7 @@ class TableInNestedNSBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(1);
} }
int addFoo(int? foo) { int addFoo(int? foo) {
@@ -181,7 +181,7 @@ class TableInNestedNSObjectBuilder extends fb.ObjectBuilder {
/// Finish building, and store into the [fbBuilder]. /// Finish building, and store into the [fbBuilder].
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addInt32(0, _foo); fbBuilder.addInt32(0, _foo);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }

12
tests/namespace_test/namespace_test2_namespace_a_generated.dart
View File

@@ -66,7 +66,7 @@ class TableInFirstNST {
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
final int? fooTableOffset = fooTable?.pack(fbBuilder); final int? fooTableOffset = fooTable?.pack(fbBuilder);
final int? fooUnionOffset = fooUnion?.pack(fbBuilder); final int? fooUnionOffset = fooUnion?.pack(fbBuilder);
fbBuilder.startTable(); fbBuilder.startTable(5);
fbBuilder.addOffset(0, fooTableOffset); fbBuilder.addOffset(0, fooTableOffset);
fbBuilder.addInt8(1, fooEnum.value); fbBuilder.addInt8(1, fooEnum.value);
fbBuilder.addUint8(2, fooUnionType?.value); fbBuilder.addUint8(2, fooUnionType?.value);
@@ -97,7 +97,7 @@ class TableInFirstNSBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(5);
} }
int addFooTableOffset(int? offset) { int addFooTableOffset(int? offset) {
@@ -151,7 +151,7 @@ class TableInFirstNSObjectBuilder extends fb.ObjectBuilder {
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
final int? fooTableOffset = _fooTable?.getOrCreateOffset(fbBuilder); final int? fooTableOffset = _fooTable?.getOrCreateOffset(fbBuilder);
final int? fooUnionOffset = _fooUnion?.getOrCreateOffset(fbBuilder); final int? fooUnionOffset = _fooUnion?.getOrCreateOffset(fbBuilder);
fbBuilder.startTable(); fbBuilder.startTable(5);
fbBuilder.addOffset(0, fooTableOffset); fbBuilder.addOffset(0, fooTableOffset);
fbBuilder.addInt8(1, _fooEnum?.value); fbBuilder.addInt8(1, _fooEnum?.value);
fbBuilder.addUint8(2, _fooUnionType?.value); fbBuilder.addUint8(2, _fooUnionType?.value);
@@ -207,7 +207,7 @@ class SecondTableInAT {
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
final int? referToCOffset = referToC?.pack(fbBuilder); final int? referToCOffset = referToC?.pack(fbBuilder);
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addOffset(0, referToCOffset); fbBuilder.addOffset(0, referToCOffset);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }
@@ -232,7 +232,7 @@ class SecondTableInABuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(1);
} }
int addReferToCOffset(int? offset) { int addReferToCOffset(int? offset) {
@@ -257,7 +257,7 @@ class SecondTableInAObjectBuilder extends fb.ObjectBuilder {
@override @override
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
final int? referToCOffset = _referToC?.getOrCreateOffset(fbBuilder); final int? referToCOffset = _referToC?.getOrCreateOffset(fbBuilder);
fbBuilder.startTable(); fbBuilder.startTable(1);
fbBuilder.addOffset(0, referToCOffset); fbBuilder.addOffset(0, referToCOffset);
return fbBuilder.endTable(); return fbBuilder.endTable();
} }

6
tests/namespace_test/namespace_test2_namespace_c_generated.dart
View File

@@ -49,7 +49,7 @@ class TableInCT {
int pack(fb.Builder fbBuilder) { int pack(fb.Builder fbBuilder) {
final int? referToA1Offset = referToA1?.pack(fbBuilder); final int? referToA1Offset = referToA1?.pack(fbBuilder);
final int? referToA2Offset = referToA2?.pack(fbBuilder); final int? referToA2Offset = referToA2?.pack(fbBuilder);
fbBuilder.startTable(); fbBuilder.startTable(2);
fbBuilder.addOffset(0, referToA1Offset); fbBuilder.addOffset(0, referToA1Offset);
fbBuilder.addOffset(1, referToA2Offset); fbBuilder.addOffset(1, referToA2Offset);
return fbBuilder.endTable(); return fbBuilder.endTable();
@@ -75,7 +75,7 @@ class TableInCBuilder {
final fb.Builder fbBuilder; final fb.Builder fbBuilder;
void begin() { void begin() {
fbBuilder.startTable(); fbBuilder.startTable(2);
} }
int addReferToA1Offset(int? offset) { int addReferToA1Offset(int? offset) {
@@ -108,7 +108,7 @@ class TableInCObjectBuilder extends fb.ObjectBuilder {
int finish(fb.Builder fbBuilder) { int finish(fb.Builder fbBuilder) {
final int? referToA1Offset = _referToA1?.getOrCreateOffset(fbBuilder); final int? referToA1Offset = _referToA1?.getOrCreateOffset(fbBuilder);
final int? referToA2Offset = _referToA2?.getOrCreateOffset(fbBuilder); final int? referToA2Offset = _referToA2?.getOrCreateOffset(fbBuilder);
fbBuilder.startTable(); fbBuilder.startTable(2);
fbBuilder.addOffset(0, referToA1Offset); fbBuilder.addOffset(0, referToA1Offset);
fbBuilder.addOffset(1, referToA2Offset); fbBuilder.addOffset(1, referToA2Offset);
return fbBuilder.endTable(); return fbBuilder.endTable();