BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-01 18:03:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dart - finish/lowFinish/buffer changes (#6712)

Browse Source 
* Dart - change Builder "lowFinish()" to "buffer" and "finish()" to not void return

Aligning the API with other languages, e.g. c++ and allowing custom use-cases to avoid creating a Uint8List

* Dart - change builder.buffer to check that finish() was already called

* Dart - builder - move !finished assertion to _prepare() which is run from all other functions
This commit is contained in:
Ivan Dlugos
2021-07-09 20:45:45 +02:00
committed by GitHub
parent 7482b25f8b
commit 92ae532e43
13 changed files with 134 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dart/lib/flat_buffers.dart
View File

@@ -103,6 +103,8 @@ abstract class ObjectBuilder {
/// Class that helps building flat buffers. /// Class that helps building flat buffers.
class Builder { class Builder {
bool _finished = false;
final int initialSize; final int initialSize;
/// The list of existing VTable(s). /// The list of existing VTable(s).
@@ -336,11 +338,9 @@ class Builder {
return tableTail; return tableTail;
} }
/// This method low level method can be used to return a raw piece of the /// Returns the finished buffer. You must call [finish] before accessing this.
/// buffer after using the put* methods. Uint8List get buffer {
/// assert(_finished);
/// Most clients should prefer calling [finish].
Uint8List lowFinish() {
final finishedSize = size(); final finishedSize = size();
return _buf.buffer return _buf.buffer
.asUint8List(_buf.lengthInBytes - finishedSize, finishedSize); .asUint8List(_buf.lengthInBytes - finishedSize, finishedSize);
@@ -351,7 +351,7 @@ class Builder {
/// written object. If [fileIdentifier] is specified (and not `null`), it is /// written object. If [fileIdentifier] is specified (and not `null`), it is
/// interpreted as a 4-byte Latin-1 encoded string that should be placed at /// interpreted as a 4-byte Latin-1 encoded string that should be placed at
/// bytes 4-7 of the file. /// bytes 4-7 of the file.
Uint8List finish(int offset, [String? fileIdentifier]) { void finish(int offset, [String? fileIdentifier]) {
final sizeBeforePadding = size(); final sizeBeforePadding = size();
final requiredBytes = _sizeofUint32 * (fileIdentifier == null ? 1 : 2); final requiredBytes = _sizeofUint32 * (fileIdentifier == null ? 1 : 2);
_prepare(max(requiredBytes, _maxAlign), 1); _prepare(max(requiredBytes, _maxAlign), 1);
@@ -370,9 +370,7 @@ class Builder {
i++) { i++) {
_setUint8AtTail(_buf, i, 0); _setUint8AtTail(_buf, i, 0);
} }
_finished = true;
return _buf.buffer
.asUint8List(_buf.lengthInBytes - finishedSize, finishedSize);
} }
/// Writes a Float64 to the tail of the buffer after preparing space for it. /// Writes a Float64 to the tail of the buffer after preparing space for it.
@@ -457,6 +455,7 @@ class Builder {
/// Reset the builder and make it ready for filling a new buffer. /// Reset the builder and make it ready for filling a new buffer.
void reset() { void reset() {
_finished = false;
_maxAlign = 1; _maxAlign = 1;
_tail = 0; _tail = 0;
_currentVTable = null; _currentVTable = null;
@@ -719,6 +718,7 @@ class Builder {
/// Additionally allocate the specified `additionalBytes`. Update the current /// Additionally allocate the specified `additionalBytes`. Update the current
/// tail pointer to point at the allocated space. /// tail pointer to point at the allocated space.
void _prepare(int size, int count, {int additionalBytes = 0}) { void _prepare(int size, int count, {int additionalBytes = 0}) {
assert(!_finished);
// Update the alignment. // Update the alignment.
if (_maxAlign < size) { if (_maxAlign < size) {
_maxAlign = size; _maxAlign = size;

100
dart/test/flat_buffers_test.dart
View File

@@ -136,12 +136,16 @@ class CheckOtherLangaugesData {
/// Test a custom, fixed-memory allocator (no actual allocations performed) /// Test a custom, fixed-memory allocator (no actual allocations performed)
class CustomAllocator extends Allocator { class CustomAllocator extends Allocator {
final _memory = ByteData(10 * 1024); final _memory = ByteData(10 * 1024);
int _used = 0;
Uint8List buffer(int size) => _memory.buffer.asUint8List(_used - size, size);
@override @override
ByteData allocate(int size) { ByteData allocate(int size) {
if (size > _memory.lengthInBytes) { if (size > _memory.lengthInBytes) {
throw UnsupportedError('Trying to allocate too much'); throw UnsupportedError('Trying to allocate too much');
} }
_used = size;
return ByteData.sublistView(_memory, 0, size); return ByteData.sublistView(_memory, 0, size);
} }
@@ -240,7 +244,8 @@ class BuilderTest {
Builder builder = new Builder(initialSize: 0); Builder builder = new Builder(initialSize: 0);
builder.startTable(); builder.startTable();
int offset = builder.endTable(); int offset = builder.endTable();
byteList = builder.finish(offset, 'Az~ÿ'); builder.finish(offset, 'Az~ÿ');
byteList = builder.buffer;
} }
// Convert byteList to a ByteData so that we can read data from it. // Convert byteList to a ByteData so that we can read data from it.
ByteData byteData = byteList.buffer.asByteData(byteList.offsetInBytes); ByteData byteData = byteList.buffer.asByteData(byteList.offsetInBytes);
@@ -263,16 +268,29 @@ class BuilderTest {
} }
void test_low() { void test_low() {
final builder = Builder(initialSize: 0, allocator: CustomAllocator()); final allocator = CustomAllocator();
expect((builder..putUint8(1)).lowFinish(), [1]); final builder = Builder(initialSize: 0, allocator: allocator);
expect((builder..putUint32(2)).lowFinish(), [2, 0, 0, 0, 0, 0, 0, 1]);
expect((builder..putUint8(3)).lowFinish(), builder.putUint8(1);
[0, 0, 0, 3, 2, 0, 0, 0, 0, 0, 0, 1]); expect(allocator.buffer(builder.size()), [1]);
expect((builder..putUint8(4)).lowFinish(),
[0, 0, 4, 3, 2, 0, 0, 0, 0, 0, 0, 1]); builder.putUint32(2);
expect((builder..putUint8(5)).lowFinish(), expect(allocator.buffer(builder.size()), [2, 0, 0, 0, 0, 0, 0, 1]);
[0, 5, 4, 3, 2, 0, 0, 0, 0, 0, 0, 1]);
expect((builder..putUint32(6)).lowFinish(), builder.putUint8(3);
expect(
allocator.buffer(builder.size()), [0, 0, 0, 3, 2, 0, 0, 0, 0, 0, 0, 1]);
builder.putUint8(4);
expect(
allocator.buffer(builder.size()), [0, 0, 4, 3, 2, 0, 0, 0, 0, 0, 0, 1]);
builder.putUint8(5);
expect(
allocator.buffer(builder.size()), [0, 5, 4, 3, 2, 0, 0, 0, 0, 0, 0, 1]);
builder.putUint32(6);
expect(allocator.buffer(builder.size()),
[6, 0, 0, 0, 0, 5, 4, 3, 2, 0, 0, 0, 0, 0, 0, 1]); [6, 0, 0, 0, 0, 5, 4, 3, 2, 0, 0, 0, 0, 0, 0, 1]);
} }
@@ -284,7 +302,8 @@ class BuilderTest {
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();
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
expect(builder.size(), byteList.length); expect(builder.size(), byteList.length);
} }
// read and verify // read and verify
@@ -310,7 +329,8 @@ class BuilderTest {
builder.addInt32(0, 10); builder.addInt32(0, 10);
builder.addInt32(1, 20); builder.addInt32(1, 20);
builder.addInt32(2, 30); builder.addInt32(2, 30);
byteList = builder.finish(builder.endTable()); builder.finish(builder.endTable());
byteList = builder.buffer;
} }
// Convert byteList to a ByteData so that we can read data from it. // Convert byteList to a ByteData so that we can read data from it.
ByteData byteData = byteList.buffer.asByteData(byteList.offsetInBytes); ByteData byteData = byteList.buffer.asByteData(byteList.offsetInBytes);
@@ -346,7 +366,8 @@ class BuilderTest {
builder.addOffset(0, latinStringOffset); builder.addOffset(0, latinStringOffset);
builder.addOffset(1, unicodeStringOffset); builder.addOffset(1, unicodeStringOffset);
int offset = builder.endTable(); int offset = builder.endTable();
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -375,7 +396,8 @@ class BuilderTest {
builder.addUint32(5, 0x9ABCDEF0); builder.addUint32(5, 0x9ABCDEF0);
builder.addUint8(6, 0x9A); builder.addUint8(6, 0x9A);
int offset = builder.endTable(); int offset = builder.endTable();
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -417,7 +439,8 @@ class BuilderTest {
{ {
Builder builder = new Builder(initialSize: 0); Builder builder = new Builder(initialSize: 0);
int offset = builder.writeListUint32(values); int offset = builder.writeListUint32(values);
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -437,7 +460,8 @@ class BuilderTest {
values[bit] = true; values[bit] = true;
} }
int offset = builder.writeListBool(values); int offset = builder.writeListBool(values);
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -473,7 +497,8 @@ class BuilderTest {
{ {
Builder builder = new Builder(initialSize: 0); Builder builder = new Builder(initialSize: 0);
int offset = builder.writeListInt32(<int>[1, 2, 3, 4, 5]); int offset = builder.writeListInt32(<int>[1, 2, 3, 4, 5]);
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -489,7 +514,8 @@ class BuilderTest {
{ {
Builder builder = new Builder(initialSize: 0); Builder builder = new Builder(initialSize: 0);
int offset = builder.writeListFloat64(values); int offset = builder.writeListFloat64(values);
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
@@ -509,7 +535,8 @@ class BuilderTest {
{ {
Builder builder = new Builder(initialSize: 0); Builder builder = new Builder(initialSize: 0);
int offset = builder.writeListFloat32(values); int offset = builder.writeListFloat32(values);
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -542,7 +569,8 @@ class BuilderTest {
} }
// write the list // write the list
int offset = builder.writeList([object1, object2]); int offset = builder.writeList([object1, object2]);
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -562,7 +590,8 @@ class BuilderTest {
int? str1 = builder.writeString('12345'); int? str1 = builder.writeString('12345');
int? str2 = builder.writeString('ABC'); int? str2 = builder.writeString('ABC');
int offset = builder.writeList([str1!, str2!]); int offset = builder.writeList([str1!, str2!]);
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -582,7 +611,8 @@ class BuilderTest {
builder.startTable(); builder.startTable();
builder.addOffset(0, listOffset); builder.addOffset(0, listOffset);
int offset = builder.endTable(); int offset = builder.endTable();
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -598,7 +628,8 @@ class BuilderTest {
{ {
Builder builder = new Builder(initialSize: 0); Builder builder = new Builder(initialSize: 0);
int offset = builder.writeListUint32(<int>[1, 2, 0x9ABCDEF0]); int offset = builder.writeListUint32(<int>[1, 2, 0x9ABCDEF0]);
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -612,7 +643,8 @@ class BuilderTest {
{ {
Builder builder = new Builder(initialSize: 0); Builder builder = new Builder(initialSize: 0);
int offset = builder.writeListUint16(<int>[1, 2, 60000]); int offset = builder.writeListUint16(<int>[1, 2, 60000]);
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -626,7 +658,8 @@ class BuilderTest {
{ {
Builder builder = new Builder(initialSize: 0); Builder builder = new Builder(initialSize: 0);
int offset = builder.writeListUint8(<int>[1, 2, 3, 4, 0x9A]); int offset = builder.writeListUint8(<int>[1, 2, 3, 4, 0x9A]);
byteList = builder.finish(offset); builder.finish(offset);
byteList = builder.buffer;
} }
// read and verify // read and verify
BufferContext buf = new BufferContext.fromBytes(byteList); BufferContext buf = new BufferContext.fromBytes(byteList);
@@ -706,8 +739,8 @@ class ObjectAPITest {
void test_tableStat() { void test_tableStat() {
final object1 = example.StatT(count: 3, id: "foo", val: 4); final object1 = example.StatT(count: 3, id: "foo", val: 4);
final fbb = Builder(); final fbb = Builder();
final data = fbb.finish(object1.pack(fbb)); fbb.finish(object1.pack(fbb));
final object2 = example.Stat(data).unpack(); final object2 = example.Stat(fbb.buffer).unpack();
expect(object2.count, object1.count); expect(object2.count, object1.count);
expect(object2.id, object1.id); expect(object2.id, object1.id);
expect(object2.val, object1.val); expect(object2.val, object1.val);
@@ -750,7 +783,8 @@ class ObjectAPITest {
final fbBuilder = Builder(); final fbBuilder = Builder();
final offset = monster.pack(fbBuilder); final offset = monster.pack(fbBuilder);
expect(offset, isNonZero); expect(offset, isNonZero);
final data = fbBuilder.finish(offset); fbBuilder.finish(offset);
final data = fbBuilder.buffer;
// TODO currently broken because of struct builder issue, see #6688 // TODO currently broken because of struct builder issue, see #6688
// final monster2 = example.Monster(data); // Monster (reader) // final monster2 = example.Monster(data); // Monster (reader)
@@ -770,14 +804,14 @@ class ObjectAPITest {
final fbb = Builder(); final fbb = Builder();
final object1 = example.TypeAliasesT(v8: [1, 2, 3], vf64: [5, 6]); final object1 = example.TypeAliasesT(v8: [1, 2, 3], vf64: [5, 6]);
final data1 = fbb.finish(object1.pack(fbb)); fbb.finish(object1.pack(fbb));
final object1Read = example.TypeAliases(data1).unpack(); final object1Read = example.TypeAliases(fbb.buffer).unpack();
// overwrite the original buffer by writing to the same builder // overwrite the original buffer by writing to the same builder
fbb.reset(); fbb.reset();
final object2 = example.TypeAliasesT(v8: [7, 8, 9], vf64: [10, 11]); final object2 = example.TypeAliasesT(v8: [7, 8, 9], vf64: [10, 11]);
final data2 = fbb.finish(object2.pack(fbb)); fbb.finish(object2.pack(fbb));
final object2Read = example.TypeAliases(data2).unpack(); final object2Read = example.TypeAliases(fbb.buffer).unpack();
// this is fine even with lazy lists: // this is fine even with lazy lists:
expect(object2.toString(), object2Read.toString()); expect(object2.toString(), object2Read.toString());

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

@@ -71,6 +71,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }

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

@@ -348,7 +348,8 @@ class TestObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class TestSimpleTableWithEnum { class TestSimpleTableWithEnum {
@@ -445,7 +446,8 @@ class TestSimpleTableWithEnumObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class Vec3 { class Vec3 {
@@ -591,7 +593,8 @@ class Vec3ObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class Ability { class Ability {
@@ -688,7 +691,8 @@ class AbilityObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class StructOfStructs { class StructOfStructs {
@@ -795,7 +799,8 @@ class StructOfStructsObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class Stat { class Stat {
@@ -920,7 +925,8 @@ class StatObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class Referrable { class Referrable {
@@ -1017,7 +1023,8 @@ class ReferrableObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
/// an example documentation comment: "monster object" /// an example documentation comment: "monster object"
@@ -1922,7 +1929,8 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class TypeAliases { class TypeAliases {
@@ -2174,6 +2182,7 @@ class TypeAliasesObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }

3
dart/test/monster_test_my_game_generated.dart
View File

@@ -71,6 +71,7 @@ class InParentNamespaceObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }

3
src/idl_gen_dart.cpp
View File

@@ -955,7 +955,8 @@ class DartGenerator : public BaseGenerator {
code += " " + _kFb + ".Builder fbBuilder = new "; code += " " + _kFb + ".Builder fbBuilder = new ";
code += _kFb + ".Builder();\n"; code += _kFb + ".Builder();\n";
code += " int offset = finish(fbBuilder);\n"; code += " int offset = finish(fbBuilder);\n";
code += " return fbBuilder.finish(offset, fileIdentifier);\n"; code += " fbBuilder.finish(offset, fileIdentifier);\n";
code += " return fbBuilder.buffer;\n";
code += " }\n"; code += " }\n";
code += "}\n"; code += "}\n";
} }

3
tests/monster_extra_my_game_generated.dart
View File

@@ -230,6 +230,7 @@ class MonsterExtraObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }

3
tests/monster_test_my_game.example2_generated.dart
View File

@@ -71,6 +71,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }

27
tests/monster_test_my_game.example_generated.dart
View File

@@ -348,7 +348,8 @@ class TestObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class TestSimpleTableWithEnum { class TestSimpleTableWithEnum {
@@ -445,7 +446,8 @@ class TestSimpleTableWithEnumObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class Vec3 { class Vec3 {
@@ -591,7 +593,8 @@ class Vec3ObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class Ability { class Ability {
@@ -688,7 +691,8 @@ class AbilityObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class StructOfStructs { class StructOfStructs {
@@ -795,7 +799,8 @@ class StructOfStructsObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class Stat { class Stat {
@@ -920,7 +925,8 @@ class StatObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class Referrable { class Referrable {
@@ -1017,7 +1023,8 @@ class ReferrableObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
/// an example documentation comment: "monster object" /// an example documentation comment: "monster object"
@@ -1922,7 +1929,8 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class TypeAliases { class TypeAliases {
@@ -2174,6 +2182,7 @@ class TypeAliasesObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }

3
tests/monster_test_my_game_generated.dart
View File

@@ -71,6 +71,7 @@ class InParentNamespaceObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }

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

@@ -191,7 +191,8 @@ class TableInNestedNSObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class StructInNestedNS { class StructInNestedNS {
@@ -288,6 +289,7 @@ class StructInNestedNSObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }

6
tests/namespace_test/namespace_test2_namespace_a_generated.dart
View File

@@ -167,7 +167,8 @@ class TableInFirstNSObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }
class SecondTableInA { class SecondTableInA {
@@ -266,6 +267,7 @@ class SecondTableInAObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }

3
tests/namespace_test/namespace_test2_namespace_c_generated.dart
View File

@@ -119,6 +119,7 @@ class TableInCObjectBuilder extends fb.ObjectBuilder {
Uint8List toBytes([String? fileIdentifier]) { Uint8List toBytes([String? fileIdentifier]) {
fb.Builder fbBuilder = new fb.Builder(); fb.Builder fbBuilder = new fb.Builder();
int offset = finish(fbBuilder); int offset = finish(fbBuilder);
return fbBuilder.finish(offset, fileIdentifier); fbBuilder.finish(offset, fileIdentifier);
return fbBuilder.buffer;
} }
} }