mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-29 01:50:02 +00:00
omit type annotations for dart local variables (#7067)
* omit type annotations for dart local variables * fixed some errors
This commit is contained in:
@@ -308,7 +308,7 @@ class Builder {
|
|||||||
assert(_inVTable);
|
assert(_inVTable);
|
||||||
// Prepare for writing the VTable.
|
// Prepare for writing the VTable.
|
||||||
_prepare(_sizeofInt32, 1);
|
_prepare(_sizeofInt32, 1);
|
||||||
int tableTail = _tail;
|
var tableTail = _tail;
|
||||||
// Prepare the size of the current table.
|
// Prepare the size of the current table.
|
||||||
final currentVTable = _currentVTable!;
|
final currentVTable = _currentVTable!;
|
||||||
currentVTable.tableSize = tableTail - _currentTableEndTail;
|
currentVTable.tableSize = tableTail - _currentTableEndTail;
|
||||||
@@ -320,10 +320,10 @@ class Builder {
|
|||||||
// Try to find an existing compatible VTable.
|
// Try to find an existing compatible VTable.
|
||||||
if (deduplicateTables) {
|
if (deduplicateTables) {
|
||||||
// Search backward - more likely to have recently used one
|
// Search backward - more likely to have recently used one
|
||||||
for (int i = _vTables.length - 1; i >= 0; i--) {
|
for (var i = _vTables.length - 1; i >= 0; i--) {
|
||||||
final int vt2Offset = _vTables[i];
|
final vt2Offset = _vTables[i];
|
||||||
final int vt2Start = _buf.lengthInBytes - vt2Offset;
|
final vt2Start = _buf.lengthInBytes - vt2Offset;
|
||||||
final int vt2Size = _buf.getUint16(vt2Start, Endian.little);
|
final vt2Size = _buf.getUint16(vt2Start, Endian.little);
|
||||||
|
|
||||||
if (currentVTable._vTableSize == vt2Size &&
|
if (currentVTable._vTableSize == vt2Size &&
|
||||||
currentVTable._offsetsMatch(vt2Start, _buf)) {
|
currentVTable._offsetsMatch(vt2Start, _buf)) {
|
||||||
@@ -370,7 +370,7 @@ class Builder {
|
|||||||
final finishedSize = size();
|
final finishedSize = size();
|
||||||
_setUint32AtTail(finishedSize, finishedSize - offset);
|
_setUint32AtTail(finishedSize, finishedSize - offset);
|
||||||
if (fileIdentifier != null) {
|
if (fileIdentifier != null) {
|
||||||
for (int i = 0; i < 4; i++) {
|
for (var i = 0; i < 4; i++) {
|
||||||
_setUint8AtTail(
|
_setUint8AtTail(
|
||||||
finishedSize - _sizeofUint32 - i, fileIdentifier.codeUnitAt(i));
|
finishedSize - _sizeofUint32 - i, fileIdentifier.codeUnitAt(i));
|
||||||
}
|
}
|
||||||
@@ -495,7 +495,7 @@ class Builder {
|
|||||||
/// Writes a list of Structs to the buffer, returning the offset
|
/// Writes a list of Structs to the buffer, returning the offset
|
||||||
int writeListOfStructs(List<ObjectBuilder> structBuilders) {
|
int writeListOfStructs(List<ObjectBuilder> structBuilders) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
for (int i = structBuilders.length - 1; i >= 0; i--) {
|
for (var i = structBuilders.length - 1; i >= 0; i--) {
|
||||||
structBuilders[i].finish(this);
|
structBuilders[i].finish(this);
|
||||||
}
|
}
|
||||||
return endStructVector(structBuilders.length);
|
return endStructVector(structBuilders.length);
|
||||||
@@ -505,11 +505,11 @@ class Builder {
|
|||||||
int writeList(List<int> values) {
|
int writeList(List<int> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofUint32, 1 + values.length);
|
_prepare(_sizeofUint32, 1 + values.length);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (int value in values) {
|
for (var value in values) {
|
||||||
_setUint32AtTail(tail, tail - value);
|
_setUint32AtTail(tail, tail - value);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
}
|
}
|
||||||
@@ -520,11 +520,11 @@ class Builder {
|
|||||||
int writeListFloat64(List<double> values) {
|
int writeListFloat64(List<double> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofFloat64, values.length, additionalBytes: _sizeofUint32);
|
_prepare(_sizeofFloat64, values.length, additionalBytes: _sizeofUint32);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (double value in values) {
|
for (var value in values) {
|
||||||
_setFloat64AtTail(tail, value);
|
_setFloat64AtTail(tail, value);
|
||||||
tail -= _sizeofFloat64;
|
tail -= _sizeofFloat64;
|
||||||
}
|
}
|
||||||
@@ -535,11 +535,11 @@ class Builder {
|
|||||||
int writeListFloat32(List<double> values) {
|
int writeListFloat32(List<double> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofFloat32, 1 + values.length);
|
_prepare(_sizeofFloat32, 1 + values.length);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (double value in values) {
|
for (var value in values) {
|
||||||
_setFloat32AtTail(tail, value);
|
_setFloat32AtTail(tail, value);
|
||||||
tail -= _sizeofFloat32;
|
tail -= _sizeofFloat32;
|
||||||
}
|
}
|
||||||
@@ -550,11 +550,11 @@ class Builder {
|
|||||||
int writeListInt64(List<int> values) {
|
int writeListInt64(List<int> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofInt64, values.length, additionalBytes: _sizeofUint32);
|
_prepare(_sizeofInt64, values.length, additionalBytes: _sizeofUint32);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (int value in values) {
|
for (var value in values) {
|
||||||
_setInt64AtTail(tail, value);
|
_setInt64AtTail(tail, value);
|
||||||
tail -= _sizeofInt64;
|
tail -= _sizeofInt64;
|
||||||
}
|
}
|
||||||
@@ -565,11 +565,11 @@ class Builder {
|
|||||||
int writeListUint64(List<int> values) {
|
int writeListUint64(List<int> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofUint64, values.length, additionalBytes: _sizeofUint32);
|
_prepare(_sizeofUint64, values.length, additionalBytes: _sizeofUint32);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (int value in values) {
|
for (var value in values) {
|
||||||
_setUint64AtTail(tail, value);
|
_setUint64AtTail(tail, value);
|
||||||
tail -= _sizeofUint64;
|
tail -= _sizeofUint64;
|
||||||
}
|
}
|
||||||
@@ -580,11 +580,11 @@ class Builder {
|
|||||||
int writeListInt32(List<int> values) {
|
int writeListInt32(List<int> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofUint32, 1 + values.length);
|
_prepare(_sizeofUint32, 1 + values.length);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (int value in values) {
|
for (var value in values) {
|
||||||
_setInt32AtTail(tail, value);
|
_setInt32AtTail(tail, value);
|
||||||
tail -= _sizeofInt32;
|
tail -= _sizeofInt32;
|
||||||
}
|
}
|
||||||
@@ -595,11 +595,11 @@ class Builder {
|
|||||||
int writeListUint32(List<int> values) {
|
int writeListUint32(List<int> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofUint32, 1 + values.length);
|
_prepare(_sizeofUint32, 1 + values.length);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (int value in values) {
|
for (var value in values) {
|
||||||
_setUint32AtTail(tail, value);
|
_setUint32AtTail(tail, value);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
}
|
}
|
||||||
@@ -610,11 +610,11 @@ class Builder {
|
|||||||
int writeListInt16(List<int> values) {
|
int writeListInt16(List<int> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofUint32, 1, additionalBytes: 2 * values.length);
|
_prepare(_sizeofUint32, 1, additionalBytes: 2 * values.length);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (int value in values) {
|
for (var value in values) {
|
||||||
_setInt16AtTail(tail, value);
|
_setInt16AtTail(tail, value);
|
||||||
tail -= _sizeofInt16;
|
tail -= _sizeofInt16;
|
||||||
}
|
}
|
||||||
@@ -625,11 +625,11 @@ class Builder {
|
|||||||
int writeListUint16(List<int> values) {
|
int writeListUint16(List<int> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofUint32, 1, additionalBytes: 2 * values.length);
|
_prepare(_sizeofUint32, 1, additionalBytes: 2 * values.length);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (int value in values) {
|
for (var value in values) {
|
||||||
_setUint16AtTail(tail, value);
|
_setUint16AtTail(tail, value);
|
||||||
tail -= _sizeofUint16;
|
tail -= _sizeofUint16;
|
||||||
}
|
}
|
||||||
@@ -645,11 +645,11 @@ class Builder {
|
|||||||
int writeListInt8(List<int> values) {
|
int writeListInt8(List<int> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofUint32, 1, additionalBytes: values.length);
|
_prepare(_sizeofUint32, 1, additionalBytes: values.length);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (int value in values) {
|
for (var value in values) {
|
||||||
_setInt8AtTail(tail, value);
|
_setInt8AtTail(tail, value);
|
||||||
tail -= _sizeofUint8;
|
tail -= _sizeofUint8;
|
||||||
}
|
}
|
||||||
@@ -660,11 +660,11 @@ class Builder {
|
|||||||
int writeListUint8(List<int> values) {
|
int writeListUint8(List<int> values) {
|
||||||
assert(!_inVTable);
|
assert(!_inVTable);
|
||||||
_prepare(_sizeofUint32, 1, additionalBytes: values.length);
|
_prepare(_sizeofUint32, 1, additionalBytes: values.length);
|
||||||
final int result = _tail;
|
final result = _tail;
|
||||||
int tail = _tail;
|
var tail = _tail;
|
||||||
_setUint32AtTail(tail, values.length);
|
_setUint32AtTail(tail, values.length);
|
||||||
tail -= _sizeofUint32;
|
tail -= _sizeofUint32;
|
||||||
for (int value in values) {
|
for (var value in values) {
|
||||||
_setUint8AtTail(tail, value);
|
_setUint8AtTail(tail, value);
|
||||||
tail -= _sizeofUint8;
|
tail -= _sizeofUint8;
|
||||||
}
|
}
|
||||||
@@ -729,7 +729,7 @@ class Builder {
|
|||||||
_prepare(4, 1, additionalBytes: length + 1);
|
_prepare(4, 1, additionalBytes: length + 1);
|
||||||
_setUint32AtTail(_tail, length);
|
_setUint32AtTail(_tail, length);
|
||||||
var offset = _buf.lengthInBytes - _tail + 4;
|
var offset = _buf.lengthInBytes - _tail + 4;
|
||||||
for (int i = 0; i < length; i++) {
|
for (var i = 0; i < length; i++) {
|
||||||
_buf.setUint8(offset++, bytes[i]);
|
_buf.setUint8(offset++, bytes[i]);
|
||||||
}
|
}
|
||||||
_buf.setUint8(offset, 0); // trailing zero
|
_buf.setUint8(offset, 0); // trailing zero
|
||||||
@@ -756,7 +756,7 @@ class Builder {
|
|||||||
/// Zero-pads the buffer, which may be required for some struct layouts.
|
/// Zero-pads the buffer, which may be required for some struct layouts.
|
||||||
@pragma('vm:prefer-inline')
|
@pragma('vm:prefer-inline')
|
||||||
void pad(int howManyBytes) {
|
void pad(int howManyBytes) {
|
||||||
for (int i = 0; i < howManyBytes; i++) {
|
for (var i = 0; i < howManyBytes; i++) {
|
||||||
putUint8(0);
|
putUint8(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -772,17 +772,17 @@ class Builder {
|
|||||||
_maxAlign = size;
|
_maxAlign = size;
|
||||||
}
|
}
|
||||||
// Prepare amount of required space.
|
// Prepare amount of required space.
|
||||||
int dataSize = size * count + additionalBytes;
|
var dataSize = size * count + additionalBytes;
|
||||||
int alignDelta = (-(_tail + dataSize)) & (size - 1);
|
var alignDelta = (-(_tail + dataSize)) & (size - 1);
|
||||||
int bufSize = alignDelta + dataSize;
|
var bufSize = alignDelta + dataSize;
|
||||||
// Ensure that we have the required amount of space.
|
// Ensure that we have the required amount of space.
|
||||||
{
|
{
|
||||||
int oldCapacity = _buf.lengthInBytes;
|
var oldCapacity = _buf.lengthInBytes;
|
||||||
if (_tail + bufSize > oldCapacity) {
|
if (_tail + bufSize > oldCapacity) {
|
||||||
int desiredNewCapacity = (oldCapacity + bufSize) * 2;
|
var desiredNewCapacity = (oldCapacity + bufSize) * 2;
|
||||||
int deltaCapacity = desiredNewCapacity - oldCapacity;
|
var deltaCapacity = desiredNewCapacity - oldCapacity;
|
||||||
deltaCapacity += (-deltaCapacity) & (_maxAlign - 1);
|
deltaCapacity += (-deltaCapacity) & (_maxAlign - 1);
|
||||||
int newCapacity = oldCapacity + deltaCapacity;
|
var newCapacity = oldCapacity + deltaCapacity;
|
||||||
_buf = _allocator.resize(_buf, newCapacity, _tail, 0);
|
_buf = _allocator.resize(_buf, newCapacity, _tail, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1018,20 +1018,20 @@ abstract class Reader<T> {
|
|||||||
/// Read the value of the given [field] in the given [object].
|
/// Read the value of the given [field] in the given [object].
|
||||||
@pragma('vm:prefer-inline')
|
@pragma('vm:prefer-inline')
|
||||||
T vTableGet(BufferContext object, int offset, int field, T defaultValue) {
|
T vTableGet(BufferContext object, int offset, int field, T defaultValue) {
|
||||||
int fieldOffset = _vTableFieldOffset(object, offset, field);
|
var fieldOffset = _vTableFieldOffset(object, offset, field);
|
||||||
return fieldOffset == 0 ? defaultValue : read(object, offset + fieldOffset);
|
return fieldOffset == 0 ? defaultValue : read(object, offset + fieldOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Read the value of the given [field] in the given [object].
|
/// Read the value of the given [field] in the given [object].
|
||||||
@pragma('vm:prefer-inline')
|
@pragma('vm:prefer-inline')
|
||||||
T? vTableGetNullable(BufferContext object, int offset, int field) {
|
T? vTableGetNullable(BufferContext object, int offset, int field) {
|
||||||
int fieldOffset = _vTableFieldOffset(object, offset, field);
|
var fieldOffset = _vTableFieldOffset(object, offset, field);
|
||||||
return fieldOffset == 0 ? null : read(object, offset + fieldOffset);
|
return fieldOffset == 0 ? null : read(object, offset + fieldOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
@pragma('vm:prefer-inline')
|
@pragma('vm:prefer-inline')
|
||||||
int _vTableFieldOffset(BufferContext object, int offset, int field) {
|
int _vTableFieldOffset(BufferContext object, int offset, int field) {
|
||||||
int vTableSOffset = object._getInt32(offset);
|
var vTableSOffset = object._getInt32(offset);
|
||||||
int vTableOffset = offset - vTableSOffset;
|
int vTableOffset = offset - vTableSOffset;
|
||||||
int vTableSize = object._getUint16(vTableOffset);
|
int vTableSize = object._getUint16(vTableOffset);
|
||||||
if (field >= vTableSize) return 0;
|
if (field >= vTableSize) return 0;
|
||||||
@@ -1285,7 +1285,7 @@ class _FbGenericList<E> extends _FbList<E> {
|
|||||||
@pragma('vm:prefer-inline')
|
@pragma('vm:prefer-inline')
|
||||||
E operator [](int i) {
|
E operator [](int i) {
|
||||||
_items ??= List<E?>.filled(length, null);
|
_items ??= List<E?>.filled(length, null);
|
||||||
E? item = _items![i];
|
var item = _items![i];
|
||||||
if (item == null) {
|
if (item == null) {
|
||||||
item = elementReader.read(bc, offset + 4 + elementReader.size * i);
|
item = elementReader.read(bc, offset + 4 + elementReader.size * i);
|
||||||
_items![i] = item;
|
_items![i] = item;
|
||||||
@@ -1394,7 +1394,7 @@ class _VTable {
|
|||||||
@pragma('vm:prefer-inline')
|
@pragma('vm:prefer-inline')
|
||||||
bool _offsetsMatch(int vt2Start, ByteData buf) {
|
bool _offsetsMatch(int vt2Start, ByteData buf) {
|
||||||
assert(offsetsComputed);
|
assert(offsetsComputed);
|
||||||
for (int i = 0; i < numFields; i++) {
|
for (var i = 0; i < numFields; i++) {
|
||||||
if (fieldOffsets[i] !=
|
if (fieldOffsets[i] !=
|
||||||
buf.getUint16(vt2Start + _metadataLength + (2 * i), Endian.little)) {
|
buf.getUint16(vt2Start + _metadataLength + (2 * i), Endian.little)) {
|
||||||
return false;
|
return false;
|
||||||
@@ -1427,7 +1427,7 @@ class _VTable {
|
|||||||
buf.setUint16(bufOffset, tableSize, Endian.little);
|
buf.setUint16(bufOffset, tableSize, Endian.little);
|
||||||
bufOffset += 2;
|
bufOffset += 2;
|
||||||
// Field offsets.
|
// Field offsets.
|
||||||
for (int i = 0; i < numFields; i++) {
|
for (var i = 0; i < numFields; i++) {
|
||||||
buf.setUint16(bufOffset, fieldOffsets[i], Endian.little);
|
buf.setUint16(bufOffset, fieldOffsets[i], Endian.little);
|
||||||
bufOffset += 2;
|
bufOffset += 2;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user