From e3c76a5cde7369e15c45318ff722355ed34b13db Mon Sep 17 00:00:00 2001 From: Ivan Dlugos <6349682+vaind@users.noreply.github.com> Date: Mon, 30 Aug 2021 21:54:59 +0200 Subject: [PATCH] Dart lints (#6808) * Dart - add analysis options with the recommended lints * Dart - generate code without linter issues * Dart - remove linter issues in example and test code * Dart - remove linter issues in lib code * Dart - update generate code in /tests/ --- dart/analysis_options.yaml | 1 + dart/example/example.dart | 46 +-- .../monster_my_game.sample_generated.dart | 67 +++-- dart/lib/flat_buffers.dart | 34 +-- dart/lib/src/builder.dart | 70 ++--- dart/lib/src/reference.dart | 18 +- dart/lib/src/types.dart | 2 +- dart/pubspec.yaml | 1 + dart/test/flat_buffers_test.dart | 115 ++++---- ...nster_test_my_game.example2_generated.dart | 11 +- ...onster_test_my_game.example_generated.dart | 269 +++++++++--------- dart/test/monster_test_my_game_generated.dart | 11 +- src/idl_gen_dart.cpp | 91 +++--- tests/monster_extra_my_game_generated.dart | 21 +- ...nster_test_my_game.example2_generated.dart | 11 +- ...onster_test_my_game.example_generated.dart | 269 +++++++++--------- tests/monster_test_my_game_generated.dart | 11 +- ...st1_namespace_a.namespace_b_generated.dart | 46 ++- ...namespace_test2_namespace_a_generated.dart | 34 ++- ...namespace_test2_namespace_c_generated.dart | 13 +- 20 files changed, 560 insertions(+), 581 deletions(-) create mode 100644 dart/analysis_options.yaml diff --git a/dart/analysis_options.yaml b/dart/analysis_options.yaml new file mode 100644 index 000000000..572dd239d --- /dev/null +++ b/dart/analysis_options.yaml @@ -0,0 +1 @@ +include: package:lints/recommended.yaml diff --git a/dart/example/example.dart b/dart/example/example.dart index ec26c1a23..d397bbb3f 100644 --- a/dart/example/example.dart +++ b/dart/example/example.dart @@ -15,7 +15,7 @@ */ import 'package:flat_buffers/flat_buffers.dart' as fb; -import './monster_my_game.sample_generated.dart' as myGame; +import './monster_my_game.sample_generated.dart' as my_game; // Example how to use FlatBuffers to create and read binary buffers. @@ -25,20 +25,20 @@ void main() { } void builderTest() { - final builder = new fb.Builder(initialSize: 1024); + final builder = fb.Builder(initialSize: 1024); final int? weaponOneName = builder.writeString("Sword"); final int weaponOneDamage = 3; final int? weaponTwoName = builder.writeString("Axe"); final int weaponTwoDamage = 5; - final swordBuilder = new myGame.WeaponBuilder(builder) + final swordBuilder = my_game.WeaponBuilder(builder) ..begin() ..addNameOffset(weaponOneName) ..addDamage(weaponOneDamage); final int sword = swordBuilder.finish(); - final axeBuilder = new myGame.WeaponBuilder(builder) + final axeBuilder = my_game.WeaponBuilder(builder) ..begin() ..addNameOffset(weaponTwoName) ..addDamage(weaponTwoDamage); @@ -54,7 +54,7 @@ void builderTest() { final weapons = builder.writeList([sword, axe]); // Struct builders are very easy to reuse. - final vec3Builder = new myGame.Vec3Builder(builder); + final vec3Builder = my_game.Vec3Builder(builder); vec3Builder.finish(4.0, 5.0, 6.0); vec3Builder.finish(1.0, 2.0, 3.0); @@ -62,17 +62,17 @@ void builderTest() { final int hp = 300; final int mana = 150; - final monster = new myGame.MonsterBuilder(builder) + final monster = my_game.MonsterBuilder(builder) ..begin() ..addNameOffset(name) ..addInventoryOffset(inventory) ..addWeaponsOffset(weapons) - ..addEquippedType(myGame.EquipmentTypeId.Weapon) + ..addEquippedType(my_game.EquipmentTypeId.Weapon) ..addEquippedOffset(axe) ..addHp(hp) ..addMana(mana) ..addPos(vec3Builder.finish(1.0, 2.0, 3.0)) - ..addColor(myGame.Color.Red); + ..addColor(my_game.Color.Red); final int monsteroff = monster.finish(); builder.finish(monsteroff); @@ -85,17 +85,17 @@ void builderTest() { void objectBuilderTest() { // Create the builder here so we can use it for both weapons and equipped // the actual data will only be written to the buffer once. - var axe = new myGame.WeaponObjectBuilder(name: 'Axe', damage: 5); + var axe = my_game.WeaponObjectBuilder(name: 'Axe', damage: 5); - var monsterBuilder = new myGame.MonsterObjectBuilder( - pos: new myGame.Vec3ObjectBuilder(x: 1.0, y: 2.0, z: 3.0), + var monsterBuilder = my_game.MonsterObjectBuilder( + pos: my_game.Vec3ObjectBuilder(x: 1.0, y: 2.0, z: 3.0), mana: 150, hp: 300, name: 'Orc', inventory: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - color: myGame.Color.Red, - weapons: [new myGame.WeaponObjectBuilder(name: 'Sword', damage: 3), axe], - equippedType: myGame.EquipmentTypeId.Weapon, + color: my_game.Color.Red, + weapons: [my_game.WeaponObjectBuilder(name: 'Sword', damage: 3), axe], + equippedType: my_game.EquipmentTypeId.Weapon, equipped: axe, ); @@ -114,7 +114,7 @@ void objectBuilderTest() { bool verify(List buffer) { // Get access to the root: - var monster = new myGame.Monster(buffer); + var monster = my_game.Monster(buffer); // Get and test some scalar types from the FlatBuffer. assert(monster.hp == 80); @@ -131,20 +131,20 @@ bool verify(List buffer) { assert(inv[9] == 9); // Get and test the `weapons` FlatBuffers's `vector`. - var expected_weapon_names = ["Sword", "Axe"]; - var expected_weapon_damages = [3, 5]; + var expectedWeaponNames = ["Sword", "Axe"]; + var expectedWeaponDamages = [3, 5]; var weps = monster.weapons!; for (int i = 0; i < weps.length; i++) { - assert(weps[i].name == expected_weapon_names[i]); - assert(weps[i].damage == expected_weapon_damages[i]); + assert(weps[i].name == expectedWeaponNames[i]); + assert(weps[i].damage == expectedWeaponDamages[i]); } // Get and test the `Equipment` union (`equipped` field). - assert(monster.equippedType!.value == myGame.EquipmentTypeId.Weapon.value); - assert(monster.equippedType == myGame.EquipmentTypeId.Weapon); + assert(monster.equippedType!.value == my_game.EquipmentTypeId.Weapon.value); + assert(monster.equippedType == my_game.EquipmentTypeId.Weapon); - assert(monster.equipped is myGame.Weapon); - var equipped = monster.equipped as myGame.Weapon; + assert(monster.equipped is my_game.Weapon); + var equipped = monster.equipped as my_game.Weapon; assert(equipped.name == "Axe"); assert(equipped.damage == 5); diff --git a/dart/example/monster_my_game.sample_generated.dart b/dart/example/monster_my_game.sample_generated.dart index 606000baa..d688e6dd5 100644 --- a/dart/example/monster_my_game.sample_generated.dart +++ b/dart/example/monster_my_game.sample_generated.dart @@ -14,7 +14,7 @@ class Color { factory Color.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum Color'); + throw StateError('Invalid value $value for bit flag enum Color'); } return result; } @@ -26,15 +26,15 @@ class Color { static const int maxValue = 2; static bool containsValue(int value) => values.containsKey(value); - static const Color Red = const Color._(0); - static const Color Green = const Color._(1); - static const Color Blue = const Color._(2); + static const Color Red = Color._(0); + static const Color Green = Color._(1); + static const Color Blue = Color._(2); static const Map values = { 0: Red, 1: Green, 2: Blue}; - static const fb.Reader reader = const _ColorReader(); + static const fb.Reader reader = _ColorReader(); @override String toString() { @@ -50,7 +50,7 @@ class _ColorReader extends fb.Reader { @override Color read(fb.BufferContext bc, int offset) => - new Color.fromValue(const fb.Int8Reader().read(bc, offset)); + Color.fromValue(const fb.Int8Reader().read(bc, offset)); } class EquipmentTypeId { @@ -60,7 +60,7 @@ class EquipmentTypeId { factory EquipmentTypeId.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum EquipmentTypeId'); + throw StateError('Invalid value $value for bit flag enum EquipmentTypeId'); } return result; } @@ -72,13 +72,13 @@ class EquipmentTypeId { static const int maxValue = 1; static bool containsValue(int value) => values.containsKey(value); - static const EquipmentTypeId NONE = const EquipmentTypeId._(0); - static const EquipmentTypeId Weapon = const EquipmentTypeId._(1); + static const EquipmentTypeId NONE = EquipmentTypeId._(0); + static const EquipmentTypeId Weapon = EquipmentTypeId._(1); static const Map values = { 0: NONE, 1: Weapon}; - static const fb.Reader reader = const _EquipmentTypeIdReader(); + static const fb.Reader reader = _EquipmentTypeIdReader(); @override String toString() { @@ -94,13 +94,13 @@ class _EquipmentTypeIdReader extends fb.Reader { @override EquipmentTypeId read(fb.BufferContext bc, int offset) => - new EquipmentTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); + EquipmentTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); } class Vec3 { Vec3._(this._bc, this._bcOffset); - static const fb.Reader reader = const _Vec3Reader(); + static const fb.Reader reader = _Vec3Reader(); final fb.BufferContext _bc; final int _bcOffset; @@ -123,11 +123,11 @@ class _Vec3Reader extends fb.StructReader { @override Vec3 createObject(fb.BufferContext bc, int offset) => - new Vec3._(bc, offset); + Vec3._(bc, offset); } class Vec3Builder { - Vec3Builder(this.fbBuilder) {} + Vec3Builder(this.fbBuilder); final fb.Builder fbBuilder; @@ -166,20 +166,19 @@ class Vec3ObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class Monster { Monster._(this._bc, this._bcOffset); factory Monster(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _MonsterReader(); + static const fb.Reader reader = _MonsterReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -188,11 +187,11 @@ class Monster { int get mana => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 6, 150); int get hp => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 8, 100); String? get name => const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 10); - List? get inventory => const fb.ListReader(const fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 14); + List? get inventory => const fb.ListReader(fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 14); Color get color => Color.fromValue(const fb.Int8Reader().vTableGet(_bc, _bcOffset, 16, 2)); List? get weapons => const fb.ListReader(Weapon.reader).vTableGetNullable(_bc, _bcOffset, 18); EquipmentTypeId? get equippedType => EquipmentTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 20)); - dynamic? get equipped { + dynamic get equipped { switch (equippedType?.value) { case 1: return Weapon.reader.vTableGetNullable(_bc, _bcOffset, 22); default: return null; @@ -211,11 +210,11 @@ class _MonsterReader extends fb.TableReader { @override Monster createObject(fb.BufferContext bc, int offset) => - new Monster._(bc, offset); + Monster._(bc, offset); } class MonsterBuilder { - MonsterBuilder(this.fbBuilder) {} + MonsterBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -278,7 +277,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { final Color? _color; final List? _weapons; final EquipmentTypeId? _equippedType; - final dynamic? _equipped; + final dynamic _equipped; final List? _path; MonsterObjectBuilder({ @@ -290,7 +289,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { Color? color, List? weapons, EquipmentTypeId? equippedType, - dynamic? equipped, + dynamic equipped, List? path, }) : _pos = pos, @@ -335,20 +334,19 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class Weapon { Weapon._(this._bc, this._bcOffset); factory Weapon(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _WeaponReader(); + static const fb.Reader reader = _WeaponReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -367,11 +365,11 @@ class _WeaponReader extends fb.TableReader { @override Weapon createObject(fb.BufferContext bc, int offset) => - new Weapon._(bc, offset); + Weapon._(bc, offset); } class WeaponBuilder { - WeaponBuilder(this.fbBuilder) {} + WeaponBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -418,9 +416,8 @@ class WeaponObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } diff --git a/dart/lib/flat_buffers.dart b/dart/lib/flat_buffers.dart index 5b85a7bf9..215ee5109 100644 --- a/dart/lib/flat_buffers.dart +++ b/dart/lib/flat_buffers.dart @@ -22,7 +22,7 @@ const int _sizeofFloat64 = 8; /// /// This callback is used by other struct's `finish` methods to write the nested /// struct's fields inline. -typedef void StructBuilder(); +typedef StructBuilder = void Function(); /// Buffer with data and some context about it. class BufferContext { @@ -143,7 +143,7 @@ class Builder { /// true, will cause [writeString] to pool strings in the buffer so that /// identical strings will always use the same offset in tables. Builder({ - this.initialSize: 1024, + this.initialSize = 1024, bool internStrings = false, Allocator allocator = const DefaultAllocator(), this.deduplicateTables = true, @@ -155,8 +155,7 @@ class Builder { } } - /// Calculate the finished buffer size (aligned). - @pragma('vm:prefer-inline') + /// Calculate the finished buffer size (aligned).@pragma('vm:prefer-inline') int size() => _tail + ((-_tail) & (_maxAlign - 1)); /// Add the [field] with the given boolean [value]. The field is not added if @@ -750,7 +749,9 @@ class Builder { /// Zero-pads the buffer, which may be required for some struct layouts. @pragma('vm:prefer-inline') void pad(int howManyBytes) { - for (int i = 0; i < howManyBytes; i++) putUint8(0); + for (int i = 0; i < howManyBytes; i++) { + putUint8(0); + } } /// Prepare for writing the given `count` of scalars of the given `size`. @@ -875,7 +876,7 @@ class Float64ListReader extends Reader> { @override @pragma('vm:prefer-inline') List read(BufferContext bc, int offset) => - new _FbFloat64List(bc, bc.derefObject(offset)); + _FbFloat64List(bc, bc.derefObject(offset)); } class Float32ListReader extends Reader> { @@ -888,7 +889,7 @@ class Float32ListReader extends Reader> { @override @pragma('vm:prefer-inline') List read(BufferContext bc, int offset) => - new _FbFloat32List(bc, bc.derefObject(offset)); + _FbFloat32List(bc, bc.derefObject(offset)); } class Float64Reader extends Reader { @@ -1034,6 +1035,7 @@ abstract class Reader { /// The reader of string values. class StringReader extends Reader { final bool asciiOptimization; + const StringReader({this.asciiOptimization = false}) : super(); @override @@ -1071,8 +1073,9 @@ abstract class StructReader extends Reader { /// Return the object at `offset`. T createObject(BufferContext bc, int offset); - T read(BufferContext bp, int offset) { - return createObject(bp, offset); + @override + T read(BufferContext bc, int offset) { + return createObject(bc, offset); } } @@ -1088,9 +1091,9 @@ abstract class TableReader extends Reader { T createObject(BufferContext bc, int offset); @override - T read(BufferContext bp, int offset) { - int objectOffset = bp.derefObject(offset); - return createObject(bp, objectOffset); + T read(BufferContext bc, int offset) { + int objectOffset = bc.derefObject(offset); + return createObject(bc, objectOffset); } } @@ -1249,12 +1252,11 @@ abstract class _FbList extends Object with ListMixin implements List { int get length => _length ??= bc._getUint32(offset); @override - void set length(int i) => - throw new StateError('Attempt to modify immutable list'); + set length(int i) => throw StateError('Attempt to modify immutable list'); @override void operator []=(int i, E e) => - throw new StateError('Attempt to modify immutable list'); + throw StateError('Attempt to modify immutable list'); } /// List backed by 32-bit unsigned integers. @@ -1416,7 +1418,7 @@ class DefaultAllocator extends Allocator { ByteData allocate(int size) => ByteData(size); @override - void deallocate(ByteData _) { + void deallocate(ByteData data) { // nothing to do, it's garbage-collected } } diff --git a/dart/lib/src/builder.dart b/dart/lib/src/builder.dart index f9ae324d9..a0d47ed1f 100644 --- a/dart/lib/src/builder.dart +++ b/dart/lib/src/builder.dart @@ -5,22 +5,22 @@ import 'types.dart'; /// The main builder class for creation of a FlexBuffer. class Builder { - ByteData _buffer; + final ByteData _buffer; List<_StackValue> _stack = []; List<_StackPointer> _stackPointers = []; int _offset = 0; bool _finished = false; - Map _stringCache = {}; - Map _keyCache = {}; - Map<_KeysHash, _StackValue> _keyVectorCache = {}; - Map _indirectIntCache = {}; - Map _indirectDoubleCache = {}; + final Map _stringCache = {}; + final Map _keyCache = {}; + final Map<_KeysHash, _StackValue> _keyVectorCache = {}; + final Map _indirectIntCache = {}; + final Map _indirectDoubleCache = {}; /// Instantiate the builder if you intent to gradually build up the buffer by calling /// add... methods and calling [finish] to receive the the resulting byte array. /// /// The default size of internal buffer is set to 2048. Provide a different value in order to avoid buffer copies. - Builder({int size = 2048}) : _buffer = ByteData(size) {} + Builder({int size = 2048}) : _buffer = ByteData(size); /// Use this method in order to turn an object into a FlexBuffer directly. /// @@ -70,25 +70,25 @@ class Builder { /// Specifically useful when building up a vector where values can be null. void addNull() { _integrityCheckOnValueAddition(); - _stack.add(_StackValue.WithNull()); + _stack.add(_StackValue.withNull()); } /// Adds a string value. void addInt(int value) { _integrityCheckOnValueAddition(); - _stack.add(_StackValue.WithInt(value)); + _stack.add(_StackValue.withInt(value)); } /// Adds a bool value. void addBool(bool value) { _integrityCheckOnValueAddition(); - _stack.add(_StackValue.WithBool(value)); + _stack.add(_StackValue.withBool(value)); } /// Adds a double value. void addDouble(double value) { _integrityCheckOnValueAddition(); - _stack.add(_StackValue.WithDouble(value)); + _stack.add(_StackValue.withDouble(value)); } /// Adds a string value. @@ -108,7 +108,7 @@ class Builder { _pushBuffer(utf8String); _offset = newOffset; final stackValue = - _StackValue.WithOffset(stringOffset, ValueType.String, bitWidth); + _StackValue.withOffset(stringOffset, ValueType.String, bitWidth); _stack.add(stackValue); _stringCache[value] = stackValue; } @@ -129,7 +129,7 @@ class Builder { _pushBuffer(utf8String); _offset = newOffset; final stackValue = - _StackValue.WithOffset(keyOffset, ValueType.Key, BitWidth.width8); + _StackValue.withOffset(keyOffset, ValueType.Key, BitWidth.width8); _stack.add(stackValue); _keyCache[value] = stackValue; } @@ -148,7 +148,7 @@ class Builder { _pushBuffer(value.asUint8List()); _offset = newOffset; final stackValue = - _StackValue.WithOffset(blobOffset, ValueType.Blob, bitWidth); + _StackValue.withOffset(blobOffset, ValueType.Blob, bitWidth); _stack.add(stackValue); } @@ -164,12 +164,12 @@ class Builder { _stack.add(_indirectIntCache[value]!); return; } - final stackValue = _StackValue.WithInt(value); + final stackValue = _StackValue.withInt(value); final byteWidth = _align(stackValue.width); final newOffset = _newOffset(byteWidth); final valueOffset = _offset; _pushBuffer(stackValue.asU8List(stackValue.width)); - final stackOffset = _StackValue.WithOffset( + final stackOffset = _StackValue.withOffset( valueOffset, ValueType.IndirectInt, stackValue.width); _stack.add(stackOffset); _offset = newOffset; @@ -189,12 +189,12 @@ class Builder { _stack.add(_indirectDoubleCache[value]!); return; } - final stackValue = _StackValue.WithDouble(value); + final stackValue = _StackValue.withDouble(value); final byteWidth = _align(stackValue.width); final newOffset = _newOffset(byteWidth); final valueOffset = _offset; _pushBuffer(stackValue.asU8List(stackValue.width)); - final stackOffset = _StackValue.WithOffset( + final stackOffset = _StackValue.withOffset( valueOffset, ValueType.IndirectFloat, stackValue.width); _stack.add(stackOffset); _offset = newOffset; @@ -346,14 +346,14 @@ class Builder { } } if (keys != null) { - return _StackValue.WithOffset(vecOffset, ValueType.Map, bitWidth); + return _StackValue.withOffset(vecOffset, ValueType.Map, bitWidth); } if (typed) { final vType = ValueTypeUtils.toTypedVector(vectorType, fix ? vecLength : 0); - return _StackValue.WithOffset(vecOffset, vType, bitWidth); + return _StackValue.withOffset(vecOffset, vType, bitWidth); } - return _StackValue.WithOffset(vecOffset, ValueType.Vector, bitWidth); + return _StackValue.withOffset(vecOffset, ValueType.Vector, bitWidth); } void _endVector(_StackPointer pointer) { @@ -405,7 +405,7 @@ class Builder { offsets.add(_stack[i].offset!); } final keysHash = _KeysHash(offsets); - var keysStackValue; + _StackValue? keysStackValue; if (_keyVectorCache.containsKey(keysHash)) { keysStackValue = _keyVectorCache[keysHash]; } else { @@ -424,7 +424,7 @@ class Builder { 'Stack values are not keys $v1 | $v2. Check if you combined [addKey] with add... method calls properly.'); } - var c1, c2; + late int c1, c2; var index = 0; do { c1 = _buffer.getUint8(v1.offset! + index); @@ -520,32 +520,32 @@ class Builder { class _StackValue { late Object _value; int? _offset; - ValueType _type; - BitWidth _width; + final ValueType _type; + final BitWidth _width; - _StackValue.WithNull() + _StackValue.withNull() : _type = ValueType.Null, - _width = BitWidth.width8 {} + _width = BitWidth.width8; - _StackValue.WithInt(int value) + _StackValue.withInt(int value) : _type = ValueType.Int, _width = BitWidthUtil.width(value), - _value = value {} + _value = value; - _StackValue.WithBool(bool value) + _StackValue.withBool(bool value) : _type = ValueType.Bool, _width = BitWidth.width8, - _value = value {} + _value = value; - _StackValue.WithDouble(double value) + _StackValue.withDouble(double value) : _type = ValueType.Float, _width = BitWidthUtil.width(value), - _value = value {} + _value = value; - _StackValue.WithOffset(int value, ValueType type, BitWidth width) + _StackValue.withOffset(int value, ValueType type, BitWidth width) : _offset = value, _type = type, - _width = width {} + _width = width; BitWidth storedWidth({BitWidth width = BitWidth.width8}) { return ValueTypeUtils.isInline(_type) diff --git a/dart/lib/src/reference.dart b/dart/lib/src/reference.dart index c2956e30d..89752fa02 100644 --- a/dart/lib/src/reference.dart +++ b/dart/lib/src/reference.dart @@ -19,7 +19,7 @@ class Reference { this._buffer, this._offset, this._parentWidth, int packedType, this._path, [int? byteWidth, ValueType? valueType]) : _byteWidth = byteWidth ?? 1 << (packedType & 3), - _valueType = valueType ?? ValueTypeUtils.fromInt(packedType >> 2) {} + _valueType = valueType ?? ValueTypeUtils.fromInt(packedType >> 2); /// Use this method to access the root value of a FlexBuffer. static Reference fromBuffer(ByteBuffer buffer) { @@ -218,13 +218,13 @@ class Reference { _length = 0; } else if (_valueType == ValueType.String) { final indirect = _indirect; - var size_byte_width = _byteWidth; - var size = _readUInt(indirect - size_byte_width, - BitWidthUtil.fromByteWidth(size_byte_width)); + var sizeByteWidth = _byteWidth; + var size = _readUInt(indirect - sizeByteWidth, + BitWidthUtil.fromByteWidth(sizeByteWidth)); while (_buffer.getInt8(indirect + size) != 0) { - size_byte_width <<= 1; - size = _readUInt(indirect - size_byte_width, - BitWidthUtil.fromByteWidth(size_byte_width)); + sizeByteWidth <<= 1; + size = _readUInt(indirect - sizeByteWidth, + BitWidthUtil.fromByteWidth(sizeByteWidth)); } _length = size; } else if (_valueType == ValueType.Key) { @@ -374,8 +374,8 @@ class Reference { } int _diffKeys( - List input, int index, int indirect_offset, int byteWidth) { - final keyOffset = indirect_offset + index * byteWidth; + List input, int index, int indirectOffset, int byteWidth) { + final keyOffset = indirectOffset + index * byteWidth; final keyIndirectOffset = keyOffset - _readUInt(keyOffset, BitWidthUtil.fromByteWidth(byteWidth)); for (var i = 0; i < input.length; i++) { diff --git a/dart/lib/src/types.dart b/dart/lib/src/types.dart index bc9bb3ac0..f9eefd8bc 100644 --- a/dart/lib/src/types.dart +++ b/dart/lib/src/types.dart @@ -47,7 +47,7 @@ class BitWidthUtil { if (value == 8) { return BitWidth.width64; } - throw Exception('Unexpected value ${value}'); + throw Exception('Unexpected value $value'); } static int paddingSize(int bufSize, int scalarSize) { diff --git a/dart/pubspec.yaml b/dart/pubspec.yaml index 4e7b51445..ad0cf3b5a 100644 --- a/dart/pubspec.yaml +++ b/dart/pubspec.yaml @@ -12,5 +12,6 @@ dev_dependencies: test: ^1.17.7 test_reflective_loader: ^0.2.0 path: ^1.8.0 + lints: ^1.0.1 environment: sdk: '>=2.12.0 <3.0.0' diff --git a/dart/test/flat_buffers_test.dart b/dart/test/flat_buffers_test.dart index 050c477c6..55a3b6c12 100644 --- a/dart/test/flat_buffers_test.dart +++ b/dart/test/flat_buffers_test.dart @@ -30,12 +30,12 @@ int indexToField(int index) { @reflectiveTest class CheckOtherLangaugesData { test_cppData() async { - List data = await new io.File(path.join( + List data = await io.File(path.join( path.context.current, 'test', 'monsterdata_test.mon', )).readAsBytes(); - example.Monster mon = new example.Monster(data); + example.Monster mon = example.Monster(data); expect(mon.hp, 80); expect(mon.mana, 150); expect(mon.name, 'MyMonster'); @@ -156,7 +156,7 @@ class CustomAllocator extends Allocator { @reflectiveTest class BuilderTest { void test_monsterBuilder([Builder? builder]) { - final fbBuilder = builder ?? new Builder(); + final fbBuilder = builder ?? Builder(); final str = fbBuilder.writeString('MyMonster'); fbBuilder.writeString('test1'); @@ -168,12 +168,12 @@ class BuilderTest { final List treasure = [0, 1, 2, 3, 4]; final inventory = fbBuilder.writeListUint8(treasure); - final monBuilder = new example.MonsterBuilder(fbBuilder) + final monBuilder = example.MonsterBuilder(fbBuilder) ..begin() ..addNameOffset(fred); final mon2 = monBuilder.finish(); - final testBuilder = new example.TestBuilder(fbBuilder); + final testBuilder = example.TestBuilder(fbBuilder); testBuilder.finish(10, 20); testBuilder.finish(30, 40); final test4 = fbBuilder.endStructVector(2); @@ -181,7 +181,7 @@ class BuilderTest { monBuilder ..begin() ..addPos( - new example.Vec3Builder(fbBuilder).finish( + example.Vec3Builder(fbBuilder).finish( 1.0, 2.0, 3.0, @@ -202,28 +202,28 @@ class BuilderTest { } void test_error_addInt32_withoutStartTable([Builder? builder]) { - builder ??= new Builder(); + builder ??= Builder(); expect(() { builder!.addInt32(0, 0); }, throwsA(isA())); } void test_error_addOffset_withoutStartTable() { - Builder builder = new Builder(); + Builder builder = Builder(); expect(() { builder.addOffset(0, 0); }, throwsA(isA())); } void test_error_endTable_withoutStartTable() { - Builder builder = new Builder(); + Builder builder = Builder(); expect(() { builder.endTable(); }, throwsA(isA())); } void test_error_startTable_duringTable() { - Builder builder = new Builder(); + Builder builder = Builder(); builder.startTable(0); expect(() { builder.startTable(0); @@ -231,7 +231,7 @@ class BuilderTest { } void test_error_writeString_duringTable() { - Builder builder = new Builder(); + Builder builder = Builder(); builder.startTable(1); expect(() { builder.writeString('12345'); @@ -241,7 +241,7 @@ class BuilderTest { void test_file_identifier() { Uint8List byteList; { - Builder builder = new Builder(initialSize: 0); + Builder builder = Builder(initialSize: 0); builder.startTable(0); int offset = builder.endTable(); builder.finish(offset, 'Az~ÿ'); @@ -307,7 +307,7 @@ class BuilderTest { expect(builder.size(), byteList.length); } // read and verify - BufferContext buffer = new BufferContext.fromBytes(byteList); + BufferContext buffer = BufferContext.fromBytes(byteList); int objectOffset = buffer.derefObject(0); // was not written, so uses the new default value expect( @@ -324,7 +324,7 @@ class BuilderTest { void test_table_format([Builder? builder]) { Uint8List byteList; { - builder ??= new Builder(initialSize: 0); + builder ??= Builder(initialSize: 0); builder.startTable(3); builder.addInt32(0, 10); builder.addInt32(1, 20); @@ -359,7 +359,7 @@ class BuilderTest { String unicodeString = 'Проба пера'; List byteList; { - Builder builder = new Builder(initialSize: 0); + Builder builder = Builder(initialSize: 0); int? latinStringOffset = builder.writeString(latinString, asciiOptimization: true); int? unicodeStringOffset = @@ -372,7 +372,7 @@ class BuilderTest { byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); + BufferContext buf = BufferContext.fromBytes(byteList); int objectOffset = buf.derefObject(0); expect( const StringReader() @@ -387,7 +387,7 @@ class BuilderTest { void test_table_types([Builder? builder]) { List byteList; { - builder ??= new Builder(initialSize: 0); + builder ??= Builder(initialSize: 0); int? stringOffset = builder.writeString('12345'); builder.startTable(7); builder.addBool(0, true); @@ -402,7 +402,7 @@ class BuilderTest { byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); + BufferContext buf = BufferContext.fromBytes(byteList); int objectOffset = buf.derefObject(0); expect( const BoolReader() @@ -439,13 +439,13 @@ class BuilderTest { // write List byteList; { - Builder builder = new Builder(initialSize: 0); + Builder builder = Builder(initialSize: 0); int offset = builder.writeListUint32(values); builder.finish(offset); byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); + BufferContext buf = BufferContext.fromBytes(byteList); List items = const Uint32ListReader().read(buf, 0); expect(items, hasLength(4)); expect(items, orderedEquals(values)); @@ -456,8 +456,8 @@ class BuilderTest { // write List byteList; { - Builder builder = new Builder(initialSize: 0); - List values = new List.filled(len, false); + Builder builder = Builder(initialSize: 0); + List values = List.filled(len, false); for (int bit in trueBits) { values[bit] = true; } @@ -466,7 +466,7 @@ class BuilderTest { byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); + BufferContext buf = BufferContext.fromBytes(byteList); List items = const BoolListReader().read(buf, 0); expect(items, hasLength(len)); for (int i = 0; i < items.length; i++) { @@ -485,26 +485,26 @@ class BuilderTest { verifyListBooleans(33, [1, 2, 24, 25, 31, 32]); verifyListBooleans(63, []); verifyListBooleans(63, [0, 1, 2, 61, 62]); - verifyListBooleans(63, new List.generate(63, (i) => i)); + verifyListBooleans(63, List.generate(63, (i) => i)); verifyListBooleans(64, []); verifyListBooleans(64, [0, 1, 2, 61, 62, 63]); verifyListBooleans(64, [1, 2, 62]); verifyListBooleans(64, [0, 1, 2, 63]); - verifyListBooleans(64, new List.generate(64, (i) => i)); + verifyListBooleans(64, List.generate(64, (i) => i)); verifyListBooleans(100, [0, 3, 30, 60, 90, 99]); } void test_writeList_ofInt32() { List byteList; { - Builder builder = new Builder(initialSize: 0); + Builder builder = Builder(initialSize: 0); int offset = builder.writeListInt32([1, 2, 3, 4, 5]); builder.finish(offset); byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); - List items = const ListReader(const Int32Reader()).read(buf, 0); + BufferContext buf = BufferContext.fromBytes(byteList); + List items = const ListReader(Int32Reader()).read(buf, 0); expect(items, hasLength(5)); expect(items, orderedEquals([1, 2, 3, 4, 5])); } @@ -514,14 +514,14 @@ class BuilderTest { // write List byteList; { - Builder builder = new Builder(initialSize: 0); + Builder builder = Builder(initialSize: 0); int offset = builder.writeListFloat64(values); builder.finish(offset); byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); + BufferContext buf = BufferContext.fromBytes(byteList); List items = const Float64ListReader().read(buf, 0); expect(items, hasLength(values.length)); @@ -535,13 +535,13 @@ class BuilderTest { // write List byteList; { - Builder builder = new Builder(initialSize: 0); + Builder builder = Builder(initialSize: 0); int offset = builder.writeListFloat32(values); builder.finish(offset); byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); + BufferContext buf = BufferContext.fromBytes(byteList); List items = const Float32ListReader().read(buf, 0); expect(items, hasLength(5)); for (int i = 0; i < values.length; i++) { @@ -552,7 +552,7 @@ class BuilderTest { void test_writeList_ofObjects([Builder? builder]) { List byteList; { - builder ??= new Builder(initialSize: 0); + builder ??= Builder(initialSize: 0); // write the object #1 int object1; { @@ -575,9 +575,9 @@ class BuilderTest { byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); + BufferContext buf = BufferContext.fromBytes(byteList); List items = - const ListReader(const TestPointReader()).read(buf, 0); + const ListReader(TestPointReader()).read(buf, 0); expect(items, hasLength(2)); expect(items[0].x, 10); expect(items[0].y, 20); @@ -588,7 +588,7 @@ class BuilderTest { void test_writeList_ofStrings_asRoot() { List byteList; { - Builder builder = new Builder(initialSize: 0); + Builder builder = Builder(initialSize: 0); int? str1 = builder.writeString('12345'); int? str2 = builder.writeString('ABC'); int offset = builder.writeList([str1, str2]); @@ -596,9 +596,8 @@ class BuilderTest { byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); - List items = - const ListReader(const StringReader()).read(buf, 0); + BufferContext buf = BufferContext.fromBytes(byteList); + List items = const ListReader(StringReader()).read(buf, 0); expect(items, hasLength(2)); expect(items, contains('12345')); expect(items, contains('ABC')); @@ -607,7 +606,7 @@ class BuilderTest { void test_writeList_ofStrings_inObject([Builder? builder]) { List byteList; { - builder ??= new Builder(initialSize: 0); + builder ??= Builder(initialSize: 0); int listOffset = builder.writeList( [builder.writeString('12345'), builder.writeString('ABC')]); builder.startTable(1); @@ -617,8 +616,8 @@ class BuilderTest { byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); - StringListWrapperImpl reader = new StringListWrapperReader().read(buf, 0); + BufferContext buf = BufferContext.fromBytes(byteList); + StringListWrapperImpl reader = StringListWrapperReader().read(buf, 0); List? items = reader.items; expect(items, hasLength(2)); expect(items, contains('12345')); @@ -628,13 +627,13 @@ class BuilderTest { void test_writeList_ofUint32() { List byteList; { - Builder builder = new Builder(initialSize: 0); + Builder builder = Builder(initialSize: 0); int offset = builder.writeListUint32([1, 2, 0x9ABCDEF0]); builder.finish(offset); byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); + BufferContext buf = BufferContext.fromBytes(byteList); List items = const Uint32ListReader().read(buf, 0); expect(items, hasLength(3)); expect(items, orderedEquals([1, 2, 0x9ABCDEF0])); @@ -643,13 +642,13 @@ class BuilderTest { void test_writeList_ofUint16() { List byteList; { - Builder builder = new Builder(initialSize: 0); + Builder builder = Builder(initialSize: 0); int offset = builder.writeListUint16([1, 2, 60000]); builder.finish(offset); byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); + BufferContext buf = BufferContext.fromBytes(byteList); List items = const Uint16ListReader().read(buf, 0); expect(items, hasLength(3)); expect(items, orderedEquals([1, 2, 60000])); @@ -658,13 +657,13 @@ class BuilderTest { void test_writeList_ofUint8() { List byteList; { - Builder builder = new Builder(initialSize: 0); + Builder builder = Builder(initialSize: 0); int offset = builder.writeListUint8([1, 2, 3, 4, 0x9A]); builder.finish(offset); byteList = builder.buffer; } // read and verify - BufferContext buf = new BufferContext.fromBytes(byteList); + BufferContext buf = BufferContext.fromBytes(byteList); List items = const Uint8ListReader().read(buf, 0); expect(items, hasLength(5)); expect(items, orderedEquals([1, 2, 3, 4, 0x9A])); @@ -687,22 +686,22 @@ class BuilderTest { _permutationsOf(List.generate(testCases.length, (index) => index)); expect(testCasesPermutations.length, _factorial(testCases.length)); - testCasesPermutations.forEach((List indexes) { + for (var indexes in testCasesPermutations) { // print the order so failures are reproducible printOnFailure('Running reset() test cases in order: $indexes'); Builder? builder; - indexes.forEach((index) { + for (var index in indexes) { if (builder == null) { // Initial size small enough so at least one test case increases it. // On the other hand, it's large enough so that some test cases don't. builder = Builder(initialSize: 32); } else { - builder!.reset(); + builder.reset(); } testCases[index](builder); - }); - }); + } + } } // Generate permutations of the given list @@ -731,7 +730,9 @@ class BuilderTest { // a very simple implementation of n! int _factorial(int n) { var result = 1; - for (var i = 2; i <= n; i++) result *= i; + for (var i = 2; i <= n; i++) { + result *= i; + } return result; } } @@ -836,7 +837,7 @@ class StringListWrapperImpl { StringListWrapperImpl(this.bp, this.offset); - List? get items => const ListReader(const StringReader()) + List? get items => const ListReader(StringReader()) .vTableGetNullable(bp, offset, indexToField(0)); } @@ -845,7 +846,7 @@ class StringListWrapperReader extends TableReader { @override StringListWrapperImpl createObject(BufferContext object, int offset) { - return new StringListWrapperImpl(object, offset); + return StringListWrapperImpl(object, offset); } } @@ -865,7 +866,7 @@ class TestPointReader extends TableReader { @override TestPointImpl createObject(BufferContext object, int offset) { - return new TestPointImpl(object, offset); + return TestPointImpl(object, offset); } } diff --git a/dart/test/monster_test_my_game.example2_generated.dart b/dart/test/monster_test_my_game.example2_generated.dart index 723572c52..b12888747 100644 --- a/dart/test/monster_test_my_game.example2_generated.dart +++ b/dart/test/monster_test_my_game.example2_generated.dart @@ -12,11 +12,11 @@ import './monster_test_my_game.example_generated.dart' as my_game_example; class Monster { Monster._(this._bc, this._bcOffset); factory Monster(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _MonsterReader(); + static const fb.Reader reader = _MonsterReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -52,7 +52,7 @@ class _MonsterReader extends fb.TableReader { @override Monster createObject(fb.BufferContext bc, int offset) => - new Monster._(bc, offset); + Monster._(bc, offset); } class MonsterObjectBuilder extends fb.ObjectBuilder { @@ -69,9 +69,8 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } diff --git a/dart/test/monster_test_my_game.example_generated.dart b/dart/test/monster_test_my_game.example_generated.dart index 05bf51dbb..69c918a29 100644 --- a/dart/test/monster_test_my_game.example_generated.dart +++ b/dart/test/monster_test_my_game.example_generated.dart @@ -17,7 +17,7 @@ class Color { factory Color.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum Color'); + throw StateError('Invalid value $value for bit flag enum Color'); } return result; } @@ -27,20 +27,20 @@ class Color { static bool containsValue(int value) => values.containsKey(value); - static const Color Red = const Color._(1); + static const Color Red = Color._(1); /// \brief color Green /// Green is bit_flag with value (1u << 1) - static const Color Green = const Color._(2); + static const Color Green = Color._(2); /// \brief color Blue (1u << 3) - static const Color Blue = const Color._(8); + static const Color Blue = Color._(8); static const Map values = { 1: Red, 2: Green, 8: Blue}; - static const fb.Reader reader = const _ColorReader(); + static const fb.Reader reader = _ColorReader(); @override String toString() { @@ -56,7 +56,7 @@ class _ColorReader extends fb.Reader { @override Color read(fb.BufferContext bc, int offset) => - new Color.fromValue(const fb.Uint8Reader().read(bc, offset)); + Color.fromValue(const fb.Uint8Reader().read(bc, offset)); } class Race { @@ -66,7 +66,7 @@ class Race { factory Race.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum Race'); + throw StateError('Invalid value $value for bit flag enum Race'); } return result; } @@ -78,17 +78,17 @@ class Race { static const int maxValue = 2; static bool containsValue(int value) => values.containsKey(value); - static const Race None = const Race._(-1); - static const Race Human = const Race._(0); - static const Race Dwarf = const Race._(1); - static const Race Elf = const Race._(2); + static const Race None = Race._(-1); + static const Race Human = Race._(0); + static const Race Dwarf = Race._(1); + static const Race Elf = Race._(2); static const Map values = { -1: None, 0: Human, 1: Dwarf, 2: Elf}; - static const fb.Reader reader = const _RaceReader(); + static const fb.Reader reader = _RaceReader(); @override String toString() { @@ -104,7 +104,7 @@ class _RaceReader extends fb.Reader { @override Race read(fb.BufferContext bc, int offset) => - new Race.fromValue(const fb.Int8Reader().read(bc, offset)); + Race.fromValue(const fb.Int8Reader().read(bc, offset)); } class AnyTypeId { @@ -114,7 +114,7 @@ class AnyTypeId { factory AnyTypeId.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum AnyTypeId'); + throw StateError('Invalid value $value for bit flag enum AnyTypeId'); } return result; } @@ -126,17 +126,17 @@ class AnyTypeId { static const int maxValue = 3; static bool containsValue(int value) => values.containsKey(value); - static const AnyTypeId NONE = const AnyTypeId._(0); - static const AnyTypeId Monster = const AnyTypeId._(1); - static const AnyTypeId TestSimpleTableWithEnum = const AnyTypeId._(2); - static const AnyTypeId MyGame_Example2_Monster = const AnyTypeId._(3); + static const AnyTypeId NONE = AnyTypeId._(0); + static const AnyTypeId Monster = AnyTypeId._(1); + static const AnyTypeId TestSimpleTableWithEnum = AnyTypeId._(2); + static const AnyTypeId MyGame_Example2_Monster = AnyTypeId._(3); static const Map values = { 0: NONE, 1: Monster, 2: TestSimpleTableWithEnum, 3: MyGame_Example2_Monster}; - static const fb.Reader reader = const _AnyTypeIdReader(); + static const fb.Reader reader = _AnyTypeIdReader(); @override String toString() { @@ -152,7 +152,7 @@ class _AnyTypeIdReader extends fb.Reader { @override AnyTypeId read(fb.BufferContext bc, int offset) => - new AnyTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); + AnyTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); } class AnyUniqueAliasesTypeId { @@ -162,7 +162,7 @@ class AnyUniqueAliasesTypeId { factory AnyUniqueAliasesTypeId.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum AnyUniqueAliasesTypeId'); + throw StateError('Invalid value $value for bit flag enum AnyUniqueAliasesTypeId'); } return result; } @@ -174,17 +174,17 @@ class AnyUniqueAliasesTypeId { static const int maxValue = 3; static bool containsValue(int value) => values.containsKey(value); - static const AnyUniqueAliasesTypeId NONE = const AnyUniqueAliasesTypeId._(0); - static const AnyUniqueAliasesTypeId M = const AnyUniqueAliasesTypeId._(1); - static const AnyUniqueAliasesTypeId TS = const AnyUniqueAliasesTypeId._(2); - static const AnyUniqueAliasesTypeId M2 = const AnyUniqueAliasesTypeId._(3); + static const AnyUniqueAliasesTypeId NONE = AnyUniqueAliasesTypeId._(0); + static const AnyUniqueAliasesTypeId M = AnyUniqueAliasesTypeId._(1); + static const AnyUniqueAliasesTypeId TS = AnyUniqueAliasesTypeId._(2); + static const AnyUniqueAliasesTypeId M2 = AnyUniqueAliasesTypeId._(3); static const Map values = { 0: NONE, 1: M, 2: TS, 3: M2}; - static const fb.Reader reader = const _AnyUniqueAliasesTypeIdReader(); + static const fb.Reader reader = _AnyUniqueAliasesTypeIdReader(); @override String toString() { @@ -200,7 +200,7 @@ class _AnyUniqueAliasesTypeIdReader extends fb.Reader { @override AnyUniqueAliasesTypeId read(fb.BufferContext bc, int offset) => - new AnyUniqueAliasesTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); + AnyUniqueAliasesTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); } class AnyAmbiguousAliasesTypeId { @@ -210,7 +210,7 @@ class AnyAmbiguousAliasesTypeId { factory AnyAmbiguousAliasesTypeId.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum AnyAmbiguousAliasesTypeId'); + throw StateError('Invalid value $value for bit flag enum AnyAmbiguousAliasesTypeId'); } return result; } @@ -222,17 +222,17 @@ class AnyAmbiguousAliasesTypeId { static const int maxValue = 3; static bool containsValue(int value) => values.containsKey(value); - static const AnyAmbiguousAliasesTypeId NONE = const AnyAmbiguousAliasesTypeId._(0); - static const AnyAmbiguousAliasesTypeId M1 = const AnyAmbiguousAliasesTypeId._(1); - static const AnyAmbiguousAliasesTypeId M2 = const AnyAmbiguousAliasesTypeId._(2); - static const AnyAmbiguousAliasesTypeId M3 = const AnyAmbiguousAliasesTypeId._(3); + static const AnyAmbiguousAliasesTypeId NONE = AnyAmbiguousAliasesTypeId._(0); + static const AnyAmbiguousAliasesTypeId M1 = AnyAmbiguousAliasesTypeId._(1); + static const AnyAmbiguousAliasesTypeId M2 = AnyAmbiguousAliasesTypeId._(2); + static const AnyAmbiguousAliasesTypeId M3 = AnyAmbiguousAliasesTypeId._(3); static const Map values = { 0: NONE, 1: M1, 2: M2, 3: M3}; - static const fb.Reader reader = const _AnyAmbiguousAliasesTypeIdReader(); + static const fb.Reader reader = _AnyAmbiguousAliasesTypeIdReader(); @override String toString() { @@ -248,13 +248,13 @@ class _AnyAmbiguousAliasesTypeIdReader extends fb.Reader - new AnyAmbiguousAliasesTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); + AnyAmbiguousAliasesTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); } class Test { Test._(this._bc, this._bcOffset); - static const fb.Reader reader = const _TestReader(); + static const fb.Reader reader = _TestReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -306,11 +306,11 @@ class _TestReader extends fb.StructReader { @override Test createObject(fb.BufferContext bc, int offset) => - new Test._(bc, offset); + Test._(bc, offset); } class TestBuilder { - TestBuilder(this.fbBuilder) {} + TestBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -346,20 +346,19 @@ class TestObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class TestSimpleTableWithEnum { TestSimpleTableWithEnum._(this._bc, this._bcOffset); factory TestSimpleTableWithEnum(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _TestSimpleTableWithEnumReader(); + static const fb.Reader reader = _TestSimpleTableWithEnumReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -403,11 +402,11 @@ class _TestSimpleTableWithEnumReader extends fb.TableReader - new TestSimpleTableWithEnum._(bc, offset); + TestSimpleTableWithEnum._(bc, offset); } class TestSimpleTableWithEnumBuilder { - TestSimpleTableWithEnumBuilder(this.fbBuilder) {} + TestSimpleTableWithEnumBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -444,16 +443,15 @@ class TestSimpleTableWithEnumObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class Vec3 { Vec3._(this._bc, this._bcOffset); - static const fb.Reader reader = const _Vec3Reader(); + static const fb.Reader reader = _Vec3Reader(); final fb.BufferContext _bc; final int _bcOffset; @@ -527,11 +525,11 @@ class _Vec3Reader extends fb.StructReader { @override Vec3 createObject(fb.BufferContext bc, int offset) => - new Vec3._(bc, offset); + Vec3._(bc, offset); } class Vec3Builder { - Vec3Builder(this.fbBuilder) {} + Vec3Builder(this.fbBuilder); final fb.Builder fbBuilder; @@ -591,16 +589,15 @@ class Vec3ObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class Ability { Ability._(this._bc, this._bcOffset); - static const fb.Reader reader = const _AbilityReader(); + static const fb.Reader reader = _AbilityReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -651,11 +648,11 @@ class _AbilityReader extends fb.StructReader { @override Ability createObject(fb.BufferContext bc, int offset) => - new Ability._(bc, offset); + Ability._(bc, offset); } class AbilityBuilder { - AbilityBuilder(this.fbBuilder) {} + AbilityBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -689,16 +686,15 @@ class AbilityObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class StructOfStructs { StructOfStructs._(this._bc, this._bcOffset); - static const fb.Reader reader = const _StructOfStructsReader(); + static const fb.Reader reader = _StructOfStructsReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -754,11 +750,11 @@ class _StructOfStructsReader extends fb.StructReader { @override StructOfStructs createObject(fb.BufferContext bc, int offset) => - new StructOfStructs._(bc, offset); + StructOfStructs._(bc, offset); } class StructOfStructsBuilder { - StructOfStructsBuilder(this.fbBuilder) {} + StructOfStructsBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -797,20 +793,19 @@ class StructOfStructsObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class Stat { Stat._(this._bc, this._bcOffset); factory Stat(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _StatReader(); + static const fb.Reader reader = _StatReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -866,11 +861,11 @@ class _StatReader extends fb.TableReader { @override Stat createObject(fb.BufferContext bc, int offset) => - new Stat._(bc, offset); + Stat._(bc, offset); } class StatBuilder { - StatBuilder(this.fbBuilder) {} + StatBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -925,20 +920,19 @@ class StatObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class Referrable { Referrable._(this._bc, this._bcOffset); factory Referrable(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _ReferrableReader(); + static const fb.Reader reader = _ReferrableReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -982,11 +976,11 @@ class _ReferrableReader extends fb.TableReader { @override Referrable createObject(fb.BufferContext bc, int offset) => - new Referrable._(bc, offset); + Referrable._(bc, offset); } class ReferrableBuilder { - ReferrableBuilder(this.fbBuilder) {} + ReferrableBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -1023,9 +1017,8 @@ class ReferrableObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } @@ -1033,11 +1026,11 @@ class ReferrableObjectBuilder extends fb.ObjectBuilder { class Monster { Monster._(this._bc, this._bcOffset); factory Monster(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _MonsterReader(); + static const fb.Reader reader = _MonsterReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -1046,10 +1039,10 @@ class Monster { int get mana => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 6, 150); int get hp => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 8, 100); String? get name => const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 10); - List? get inventory => const fb.ListReader(const fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 14); + List? get inventory => const fb.ListReader(fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 14); Color get color => Color.fromValue(const fb.Uint8Reader().vTableGet(_bc, _bcOffset, 16, 8)); AnyTypeId? get testType => AnyTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 18)); - dynamic? get test { + dynamic get test { switch (testType?.value) { case 1: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 20); case 2: return TestSimpleTableWithEnum.reader.vTableGetNullable(_bc, _bcOffset, 20); @@ -1058,12 +1051,12 @@ class Monster { } } List? get test4 => const fb.ListReader(Test.reader).vTableGetNullable(_bc, _bcOffset, 22); - List? get testarrayofstring => const fb.ListReader(const fb.StringReader()).vTableGetNullable(_bc, _bcOffset, 24); + List? get testarrayofstring => const fb.ListReader(fb.StringReader()).vTableGetNullable(_bc, _bcOffset, 24); /// an example documentation comment: this will end up in the generated code /// multiline too List? get testarrayoftables => const fb.ListReader(Monster.reader).vTableGetNullable(_bc, _bcOffset, 26); Monster? get enemy => Monster.reader.vTableGetNullable(_bc, _bcOffset, 28); - List? get testnestedflatbuffer => const fb.ListReader(const fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 30); + List? get testnestedflatbuffer => const fb.ListReader(fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 30); Stat? get testempty => Stat.reader.vTableGetNullable(_bc, _bcOffset, 32); bool get testbool => const fb.BoolReader().vTableGet(_bc, _bcOffset, 34, false); int get testhashs32Fnv1 => const fb.Int32Reader().vTableGet(_bc, _bcOffset, 36, 0); @@ -1074,27 +1067,27 @@ class Monster { int get testhashu32Fnv1a => const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 46, 0); int get testhashs64Fnv1a => const fb.Int64Reader().vTableGet(_bc, _bcOffset, 48, 0); int get testhashu64Fnv1a => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 50, 0); - List? get testarrayofbools => const fb.ListReader(const fb.BoolReader()).vTableGetNullable(_bc, _bcOffset, 52); + List? get testarrayofbools => const fb.ListReader(fb.BoolReader()).vTableGetNullable(_bc, _bcOffset, 52); double get testf => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 54, 3.14159); double get testf2 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 56, 3.0); double get testf3 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 58, 0.0); - List? get testarrayofstring2 => const fb.ListReader(const fb.StringReader()).vTableGetNullable(_bc, _bcOffset, 60); + List? get testarrayofstring2 => const fb.ListReader(fb.StringReader()).vTableGetNullable(_bc, _bcOffset, 60); List? get testarrayofsortedstruct => const fb.ListReader(Ability.reader).vTableGetNullable(_bc, _bcOffset, 62); - List? get flex => const fb.ListReader(const fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 64); + List? get flex => const fb.ListReader(fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 64); List? get test5 => const fb.ListReader(Test.reader).vTableGetNullable(_bc, _bcOffset, 66); - List? get vectorOfLongs => const fb.ListReader(const fb.Int64Reader()).vTableGetNullable(_bc, _bcOffset, 68); - List? get vectorOfDoubles => const fb.ListReader(const fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 70); + List? get vectorOfLongs => const fb.ListReader(fb.Int64Reader()).vTableGetNullable(_bc, _bcOffset, 68); + List? get vectorOfDoubles => const fb.ListReader(fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 70); my_game.InParentNamespace? get parentNamespaceTest => my_game.InParentNamespace.reader.vTableGetNullable(_bc, _bcOffset, 72); List? get vectorOfReferrables => const fb.ListReader(Referrable.reader).vTableGetNullable(_bc, _bcOffset, 74); int get singleWeakReference => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 76, 0); - List? get vectorOfWeakReferences => const fb.ListReader(const fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 78); + List? get vectorOfWeakReferences => const fb.ListReader(fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 78); List? get vectorOfStrongReferrables => const fb.ListReader(Referrable.reader).vTableGetNullable(_bc, _bcOffset, 80); int get coOwningReference => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 82, 0); - List? get vectorOfCoOwningReferences => const fb.ListReader(const fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 84); + List? get vectorOfCoOwningReferences => const fb.ListReader(fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 84); int get nonOwningReference => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 86, 0); - List? get vectorOfNonOwningReferences => const fb.ListReader(const fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 88); + List? get vectorOfNonOwningReferences => const fb.ListReader(fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 88); AnyUniqueAliasesTypeId? get anyUniqueType => AnyUniqueAliasesTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 90)); - dynamic? get anyUnique { + dynamic get anyUnique { switch (anyUniqueType?.value) { case 1: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 92); case 2: return TestSimpleTableWithEnum.reader.vTableGetNullable(_bc, _bcOffset, 92); @@ -1103,7 +1096,7 @@ class Monster { } } AnyAmbiguousAliasesTypeId? get anyAmbiguousType => AnyAmbiguousAliasesTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 94)); - dynamic? get anyAmbiguous { + dynamic get anyAmbiguous { switch (anyAmbiguousType?.value) { case 1: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 96); case 2: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 96); @@ -1113,7 +1106,7 @@ class Monster { } List? get vectorOfEnums => const fb.ListReader(Color.reader).vTableGetNullable(_bc, _bcOffset, 98); Race get signedEnum => Race.fromValue(const fb.Int8Reader().vTableGet(_bc, _bcOffset, 100, -1)); - List? get testrequirednestedflatbuffer => const fb.ListReader(const fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 102); + List? get testrequirednestedflatbuffer => const fb.ListReader(fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 102); List? get scalarKeySortedTables => const fb.ListReader(Stat.reader).vTableGetNullable(_bc, _bcOffset, 104); @override @@ -1126,15 +1119,15 @@ class Monster { mana: mana, hp: hp, name: name, - inventory: const fb.ListReader(const fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 14), + inventory: const fb.ListReader(fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 14), color: color, testType: testType, test: test, test4: test4?.map((e) => e.unpack()).toList(), - testarrayofstring: const fb.ListReader(const fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24), + testarrayofstring: const fb.ListReader(fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24), testarrayoftables: testarrayoftables?.map((e) => e.unpack()).toList(), enemy: enemy?.unpack(), - testnestedflatbuffer: const fb.ListReader(const fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 30), + testnestedflatbuffer: const fb.ListReader(fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 30), testempty: testempty?.unpack(), testbool: testbool, testhashs32Fnv1: testhashs32Fnv1, @@ -1145,32 +1138,32 @@ class Monster { testhashu32Fnv1a: testhashu32Fnv1a, testhashs64Fnv1a: testhashs64Fnv1a, testhashu64Fnv1a: testhashu64Fnv1a, - testarrayofbools: const fb.ListReader(const fb.BoolReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 52), + testarrayofbools: const fb.ListReader(fb.BoolReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 52), testf: testf, testf2: testf2, testf3: testf3, - testarrayofstring2: const fb.ListReader(const fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 60), + testarrayofstring2: const fb.ListReader(fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 60), testarrayofsortedstruct: testarrayofsortedstruct?.map((e) => e.unpack()).toList(), - flex: const fb.ListReader(const fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 64), + flex: const fb.ListReader(fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 64), test5: test5?.map((e) => e.unpack()).toList(), - vectorOfLongs: const fb.ListReader(const fb.Int64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 68), - vectorOfDoubles: const fb.ListReader(const fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 70), + vectorOfLongs: const fb.ListReader(fb.Int64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 68), + vectorOfDoubles: const fb.ListReader(fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 70), parentNamespaceTest: parentNamespaceTest?.unpack(), vectorOfReferrables: vectorOfReferrables?.map((e) => e.unpack()).toList(), singleWeakReference: singleWeakReference, - vectorOfWeakReferences: const fb.ListReader(const fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 78), + vectorOfWeakReferences: const fb.ListReader(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 78), vectorOfStrongReferrables: vectorOfStrongReferrables?.map((e) => e.unpack()).toList(), coOwningReference: coOwningReference, - vectorOfCoOwningReferences: const fb.ListReader(const fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 84), + vectorOfCoOwningReferences: const fb.ListReader(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 84), nonOwningReference: nonOwningReference, - vectorOfNonOwningReferences: const fb.ListReader(const fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 88), + vectorOfNonOwningReferences: const fb.ListReader(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 88), anyUniqueType: anyUniqueType, anyUnique: anyUnique, anyAmbiguousType: anyAmbiguousType, anyAmbiguous: anyAmbiguous, vectorOfEnums: const fb.ListReader(Color.reader, lazy: false).vTableGetNullable(_bc, _bcOffset, 98), signedEnum: signedEnum, - testrequirednestedflatbuffer: const fb.ListReader(const fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 102), + testrequirednestedflatbuffer: const fb.ListReader(fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 102), scalarKeySortedTables: scalarKeySortedTables?.map((e) => e.unpack()).toList()); static int pack(fb.Builder fbBuilder, MonsterT? object) { @@ -1188,7 +1181,7 @@ class MonsterT { List? inventory; Color color; AnyTypeId? testType; - dynamic? test; + dynamic test; List? test4; List? testarrayofstring; /// an example documentation comment: this will end up in the generated code @@ -1226,9 +1219,9 @@ class MonsterT { int nonOwningReference; List? vectorOfNonOwningReferences; AnyUniqueAliasesTypeId? anyUniqueType; - dynamic? anyUnique; + dynamic anyUnique; AnyAmbiguousAliasesTypeId? anyAmbiguousType; - dynamic? anyAmbiguous; + dynamic anyAmbiguous; List? vectorOfEnums; Race signedEnum; List? testrequirednestedflatbuffer; @@ -1292,9 +1285,9 @@ class MonsterT { final int? inventoryOffset = inventory == null ? null : fbBuilder.writeListUint8(inventory!); final int? testOffset = test?.pack(fbBuilder); - int? test4Offset = null; + int? test4Offset; if (test4 != null) { - test4!.forEach((e) => e.pack(fbBuilder)); + for (var e in test4!) { e.pack(fbBuilder); } test4Offset = fbBuilder.endStructVector(test4!.length); } final int? testarrayofstringOffset = testarrayofstring == null ? null @@ -1309,16 +1302,16 @@ class MonsterT { : fbBuilder.writeListBool(testarrayofbools!); final int? testarrayofstring2Offset = testarrayofstring2 == null ? null : fbBuilder.writeList(testarrayofstring2!.map(fbBuilder.writeString).toList()); - int? testarrayofsortedstructOffset = null; + int? testarrayofsortedstructOffset; if (testarrayofsortedstruct != null) { - testarrayofsortedstruct!.forEach((e) => e.pack(fbBuilder)); + for (var e in testarrayofsortedstruct!) { e.pack(fbBuilder); } testarrayofsortedstructOffset = fbBuilder.endStructVector(testarrayofsortedstruct!.length); } final int? flexOffset = flex == null ? null : fbBuilder.writeListUint8(flex!); - int? test5Offset = null; + int? test5Offset; if (test5 != null) { - test5!.forEach((e) => e.pack(fbBuilder)); + for (var e in test5!) { e.pack(fbBuilder); } test5Offset = fbBuilder.endStructVector(test5!.length); } final int? vectorOfLongsOffset = vectorOfLongs == null ? null @@ -1411,11 +1404,11 @@ class _MonsterReader extends fb.TableReader { @override Monster createObject(fb.BufferContext bc, int offset) => - new Monster._(bc, offset); + Monster._(bc, offset); } class MonsterBuilder { - MonsterBuilder(this.fbBuilder) {} + MonsterBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -1637,7 +1630,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { final List? _inventory; final Color? _color; final AnyTypeId? _testType; - final dynamic? _test; + final dynamic _test; final List? _test4; final List? _testarrayofstring; final List? _testarrayoftables; @@ -1673,9 +1666,9 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { final int? _nonOwningReference; final List? _vectorOfNonOwningReferences; final AnyUniqueAliasesTypeId? _anyUniqueType; - final dynamic? _anyUnique; + final dynamic _anyUnique; final AnyAmbiguousAliasesTypeId? _anyAmbiguousType; - final dynamic? _anyAmbiguous; + final dynamic _anyAmbiguous; final List? _vectorOfEnums; final Race? _signedEnum; final List? _testrequirednestedflatbuffer; @@ -1689,7 +1682,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { List? inventory, Color? color, AnyTypeId? testType, - dynamic? test, + dynamic test, List? test4, List? testarrayofstring, List? testarrayoftables, @@ -1725,9 +1718,9 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { int? nonOwningReference, List? vectorOfNonOwningReferences, AnyUniqueAliasesTypeId? anyUniqueType, - dynamic? anyUnique, + dynamic anyUnique, AnyAmbiguousAliasesTypeId? anyAmbiguousType, - dynamic? anyAmbiguous, + dynamic anyAmbiguous, List? vectorOfEnums, Race? signedEnum, List? testrequirednestedflatbuffer, @@ -1894,20 +1887,19 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class TypeAliases { TypeAliases._(this._bc, this._bcOffset); factory TypeAliases(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _TypeAliasesReader(); + static const fb.Reader reader = _TypeAliasesReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -1922,8 +1914,8 @@ class TypeAliases { int get u64 => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 18, 0); double get f32 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 20, 0.0); double get f64 => const fb.Float64Reader().vTableGet(_bc, _bcOffset, 22, 0.0); - List? get v8 => const fb.ListReader(const fb.Int8Reader()).vTableGetNullable(_bc, _bcOffset, 24); - List? get vf64 => const fb.ListReader(const fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 26); + List? get v8 => const fb.ListReader(fb.Int8Reader()).vTableGetNullable(_bc, _bcOffset, 24); + List? get vf64 => const fb.ListReader(fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 26); @override String toString() { @@ -1941,8 +1933,8 @@ class TypeAliases { u64: u64, f32: f32, f64: f64, - v8: const fb.ListReader(const fb.Int8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24), - vf64: const fb.ListReader(const fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 26)); + v8: const fb.ListReader(fb.Int8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24), + vf64: const fb.ListReader(fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 26)); static int pack(fb.Builder fbBuilder, TypeAliasesT? object) { if (object == null) return 0; @@ -2010,11 +2002,11 @@ class _TypeAliasesReader extends fb.TableReader { @override TypeAliases createObject(fb.BufferContext bc, int offset) => - new TypeAliases._(bc, offset); + TypeAliases._(bc, offset); } class TypeAliasesBuilder { - TypeAliasesBuilder(this.fbBuilder) {} + TypeAliasesBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -2143,9 +2135,8 @@ class TypeAliasesObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } diff --git a/dart/test/monster_test_my_game_generated.dart b/dart/test/monster_test_my_game_generated.dart index 07618f6c4..b76ae3d74 100644 --- a/dart/test/monster_test_my_game_generated.dart +++ b/dart/test/monster_test_my_game_generated.dart @@ -12,11 +12,11 @@ import './monster_test_my_game.example2_generated.dart' as my_game_example2; class InParentNamespace { InParentNamespace._(this._bc, this._bcOffset); factory InParentNamespace(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _InParentNamespaceReader(); + static const fb.Reader reader = _InParentNamespaceReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -52,7 +52,7 @@ class _InParentNamespaceReader extends fb.TableReader { @override InParentNamespace createObject(fb.BufferContext bc, int offset) => - new InParentNamespace._(bc, offset); + InParentNamespace._(bc, offset); } class InParentNamespaceObjectBuilder extends fb.ObjectBuilder { @@ -69,9 +69,8 @@ class InParentNamespaceObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } diff --git a/src/idl_gen_dart.cpp b/src/idl_gen_dart.cpp index 2cdaee381..755697a44 100644 --- a/src/idl_gen_dart.cpp +++ b/src/idl_gen_dart.cpp @@ -233,8 +233,7 @@ class DartGenerator : public BaseGenerator { code += " factory " + name + ".fromValue(int value) {\n"; code += " final result = values[value];\n"; code += " if (result == null) {\n"; - code += - " throw new StateError('Invalid value $value for bit flag enum "; + code += " throw StateError('Invalid value $value for bit flag enum "; code += name + "');\n"; code += " }\n"; @@ -265,8 +264,8 @@ class DartGenerator : public BaseGenerator { if (it != enum_def.Vals().begin()) { code += '\n'; } GenDocComment(ev.doc_comment, &code, "", " "); } - code += " static const " + name + " " + ev.name + " = "; - code += "const " + name + "._(" + enum_def.ToString(ev) + ");\n"; + code += " static const " + name + " " + ev.name + " = " + name + "._(" + + enum_def.ToString(ev) + ");\n"; } code += " static const Map values = {\n"; @@ -277,8 +276,8 @@ class DartGenerator : public BaseGenerator { } code += "};\n\n"; - code += " static const " + _kFb + ".Reader<" + name + - "> reader = const _" + name + "Reader();\n\n"; + code += " static const " + _kFb + ".Reader<" + name + "> reader = _" + + name + "Reader();\n\n"; code += " @override\n"; code += " String toString() {\n"; code += " return '" + name + "{value: $value}';\n"; @@ -301,7 +300,7 @@ class DartGenerator : public BaseGenerator { code += " @override\n"; code += " " + name + " read(" + _kFb + ".BufferContext bc, int offset) =>\n"; - code += " new " + name + ".fromValue(const " + _kFb + "." + + code += " " + name + ".fromValue(const " + _kFb + "." + GenType(enum_def.underlying_type) + "Reader().read(bc, offset));\n"; code += "}\n\n"; } @@ -330,24 +329,25 @@ class DartGenerator : public BaseGenerator { std::string GenReaderTypeName(const Type &type, Namespace *current_namespace, const FieldDef &def, - bool parent_is_vector = false, - bool lazy = true) { + bool parent_is_vector = false, bool lazy = true, + bool constConstruct = true) { + std::string prefix = (constConstruct ? "const " : "") + _kFb; if (type.base_type == BASE_TYPE_BOOL) { - return "const " + _kFb + ".BoolReader()"; + return prefix + ".BoolReader()"; } else if (IsVector(type)) { - return "const " + _kFb + ".ListReader<" + + return prefix + ".ListReader<" + GenDartTypeName(type.VectorType(), current_namespace, def) + ">(" + - GenReaderTypeName(type.VectorType(), current_namespace, def, - true) + + GenReaderTypeName(type.VectorType(), current_namespace, def, true, + true, false) + (lazy ? ")" : ", lazy: false)"); } else if (IsString(type)) { - return "const " + _kFb + ".StringReader()"; + return prefix + ".StringReader()"; } if (IsScalar(type.base_type)) { if (type.enum_def && parent_is_vector) { return GenDartTypeName(type, current_namespace, def) + ".reader"; } - return "const " + _kFb + "." + GenType(type) + "Reader()"; + return prefix + "." + GenType(type) + "Reader()"; } else { return GenDartTypeName(type, current_namespace, def) + ".reader"; } @@ -391,6 +391,15 @@ class DartGenerator : public BaseGenerator { } } + std::string GenDartTypeName(const Type &type, Namespace *current_namespace, + const FieldDef &def, bool nullable, + std::string struct_type_suffix) { + std::string typeName = + GenDartTypeName(type, current_namespace, def, struct_type_suffix); + if (nullable && typeName != "dynamic") typeName += "?"; + return typeName; + } + static const std::string MaybeWrapNamespace(const std::string &type_name, Namespace *current_ns, const FieldDef &field) { @@ -436,15 +445,15 @@ class DartGenerator : public BaseGenerator { code += " " + object_name + "._(this._bc, this._bcOffset);\n"; if (!struct_def.fixed) { code += " factory " + object_name + "(List bytes) {\n"; - code += " " + _kFb + ".BufferContext rootRef = new " + _kFb + - ".BufferContext.fromBytes(bytes);\n"; + code += + " final rootRef = " + _kFb + ".BufferContext.fromBytes(bytes);\n"; code += " return reader.read(rootRef, 0);\n"; code += " }\n"; } code += "\n"; code += " static const " + _kFb + ".Reader<" + object_name + - "> reader = const " + reader_name + "();\n\n"; + "> reader = " + reader_name + "();\n\n"; code += " final " + _kFb + ".BufferContext _bc;\n"; code += " final int _bcOffset;\n\n"; @@ -504,14 +513,13 @@ class DartGenerator : public BaseGenerator { const FieldDef &field = *it->second; std::string field_name = MakeCamel(field.name, false); - std::string type_name = GenDartTypeName( - field.value.type, struct_def.defined_namespace, field, "T"); - std::string defaultValue = getDefaultValue(field.value); - bool isNullable = defaultValue.empty() && !struct_def.fixed; + std::string type_name = + GenDartTypeName(field.value.type, struct_def.defined_namespace, field, + defaultValue.empty() && !struct_def.fixed, "T"); GenDocComment(field.doc_comment, &code, "", " "); - code += " " + type_name + (isNullable ? "? " : " ") + field_name + ";\n"; + code += " " + type_name + " " + field_name + ";\n"; if (!constructor_args.empty()) constructor_args += ",\n"; constructor_args += " "; @@ -648,15 +656,15 @@ class DartGenerator : public BaseGenerator { auto &field = *pair.second; std::string field_name = MakeCamel(field.name, false); - std::string type_name = GenDartTypeName( - field.value.type, struct_def.defined_namespace, field); - - GenDocComment(field.doc_comment, &code, "", " "); std::string defaultValue = getDefaultValue(field.value); bool isNullable = defaultValue.empty() && !struct_def.fixed; + std::string type_name = + GenDartTypeName(field.value.type, struct_def.defined_namespace, field, + isNullable, ""); - code += " " + type_name + (isNullable ? "?" : ""); - code += " get " + field_name; + GenDocComment(field.doc_comment, &code, "", " "); + + code += " " + type_name + " get " + field_name; if (field.value.type.base_type == BASE_TYPE_UNION) { code += " {\n"; code += " switch (" + field_name + "Type?.value) {\n"; @@ -773,7 +781,7 @@ class DartGenerator : public BaseGenerator { } code += " @override\n"; code += " " + impl_name + - " createObject(fb.BufferContext bc, int offset) => \n new " + + " createObject(fb.BufferContext bc, int offset) => \n " + impl_name + "._(bc, offset);\n"; code += "}\n\n"; } @@ -786,7 +794,7 @@ class DartGenerator : public BaseGenerator { auto &builder_name = *builder_name_ptr; code += "class " + builder_name + " {\n"; - code += " " + builder_name + "(this.fbBuilder) {}\n\n"; + code += " " + builder_name + "(this.fbBuilder);\n\n"; code += " final " + _kFb + ".Builder fbBuilder;\n\n"; if (struct_def.fixed) { @@ -904,9 +912,8 @@ class DartGenerator : public BaseGenerator { code += " final " + GenDartTypeName(field.value.type, struct_def.defined_namespace, - field, "ObjectBuilder") + - (struct_def.fixed ? "" : "?") + " _" + - MakeCamel(field.name, false) + ";\n"; + field, !struct_def.fixed, "ObjectBuilder") + + " _" + MakeCamel(field.name, false) + ";\n"; } code += "\n"; code += " " + builder_name + "("; @@ -921,9 +928,8 @@ class DartGenerator : public BaseGenerator { code += " "; code += (struct_def.fixed ? "required " : "") + GenDartTypeName(field.value.type, struct_def.defined_namespace, - field, "ObjectBuilder") + - (struct_def.fixed ? "" : "?") + " " + - MakeCamel(field.name, false) + ",\n"; + field, !struct_def.fixed, "ObjectBuilder") + + " " + MakeCamel(field.name, false) + ",\n"; } code += " })\n"; code += " : "; @@ -953,10 +959,9 @@ class DartGenerator : public BaseGenerator { code += " /// Convenience method to serialize to byte list.\n"; code += " @override\n"; code += " Uint8List toBytes([String? fileIdentifier]) {\n"; - code += " " + _kFb + ".Builder fbBuilder = new "; - code += _kFb + ".Builder(deduplicateTables: false);\n"; - code += " int offset = finish(fbBuilder);\n"; - code += " fbBuilder.finish(offset, fileIdentifier);\n"; + code += " final fbBuilder = " + _kFb + + ".Builder(deduplicateTables: false);\n"; + code += " fbBuilder.finish(finish(fbBuilder), fileIdentifier);\n"; code += " return fbBuilder.buffer;\n"; code += " }\n"; code += "}\n"; @@ -982,10 +987,10 @@ class DartGenerator : public BaseGenerator { if (pack && IsVector(field.value.type) && field.value.type.VectorType().base_type == BASE_TYPE_STRUCT && field.value.type.struct_def->fixed) { - code += " int? " + offset_name + " = null;\n"; + code += " int? " + offset_name + ";\n"; code += " if (" + field_name + " != null) {\n"; code += - " " + field_name + "!.forEach((e) => e.pack(fbBuilder));\n"; + " for (var e in " + field_name + "!) { e.pack(fbBuilder); }\n"; code += " " + MakeCamel(field.name, false) + "Offset = fbBuilder.endStructVector(" + field_name + "!.length);\n"; diff --git a/tests/monster_extra_my_game_generated.dart b/tests/monster_extra_my_game_generated.dart index 7bc9ebd66..3642525ea 100644 --- a/tests/monster_extra_my_game_generated.dart +++ b/tests/monster_extra_my_game_generated.dart @@ -10,11 +10,11 @@ import 'package:flat_buffers/flat_buffers.dart' as fb; class MonsterExtra { MonsterExtra._(this._bc, this._bcOffset); factory MonsterExtra(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _MonsterExtraReader(); + static const fb.Reader reader = _MonsterExtraReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -27,8 +27,8 @@ class MonsterExtra { double get f1 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 14, double.nan); double get f2 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 16, double.infinity); double get f3 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 18, double.negativeInfinity); - List? get dvec => const fb.ListReader(const fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 20); - List? get fvec => const fb.ListReader(const fb.Float32Reader()).vTableGetNullable(_bc, _bcOffset, 22); + List? get dvec => const fb.ListReader(fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 20); + List? get fvec => const fb.ListReader(fb.Float32Reader()).vTableGetNullable(_bc, _bcOffset, 22); @override String toString() { @@ -44,8 +44,8 @@ class MonsterExtra { f1: f1, f2: f2, f3: f3, - dvec: const fb.ListReader(const fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 20), - fvec: const fb.ListReader(const fb.Float32Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 22)); + dvec: const fb.ListReader(fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 20), + fvec: const fb.ListReader(fb.Float32Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 22)); static int pack(fb.Builder fbBuilder, MonsterExtraT? object) { if (object == null) return 0; @@ -107,11 +107,11 @@ class _MonsterExtraReader extends fb.TableReader { @override MonsterExtra createObject(fb.BufferContext bc, int offset) => - new MonsterExtra._(bc, offset); + MonsterExtra._(bc, offset); } class MonsterExtraBuilder { - MonsterExtraBuilder(this.fbBuilder) {} + MonsterExtraBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -224,9 +224,8 @@ class MonsterExtraObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } diff --git a/tests/monster_test_my_game.example2_generated.dart b/tests/monster_test_my_game.example2_generated.dart index 723572c52..b12888747 100644 --- a/tests/monster_test_my_game.example2_generated.dart +++ b/tests/monster_test_my_game.example2_generated.dart @@ -12,11 +12,11 @@ import './monster_test_my_game.example_generated.dart' as my_game_example; class Monster { Monster._(this._bc, this._bcOffset); factory Monster(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _MonsterReader(); + static const fb.Reader reader = _MonsterReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -52,7 +52,7 @@ class _MonsterReader extends fb.TableReader { @override Monster createObject(fb.BufferContext bc, int offset) => - new Monster._(bc, offset); + Monster._(bc, offset); } class MonsterObjectBuilder extends fb.ObjectBuilder { @@ -69,9 +69,8 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } diff --git a/tests/monster_test_my_game.example_generated.dart b/tests/monster_test_my_game.example_generated.dart index 05bf51dbb..69c918a29 100644 --- a/tests/monster_test_my_game.example_generated.dart +++ b/tests/monster_test_my_game.example_generated.dart @@ -17,7 +17,7 @@ class Color { factory Color.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum Color'); + throw StateError('Invalid value $value for bit flag enum Color'); } return result; } @@ -27,20 +27,20 @@ class Color { static bool containsValue(int value) => values.containsKey(value); - static const Color Red = const Color._(1); + static const Color Red = Color._(1); /// \brief color Green /// Green is bit_flag with value (1u << 1) - static const Color Green = const Color._(2); + static const Color Green = Color._(2); /// \brief color Blue (1u << 3) - static const Color Blue = const Color._(8); + static const Color Blue = Color._(8); static const Map values = { 1: Red, 2: Green, 8: Blue}; - static const fb.Reader reader = const _ColorReader(); + static const fb.Reader reader = _ColorReader(); @override String toString() { @@ -56,7 +56,7 @@ class _ColorReader extends fb.Reader { @override Color read(fb.BufferContext bc, int offset) => - new Color.fromValue(const fb.Uint8Reader().read(bc, offset)); + Color.fromValue(const fb.Uint8Reader().read(bc, offset)); } class Race { @@ -66,7 +66,7 @@ class Race { factory Race.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum Race'); + throw StateError('Invalid value $value for bit flag enum Race'); } return result; } @@ -78,17 +78,17 @@ class Race { static const int maxValue = 2; static bool containsValue(int value) => values.containsKey(value); - static const Race None = const Race._(-1); - static const Race Human = const Race._(0); - static const Race Dwarf = const Race._(1); - static const Race Elf = const Race._(2); + static const Race None = Race._(-1); + static const Race Human = Race._(0); + static const Race Dwarf = Race._(1); + static const Race Elf = Race._(2); static const Map values = { -1: None, 0: Human, 1: Dwarf, 2: Elf}; - static const fb.Reader reader = const _RaceReader(); + static const fb.Reader reader = _RaceReader(); @override String toString() { @@ -104,7 +104,7 @@ class _RaceReader extends fb.Reader { @override Race read(fb.BufferContext bc, int offset) => - new Race.fromValue(const fb.Int8Reader().read(bc, offset)); + Race.fromValue(const fb.Int8Reader().read(bc, offset)); } class AnyTypeId { @@ -114,7 +114,7 @@ class AnyTypeId { factory AnyTypeId.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum AnyTypeId'); + throw StateError('Invalid value $value for bit flag enum AnyTypeId'); } return result; } @@ -126,17 +126,17 @@ class AnyTypeId { static const int maxValue = 3; static bool containsValue(int value) => values.containsKey(value); - static const AnyTypeId NONE = const AnyTypeId._(0); - static const AnyTypeId Monster = const AnyTypeId._(1); - static const AnyTypeId TestSimpleTableWithEnum = const AnyTypeId._(2); - static const AnyTypeId MyGame_Example2_Monster = const AnyTypeId._(3); + static const AnyTypeId NONE = AnyTypeId._(0); + static const AnyTypeId Monster = AnyTypeId._(1); + static const AnyTypeId TestSimpleTableWithEnum = AnyTypeId._(2); + static const AnyTypeId MyGame_Example2_Monster = AnyTypeId._(3); static const Map values = { 0: NONE, 1: Monster, 2: TestSimpleTableWithEnum, 3: MyGame_Example2_Monster}; - static const fb.Reader reader = const _AnyTypeIdReader(); + static const fb.Reader reader = _AnyTypeIdReader(); @override String toString() { @@ -152,7 +152,7 @@ class _AnyTypeIdReader extends fb.Reader { @override AnyTypeId read(fb.BufferContext bc, int offset) => - new AnyTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); + AnyTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); } class AnyUniqueAliasesTypeId { @@ -162,7 +162,7 @@ class AnyUniqueAliasesTypeId { factory AnyUniqueAliasesTypeId.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum AnyUniqueAliasesTypeId'); + throw StateError('Invalid value $value for bit flag enum AnyUniqueAliasesTypeId'); } return result; } @@ -174,17 +174,17 @@ class AnyUniqueAliasesTypeId { static const int maxValue = 3; static bool containsValue(int value) => values.containsKey(value); - static const AnyUniqueAliasesTypeId NONE = const AnyUniqueAliasesTypeId._(0); - static const AnyUniqueAliasesTypeId M = const AnyUniqueAliasesTypeId._(1); - static const AnyUniqueAliasesTypeId TS = const AnyUniqueAliasesTypeId._(2); - static const AnyUniqueAliasesTypeId M2 = const AnyUniqueAliasesTypeId._(3); + static const AnyUniqueAliasesTypeId NONE = AnyUniqueAliasesTypeId._(0); + static const AnyUniqueAliasesTypeId M = AnyUniqueAliasesTypeId._(1); + static const AnyUniqueAliasesTypeId TS = AnyUniqueAliasesTypeId._(2); + static const AnyUniqueAliasesTypeId M2 = AnyUniqueAliasesTypeId._(3); static const Map values = { 0: NONE, 1: M, 2: TS, 3: M2}; - static const fb.Reader reader = const _AnyUniqueAliasesTypeIdReader(); + static const fb.Reader reader = _AnyUniqueAliasesTypeIdReader(); @override String toString() { @@ -200,7 +200,7 @@ class _AnyUniqueAliasesTypeIdReader extends fb.Reader { @override AnyUniqueAliasesTypeId read(fb.BufferContext bc, int offset) => - new AnyUniqueAliasesTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); + AnyUniqueAliasesTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); } class AnyAmbiguousAliasesTypeId { @@ -210,7 +210,7 @@ class AnyAmbiguousAliasesTypeId { factory AnyAmbiguousAliasesTypeId.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum AnyAmbiguousAliasesTypeId'); + throw StateError('Invalid value $value for bit flag enum AnyAmbiguousAliasesTypeId'); } return result; } @@ -222,17 +222,17 @@ class AnyAmbiguousAliasesTypeId { static const int maxValue = 3; static bool containsValue(int value) => values.containsKey(value); - static const AnyAmbiguousAliasesTypeId NONE = const AnyAmbiguousAliasesTypeId._(0); - static const AnyAmbiguousAliasesTypeId M1 = const AnyAmbiguousAliasesTypeId._(1); - static const AnyAmbiguousAliasesTypeId M2 = const AnyAmbiguousAliasesTypeId._(2); - static const AnyAmbiguousAliasesTypeId M3 = const AnyAmbiguousAliasesTypeId._(3); + static const AnyAmbiguousAliasesTypeId NONE = AnyAmbiguousAliasesTypeId._(0); + static const AnyAmbiguousAliasesTypeId M1 = AnyAmbiguousAliasesTypeId._(1); + static const AnyAmbiguousAliasesTypeId M2 = AnyAmbiguousAliasesTypeId._(2); + static const AnyAmbiguousAliasesTypeId M3 = AnyAmbiguousAliasesTypeId._(3); static const Map values = { 0: NONE, 1: M1, 2: M2, 3: M3}; - static const fb.Reader reader = const _AnyAmbiguousAliasesTypeIdReader(); + static const fb.Reader reader = _AnyAmbiguousAliasesTypeIdReader(); @override String toString() { @@ -248,13 +248,13 @@ class _AnyAmbiguousAliasesTypeIdReader extends fb.Reader - new AnyAmbiguousAliasesTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); + AnyAmbiguousAliasesTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); } class Test { Test._(this._bc, this._bcOffset); - static const fb.Reader reader = const _TestReader(); + static const fb.Reader reader = _TestReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -306,11 +306,11 @@ class _TestReader extends fb.StructReader { @override Test createObject(fb.BufferContext bc, int offset) => - new Test._(bc, offset); + Test._(bc, offset); } class TestBuilder { - TestBuilder(this.fbBuilder) {} + TestBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -346,20 +346,19 @@ class TestObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class TestSimpleTableWithEnum { TestSimpleTableWithEnum._(this._bc, this._bcOffset); factory TestSimpleTableWithEnum(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _TestSimpleTableWithEnumReader(); + static const fb.Reader reader = _TestSimpleTableWithEnumReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -403,11 +402,11 @@ class _TestSimpleTableWithEnumReader extends fb.TableReader - new TestSimpleTableWithEnum._(bc, offset); + TestSimpleTableWithEnum._(bc, offset); } class TestSimpleTableWithEnumBuilder { - TestSimpleTableWithEnumBuilder(this.fbBuilder) {} + TestSimpleTableWithEnumBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -444,16 +443,15 @@ class TestSimpleTableWithEnumObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class Vec3 { Vec3._(this._bc, this._bcOffset); - static const fb.Reader reader = const _Vec3Reader(); + static const fb.Reader reader = _Vec3Reader(); final fb.BufferContext _bc; final int _bcOffset; @@ -527,11 +525,11 @@ class _Vec3Reader extends fb.StructReader { @override Vec3 createObject(fb.BufferContext bc, int offset) => - new Vec3._(bc, offset); + Vec3._(bc, offset); } class Vec3Builder { - Vec3Builder(this.fbBuilder) {} + Vec3Builder(this.fbBuilder); final fb.Builder fbBuilder; @@ -591,16 +589,15 @@ class Vec3ObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class Ability { Ability._(this._bc, this._bcOffset); - static const fb.Reader reader = const _AbilityReader(); + static const fb.Reader reader = _AbilityReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -651,11 +648,11 @@ class _AbilityReader extends fb.StructReader { @override Ability createObject(fb.BufferContext bc, int offset) => - new Ability._(bc, offset); + Ability._(bc, offset); } class AbilityBuilder { - AbilityBuilder(this.fbBuilder) {} + AbilityBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -689,16 +686,15 @@ class AbilityObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class StructOfStructs { StructOfStructs._(this._bc, this._bcOffset); - static const fb.Reader reader = const _StructOfStructsReader(); + static const fb.Reader reader = _StructOfStructsReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -754,11 +750,11 @@ class _StructOfStructsReader extends fb.StructReader { @override StructOfStructs createObject(fb.BufferContext bc, int offset) => - new StructOfStructs._(bc, offset); + StructOfStructs._(bc, offset); } class StructOfStructsBuilder { - StructOfStructsBuilder(this.fbBuilder) {} + StructOfStructsBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -797,20 +793,19 @@ class StructOfStructsObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class Stat { Stat._(this._bc, this._bcOffset); factory Stat(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _StatReader(); + static const fb.Reader reader = _StatReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -866,11 +861,11 @@ class _StatReader extends fb.TableReader { @override Stat createObject(fb.BufferContext bc, int offset) => - new Stat._(bc, offset); + Stat._(bc, offset); } class StatBuilder { - StatBuilder(this.fbBuilder) {} + StatBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -925,20 +920,19 @@ class StatObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class Referrable { Referrable._(this._bc, this._bcOffset); factory Referrable(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _ReferrableReader(); + static const fb.Reader reader = _ReferrableReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -982,11 +976,11 @@ class _ReferrableReader extends fb.TableReader { @override Referrable createObject(fb.BufferContext bc, int offset) => - new Referrable._(bc, offset); + Referrable._(bc, offset); } class ReferrableBuilder { - ReferrableBuilder(this.fbBuilder) {} + ReferrableBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -1023,9 +1017,8 @@ class ReferrableObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } @@ -1033,11 +1026,11 @@ class ReferrableObjectBuilder extends fb.ObjectBuilder { class Monster { Monster._(this._bc, this._bcOffset); factory Monster(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _MonsterReader(); + static const fb.Reader reader = _MonsterReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -1046,10 +1039,10 @@ class Monster { int get mana => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 6, 150); int get hp => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 8, 100); String? get name => const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 10); - List? get inventory => const fb.ListReader(const fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 14); + List? get inventory => const fb.ListReader(fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 14); Color get color => Color.fromValue(const fb.Uint8Reader().vTableGet(_bc, _bcOffset, 16, 8)); AnyTypeId? get testType => AnyTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 18)); - dynamic? get test { + dynamic get test { switch (testType?.value) { case 1: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 20); case 2: return TestSimpleTableWithEnum.reader.vTableGetNullable(_bc, _bcOffset, 20); @@ -1058,12 +1051,12 @@ class Monster { } } List? get test4 => const fb.ListReader(Test.reader).vTableGetNullable(_bc, _bcOffset, 22); - List? get testarrayofstring => const fb.ListReader(const fb.StringReader()).vTableGetNullable(_bc, _bcOffset, 24); + List? get testarrayofstring => const fb.ListReader(fb.StringReader()).vTableGetNullable(_bc, _bcOffset, 24); /// an example documentation comment: this will end up in the generated code /// multiline too List? get testarrayoftables => const fb.ListReader(Monster.reader).vTableGetNullable(_bc, _bcOffset, 26); Monster? get enemy => Monster.reader.vTableGetNullable(_bc, _bcOffset, 28); - List? get testnestedflatbuffer => const fb.ListReader(const fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 30); + List? get testnestedflatbuffer => const fb.ListReader(fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 30); Stat? get testempty => Stat.reader.vTableGetNullable(_bc, _bcOffset, 32); bool get testbool => const fb.BoolReader().vTableGet(_bc, _bcOffset, 34, false); int get testhashs32Fnv1 => const fb.Int32Reader().vTableGet(_bc, _bcOffset, 36, 0); @@ -1074,27 +1067,27 @@ class Monster { int get testhashu32Fnv1a => const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 46, 0); int get testhashs64Fnv1a => const fb.Int64Reader().vTableGet(_bc, _bcOffset, 48, 0); int get testhashu64Fnv1a => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 50, 0); - List? get testarrayofbools => const fb.ListReader(const fb.BoolReader()).vTableGetNullable(_bc, _bcOffset, 52); + List? get testarrayofbools => const fb.ListReader(fb.BoolReader()).vTableGetNullable(_bc, _bcOffset, 52); double get testf => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 54, 3.14159); double get testf2 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 56, 3.0); double get testf3 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 58, 0.0); - List? get testarrayofstring2 => const fb.ListReader(const fb.StringReader()).vTableGetNullable(_bc, _bcOffset, 60); + List? get testarrayofstring2 => const fb.ListReader(fb.StringReader()).vTableGetNullable(_bc, _bcOffset, 60); List? get testarrayofsortedstruct => const fb.ListReader(Ability.reader).vTableGetNullable(_bc, _bcOffset, 62); - List? get flex => const fb.ListReader(const fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 64); + List? get flex => const fb.ListReader(fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 64); List? get test5 => const fb.ListReader(Test.reader).vTableGetNullable(_bc, _bcOffset, 66); - List? get vectorOfLongs => const fb.ListReader(const fb.Int64Reader()).vTableGetNullable(_bc, _bcOffset, 68); - List? get vectorOfDoubles => const fb.ListReader(const fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 70); + List? get vectorOfLongs => const fb.ListReader(fb.Int64Reader()).vTableGetNullable(_bc, _bcOffset, 68); + List? get vectorOfDoubles => const fb.ListReader(fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 70); my_game.InParentNamespace? get parentNamespaceTest => my_game.InParentNamespace.reader.vTableGetNullable(_bc, _bcOffset, 72); List? get vectorOfReferrables => const fb.ListReader(Referrable.reader).vTableGetNullable(_bc, _bcOffset, 74); int get singleWeakReference => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 76, 0); - List? get vectorOfWeakReferences => const fb.ListReader(const fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 78); + List? get vectorOfWeakReferences => const fb.ListReader(fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 78); List? get vectorOfStrongReferrables => const fb.ListReader(Referrable.reader).vTableGetNullable(_bc, _bcOffset, 80); int get coOwningReference => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 82, 0); - List? get vectorOfCoOwningReferences => const fb.ListReader(const fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 84); + List? get vectorOfCoOwningReferences => const fb.ListReader(fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 84); int get nonOwningReference => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 86, 0); - List? get vectorOfNonOwningReferences => const fb.ListReader(const fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 88); + List? get vectorOfNonOwningReferences => const fb.ListReader(fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 88); AnyUniqueAliasesTypeId? get anyUniqueType => AnyUniqueAliasesTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 90)); - dynamic? get anyUnique { + dynamic get anyUnique { switch (anyUniqueType?.value) { case 1: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 92); case 2: return TestSimpleTableWithEnum.reader.vTableGetNullable(_bc, _bcOffset, 92); @@ -1103,7 +1096,7 @@ class Monster { } } AnyAmbiguousAliasesTypeId? get anyAmbiguousType => AnyAmbiguousAliasesTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 94)); - dynamic? get anyAmbiguous { + dynamic get anyAmbiguous { switch (anyAmbiguousType?.value) { case 1: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 96); case 2: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 96); @@ -1113,7 +1106,7 @@ class Monster { } List? get vectorOfEnums => const fb.ListReader(Color.reader).vTableGetNullable(_bc, _bcOffset, 98); Race get signedEnum => Race.fromValue(const fb.Int8Reader().vTableGet(_bc, _bcOffset, 100, -1)); - List? get testrequirednestedflatbuffer => const fb.ListReader(const fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 102); + List? get testrequirednestedflatbuffer => const fb.ListReader(fb.Uint8Reader()).vTableGetNullable(_bc, _bcOffset, 102); List? get scalarKeySortedTables => const fb.ListReader(Stat.reader).vTableGetNullable(_bc, _bcOffset, 104); @override @@ -1126,15 +1119,15 @@ class Monster { mana: mana, hp: hp, name: name, - inventory: const fb.ListReader(const fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 14), + inventory: const fb.ListReader(fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 14), color: color, testType: testType, test: test, test4: test4?.map((e) => e.unpack()).toList(), - testarrayofstring: const fb.ListReader(const fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24), + testarrayofstring: const fb.ListReader(fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24), testarrayoftables: testarrayoftables?.map((e) => e.unpack()).toList(), enemy: enemy?.unpack(), - testnestedflatbuffer: const fb.ListReader(const fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 30), + testnestedflatbuffer: const fb.ListReader(fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 30), testempty: testempty?.unpack(), testbool: testbool, testhashs32Fnv1: testhashs32Fnv1, @@ -1145,32 +1138,32 @@ class Monster { testhashu32Fnv1a: testhashu32Fnv1a, testhashs64Fnv1a: testhashs64Fnv1a, testhashu64Fnv1a: testhashu64Fnv1a, - testarrayofbools: const fb.ListReader(const fb.BoolReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 52), + testarrayofbools: const fb.ListReader(fb.BoolReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 52), testf: testf, testf2: testf2, testf3: testf3, - testarrayofstring2: const fb.ListReader(const fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 60), + testarrayofstring2: const fb.ListReader(fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 60), testarrayofsortedstruct: testarrayofsortedstruct?.map((e) => e.unpack()).toList(), - flex: const fb.ListReader(const fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 64), + flex: const fb.ListReader(fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 64), test5: test5?.map((e) => e.unpack()).toList(), - vectorOfLongs: const fb.ListReader(const fb.Int64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 68), - vectorOfDoubles: const fb.ListReader(const fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 70), + vectorOfLongs: const fb.ListReader(fb.Int64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 68), + vectorOfDoubles: const fb.ListReader(fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 70), parentNamespaceTest: parentNamespaceTest?.unpack(), vectorOfReferrables: vectorOfReferrables?.map((e) => e.unpack()).toList(), singleWeakReference: singleWeakReference, - vectorOfWeakReferences: const fb.ListReader(const fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 78), + vectorOfWeakReferences: const fb.ListReader(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 78), vectorOfStrongReferrables: vectorOfStrongReferrables?.map((e) => e.unpack()).toList(), coOwningReference: coOwningReference, - vectorOfCoOwningReferences: const fb.ListReader(const fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 84), + vectorOfCoOwningReferences: const fb.ListReader(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 84), nonOwningReference: nonOwningReference, - vectorOfNonOwningReferences: const fb.ListReader(const fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 88), + vectorOfNonOwningReferences: const fb.ListReader(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 88), anyUniqueType: anyUniqueType, anyUnique: anyUnique, anyAmbiguousType: anyAmbiguousType, anyAmbiguous: anyAmbiguous, vectorOfEnums: const fb.ListReader(Color.reader, lazy: false).vTableGetNullable(_bc, _bcOffset, 98), signedEnum: signedEnum, - testrequirednestedflatbuffer: const fb.ListReader(const fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 102), + testrequirednestedflatbuffer: const fb.ListReader(fb.Uint8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 102), scalarKeySortedTables: scalarKeySortedTables?.map((e) => e.unpack()).toList()); static int pack(fb.Builder fbBuilder, MonsterT? object) { @@ -1188,7 +1181,7 @@ class MonsterT { List? inventory; Color color; AnyTypeId? testType; - dynamic? test; + dynamic test; List? test4; List? testarrayofstring; /// an example documentation comment: this will end up in the generated code @@ -1226,9 +1219,9 @@ class MonsterT { int nonOwningReference; List? vectorOfNonOwningReferences; AnyUniqueAliasesTypeId? anyUniqueType; - dynamic? anyUnique; + dynamic anyUnique; AnyAmbiguousAliasesTypeId? anyAmbiguousType; - dynamic? anyAmbiguous; + dynamic anyAmbiguous; List? vectorOfEnums; Race signedEnum; List? testrequirednestedflatbuffer; @@ -1292,9 +1285,9 @@ class MonsterT { final int? inventoryOffset = inventory == null ? null : fbBuilder.writeListUint8(inventory!); final int? testOffset = test?.pack(fbBuilder); - int? test4Offset = null; + int? test4Offset; if (test4 != null) { - test4!.forEach((e) => e.pack(fbBuilder)); + for (var e in test4!) { e.pack(fbBuilder); } test4Offset = fbBuilder.endStructVector(test4!.length); } final int? testarrayofstringOffset = testarrayofstring == null ? null @@ -1309,16 +1302,16 @@ class MonsterT { : fbBuilder.writeListBool(testarrayofbools!); final int? testarrayofstring2Offset = testarrayofstring2 == null ? null : fbBuilder.writeList(testarrayofstring2!.map(fbBuilder.writeString).toList()); - int? testarrayofsortedstructOffset = null; + int? testarrayofsortedstructOffset; if (testarrayofsortedstruct != null) { - testarrayofsortedstruct!.forEach((e) => e.pack(fbBuilder)); + for (var e in testarrayofsortedstruct!) { e.pack(fbBuilder); } testarrayofsortedstructOffset = fbBuilder.endStructVector(testarrayofsortedstruct!.length); } final int? flexOffset = flex == null ? null : fbBuilder.writeListUint8(flex!); - int? test5Offset = null; + int? test5Offset; if (test5 != null) { - test5!.forEach((e) => e.pack(fbBuilder)); + for (var e in test5!) { e.pack(fbBuilder); } test5Offset = fbBuilder.endStructVector(test5!.length); } final int? vectorOfLongsOffset = vectorOfLongs == null ? null @@ -1411,11 +1404,11 @@ class _MonsterReader extends fb.TableReader { @override Monster createObject(fb.BufferContext bc, int offset) => - new Monster._(bc, offset); + Monster._(bc, offset); } class MonsterBuilder { - MonsterBuilder(this.fbBuilder) {} + MonsterBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -1637,7 +1630,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { final List? _inventory; final Color? _color; final AnyTypeId? _testType; - final dynamic? _test; + final dynamic _test; final List? _test4; final List? _testarrayofstring; final List? _testarrayoftables; @@ -1673,9 +1666,9 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { final int? _nonOwningReference; final List? _vectorOfNonOwningReferences; final AnyUniqueAliasesTypeId? _anyUniqueType; - final dynamic? _anyUnique; + final dynamic _anyUnique; final AnyAmbiguousAliasesTypeId? _anyAmbiguousType; - final dynamic? _anyAmbiguous; + final dynamic _anyAmbiguous; final List? _vectorOfEnums; final Race? _signedEnum; final List? _testrequirednestedflatbuffer; @@ -1689,7 +1682,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { List? inventory, Color? color, AnyTypeId? testType, - dynamic? test, + dynamic test, List? test4, List? testarrayofstring, List? testarrayoftables, @@ -1725,9 +1718,9 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { int? nonOwningReference, List? vectorOfNonOwningReferences, AnyUniqueAliasesTypeId? anyUniqueType, - dynamic? anyUnique, + dynamic anyUnique, AnyAmbiguousAliasesTypeId? anyAmbiguousType, - dynamic? anyAmbiguous, + dynamic anyAmbiguous, List? vectorOfEnums, Race? signedEnum, List? testrequirednestedflatbuffer, @@ -1894,20 +1887,19 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class TypeAliases { TypeAliases._(this._bc, this._bcOffset); factory TypeAliases(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _TypeAliasesReader(); + static const fb.Reader reader = _TypeAliasesReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -1922,8 +1914,8 @@ class TypeAliases { int get u64 => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 18, 0); double get f32 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 20, 0.0); double get f64 => const fb.Float64Reader().vTableGet(_bc, _bcOffset, 22, 0.0); - List? get v8 => const fb.ListReader(const fb.Int8Reader()).vTableGetNullable(_bc, _bcOffset, 24); - List? get vf64 => const fb.ListReader(const fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 26); + List? get v8 => const fb.ListReader(fb.Int8Reader()).vTableGetNullable(_bc, _bcOffset, 24); + List? get vf64 => const fb.ListReader(fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 26); @override String toString() { @@ -1941,8 +1933,8 @@ class TypeAliases { u64: u64, f32: f32, f64: f64, - v8: const fb.ListReader(const fb.Int8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24), - vf64: const fb.ListReader(const fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 26)); + v8: const fb.ListReader(fb.Int8Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24), + vf64: const fb.ListReader(fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 26)); static int pack(fb.Builder fbBuilder, TypeAliasesT? object) { if (object == null) return 0; @@ -2010,11 +2002,11 @@ class _TypeAliasesReader extends fb.TableReader { @override TypeAliases createObject(fb.BufferContext bc, int offset) => - new TypeAliases._(bc, offset); + TypeAliases._(bc, offset); } class TypeAliasesBuilder { - TypeAliasesBuilder(this.fbBuilder) {} + TypeAliasesBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -2143,9 +2135,8 @@ class TypeAliasesObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } diff --git a/tests/monster_test_my_game_generated.dart b/tests/monster_test_my_game_generated.dart index 07618f6c4..b76ae3d74 100644 --- a/tests/monster_test_my_game_generated.dart +++ b/tests/monster_test_my_game_generated.dart @@ -12,11 +12,11 @@ import './monster_test_my_game.example2_generated.dart' as my_game_example2; class InParentNamespace { InParentNamespace._(this._bc, this._bcOffset); factory InParentNamespace(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _InParentNamespaceReader(); + static const fb.Reader reader = _InParentNamespaceReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -52,7 +52,7 @@ class _InParentNamespaceReader extends fb.TableReader { @override InParentNamespace createObject(fb.BufferContext bc, int offset) => - new InParentNamespace._(bc, offset); + InParentNamespace._(bc, offset); } class InParentNamespaceObjectBuilder extends fb.ObjectBuilder { @@ -69,9 +69,8 @@ class InParentNamespaceObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } diff --git a/tests/namespace_test/namespace_test1_namespace_a.namespace_b_generated.dart b/tests/namespace_test/namespace_test1_namespace_a.namespace_b_generated.dart index 1dabfa329..b0ddad4ff 100644 --- a/tests/namespace_test/namespace_test1_namespace_a.namespace_b_generated.dart +++ b/tests/namespace_test/namespace_test1_namespace_a.namespace_b_generated.dart @@ -14,7 +14,7 @@ class UnionInNestedNSTypeId { factory UnionInNestedNSTypeId.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum UnionInNestedNSTypeId'); + throw StateError('Invalid value $value for bit flag enum UnionInNestedNSTypeId'); } return result; } @@ -26,13 +26,13 @@ class UnionInNestedNSTypeId { static const int maxValue = 1; static bool containsValue(int value) => values.containsKey(value); - static const UnionInNestedNSTypeId NONE = const UnionInNestedNSTypeId._(0); - static const UnionInNestedNSTypeId TableInNestedNS = const UnionInNestedNSTypeId._(1); + static const UnionInNestedNSTypeId NONE = UnionInNestedNSTypeId._(0); + static const UnionInNestedNSTypeId TableInNestedNS = UnionInNestedNSTypeId._(1); static const Map values = { 0: NONE, 1: TableInNestedNS}; - static const fb.Reader reader = const _UnionInNestedNSTypeIdReader(); + static const fb.Reader reader = _UnionInNestedNSTypeIdReader(); @override String toString() { @@ -48,7 +48,7 @@ class _UnionInNestedNSTypeIdReader extends fb.Reader { @override UnionInNestedNSTypeId read(fb.BufferContext bc, int offset) => - new UnionInNestedNSTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); + UnionInNestedNSTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); } class EnumInNestedNS { @@ -58,7 +58,7 @@ class EnumInNestedNS { factory EnumInNestedNS.fromValue(int value) { final result = values[value]; if (result == null) { - throw new StateError('Invalid value $value for bit flag enum EnumInNestedNS'); + throw StateError('Invalid value $value for bit flag enum EnumInNestedNS'); } return result; } @@ -70,15 +70,15 @@ class EnumInNestedNS { static const int maxValue = 2; static bool containsValue(int value) => values.containsKey(value); - static const EnumInNestedNS A = const EnumInNestedNS._(0); - static const EnumInNestedNS B = const EnumInNestedNS._(1); - static const EnumInNestedNS C = const EnumInNestedNS._(2); + static const EnumInNestedNS A = EnumInNestedNS._(0); + static const EnumInNestedNS B = EnumInNestedNS._(1); + static const EnumInNestedNS C = EnumInNestedNS._(2); static const Map values = { 0: A, 1: B, 2: C}; - static const fb.Reader reader = const _EnumInNestedNSReader(); + static const fb.Reader reader = _EnumInNestedNSReader(); @override String toString() { @@ -94,17 +94,17 @@ class _EnumInNestedNSReader extends fb.Reader { @override EnumInNestedNS read(fb.BufferContext bc, int offset) => - new EnumInNestedNS.fromValue(const fb.Int8Reader().read(bc, offset)); + EnumInNestedNS.fromValue(const fb.Int8Reader().read(bc, offset)); } class TableInNestedNS { TableInNestedNS._(this._bc, this._bcOffset); factory TableInNestedNS(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _TableInNestedNSReader(); + static const fb.Reader reader = _TableInNestedNSReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -148,11 +148,11 @@ class _TableInNestedNSReader extends fb.TableReader { @override TableInNestedNS createObject(fb.BufferContext bc, int offset) => - new TableInNestedNS._(bc, offset); + TableInNestedNS._(bc, offset); } class TableInNestedNSBuilder { - TableInNestedNSBuilder(this.fbBuilder) {} + TableInNestedNSBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -189,16 +189,15 @@ class TableInNestedNSObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class StructInNestedNS { StructInNestedNS._(this._bc, this._bcOffset); - static const fb.Reader reader = const _StructInNestedNSReader(); + static const fb.Reader reader = _StructInNestedNSReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -249,11 +248,11 @@ class _StructInNestedNSReader extends fb.StructReader { @override StructInNestedNS createObject(fb.BufferContext bc, int offset) => - new StructInNestedNS._(bc, offset); + StructInNestedNS._(bc, offset); } class StructInNestedNSBuilder { - StructInNestedNSBuilder(this.fbBuilder) {} + StructInNestedNSBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -287,9 +286,8 @@ class StructInNestedNSObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } diff --git a/tests/namespace_test/namespace_test2_namespace_a_generated.dart b/tests/namespace_test/namespace_test2_namespace_a_generated.dart index f28154c05..679b81c54 100644 --- a/tests/namespace_test/namespace_test2_namespace_a_generated.dart +++ b/tests/namespace_test/namespace_test2_namespace_a_generated.dart @@ -11,11 +11,11 @@ import './namespace_test2_namespace_c_generated.dart' as namespace_c; class TableInFirstNS { TableInFirstNS._(this._bc, this._bcOffset); factory TableInFirstNS(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _TableInFirstNSReader(); + static const fb.Reader reader = _TableInFirstNSReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -23,7 +23,7 @@ class TableInFirstNS { namespace_a_namespace_b.TableInNestedNS? get fooTable => namespace_a_namespace_b.TableInNestedNS.reader.vTableGetNullable(_bc, _bcOffset, 4); EnumInNestedNS get fooEnum => EnumInNestedNS.fromValue(const fb.Int8Reader().vTableGet(_bc, _bcOffset, 6, 0)); UnionInNestedNSTypeId? get fooUnionType => UnionInNestedNSTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 8)); - dynamic? get fooUnion { + dynamic get fooUnion { switch (fooUnionType?.value) { case 1: return TableInNestedNS.reader.vTableGetNullable(_bc, _bcOffset, 10); default: return null; @@ -53,7 +53,7 @@ class TableInFirstNST { namespace_a_namespace_b.TableInNestedNST? fooTable; EnumInNestedNS fooEnum; UnionInNestedNSTypeId? fooUnionType; - dynamic? fooUnion; + dynamic fooUnion; namespace_a_namespace_b.StructInNestedNST? fooStruct; TableInFirstNST({ @@ -88,11 +88,11 @@ class _TableInFirstNSReader extends fb.TableReader { @override TableInFirstNS createObject(fb.BufferContext bc, int offset) => - new TableInFirstNS._(bc, offset); + TableInFirstNS._(bc, offset); } class TableInFirstNSBuilder { - TableInFirstNSBuilder(this.fbBuilder) {} + TableInFirstNSBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -130,14 +130,14 @@ class TableInFirstNSObjectBuilder extends fb.ObjectBuilder { final namespace_a_namespace_b.TableInNestedNSObjectBuilder? _fooTable; final EnumInNestedNS? _fooEnum; final UnionInNestedNSTypeId? _fooUnionType; - final dynamic? _fooUnion; + final dynamic _fooUnion; final namespace_a_namespace_b.StructInNestedNSObjectBuilder? _fooStruct; TableInFirstNSObjectBuilder({ namespace_a_namespace_b.TableInNestedNSObjectBuilder? fooTable, EnumInNestedNS? fooEnum, UnionInNestedNSTypeId? fooUnionType, - dynamic? fooUnion, + dynamic fooUnion, namespace_a_namespace_b.StructInNestedNSObjectBuilder? fooStruct, }) : _fooTable = fooTable, @@ -165,20 +165,19 @@ class TableInFirstNSObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } class SecondTableInA { SecondTableInA._(this._bc, this._bcOffset); factory SecondTableInA(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _SecondTableInAReader(); + static const fb.Reader reader = _SecondTableInAReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -223,11 +222,11 @@ class _SecondTableInAReader extends fb.TableReader { @override SecondTableInA createObject(fb.BufferContext bc, int offset) => - new SecondTableInA._(bc, offset); + SecondTableInA._(bc, offset); } class SecondTableInABuilder { - SecondTableInABuilder(this.fbBuilder) {} + SecondTableInABuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -265,9 +264,8 @@ class SecondTableInAObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } } diff --git a/tests/namespace_test/namespace_test2_namespace_c_generated.dart b/tests/namespace_test/namespace_test2_namespace_c_generated.dart index 30de07e74..883a2ce5f 100644 --- a/tests/namespace_test/namespace_test2_namespace_c_generated.dart +++ b/tests/namespace_test/namespace_test2_namespace_c_generated.dart @@ -11,11 +11,11 @@ import './namespace_test2_namespace_a_generated.dart' as namespace_a; class TableInC { TableInC._(this._bc, this._bcOffset); factory TableInC(List bytes) { - fb.BufferContext rootRef = new fb.BufferContext.fromBytes(bytes); + final rootRef = fb.BufferContext.fromBytes(bytes); return reader.read(rootRef, 0); } - static const fb.Reader reader = const _TableInCReader(); + static const fb.Reader reader = _TableInCReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -66,11 +66,11 @@ class _TableInCReader extends fb.TableReader { @override TableInC createObject(fb.BufferContext bc, int offset) => - new TableInC._(bc, offset); + TableInC._(bc, offset); } class TableInCBuilder { - TableInCBuilder(this.fbBuilder) {} + TableInCBuilder(this.fbBuilder); final fb.Builder fbBuilder; @@ -117,9 +117,8 @@ class TableInCObjectBuilder extends fb.ObjectBuilder { /// Convenience method to serialize to byte list. @override Uint8List toBytes([String? fileIdentifier]) { - fb.Builder fbBuilder = new fb.Builder(deduplicateTables: false); - int offset = finish(fbBuilder); - fbBuilder.finish(offset, fileIdentifier); + final fbBuilder = fb.Builder(deduplicateTables: false); + fbBuilder.finish(finish(fbBuilder), fileIdentifier); return fbBuilder.buffer; } }