Revert "dartfix"
This reverts commit 5b3b1f3dfc965607855fd4d9c6e40c4cd64bc2e0.
diff --git a/lib/src/typed_queue.dart b/lib/src/typed_queue.dart
index 2ac6890..8d83944 100644
--- a/lib/src/typed_queue.dart
+++ b/lib/src/typed_queue.dart
@@ -2,10 +2,10 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-import 'dart:collection';
-import 'dart:typed_data';
+import "dart:collection";
+import "dart:typed_data";
-import 'package:collection/collection.dart';
+import "package:collection/collection.dart";
import '../typed_buffers.dart';
@@ -27,20 +27,17 @@
// Iterable interface.
- @override
int get length => (_tail - _head) & (_table.length - 1);
- @override
List<E> toList({bool growable = true}) {
var list = growable ? _createBuffer(length) : _createList(length);
_writeToList(list);
return list;
}
- @override
QueueList<T> cast<T>() {
if (this is QueueList<T>) return this as QueueList<T>;
- throw UnsupportedError('$this cannot be cast to the desired type.');
+ throw UnsupportedError("$this cannot be cast to the desired type.");
}
@deprecated
@@ -61,27 +58,24 @@
}
E removeFirst() {
- if (_head == _tail) throw StateError('No element');
+ if (_head == _tail) throw StateError("No element");
var result = _table[_head];
_head = (_head + 1) & (_table.length - 1);
return result;
}
- @override
E removeLast() {
- if (_head == _tail) throw StateError('No element');
+ if (_head == _tail) throw StateError("No element");
_tail = (_tail - 1) & (_table.length - 1);
return _table[_tail];
}
// List interface.
- @override
void add(E value) => addLast(value);
- @override
set length(int value) {
- RangeError.checkNotNegative(value, 'length');
+ RangeError.checkNotNegative(value, "length");
var delta = value - length;
if (delta >= 0) {
@@ -98,19 +92,16 @@
}
}
- @override
E operator [](int index) {
RangeError.checkValidIndex(index, this, null, length);
return _table[(_head + index) & (_table.length - 1)];
}
- @override
void operator []=(int index, E value) {
RangeError.checkValidIndex(index, this);
_table[(_head + index) & (_table.length - 1)] = value;
}
- @override
void removeRange(int start, int end) {
var length = this.length;
RangeError.checkValidRange(start, end, length);
@@ -140,7 +131,6 @@
}
}
- @override
void setRange(int start, int end, Iterable<E> iterable, [int skipCount = 0]) {
RangeError.checkValidRange(start, end, length);
if (start == end) return;
@@ -240,7 +230,6 @@
}
}
- @override
void fillRange(int start, int end, [E value]) {
var startInTable = (_head + start) & (_table.length - 1);
var endInTable = (_head + end) & (_table.length - 1);
@@ -252,7 +241,6 @@
}
}
- @override
L sublist(int start, [int end]) {
var length = this.length;
end = RangeError.checkValidRange(start, end, length);
@@ -338,7 +326,6 @@
abstract class _IntQueue<L extends List<int>> extends _TypedQueue<int, L> {
_IntQueue(List<int> queue) : super(queue);
- @override
int get _defaultValue => 0;
}
@@ -346,7 +333,6 @@
extends _TypedQueue<double, L> {
_FloatQueue(List<double> queue) : super(queue);
- @override
double get _defaultValue => 0.0;
}
@@ -367,9 +353,7 @@
factory Uint8Queue.fromList(List<int> elements) =>
Uint8Queue(elements.length)..addAll(elements);
- @override
Uint8List _createList(int size) => Uint8List(size);
- @override
Uint8Buffer _createBuffer(int size) => Uint8Buffer(size);
}
@@ -391,9 +375,7 @@
factory Int8Queue.fromList(List<int> elements) =>
Int8Queue(elements.length)..addAll(elements);
- @override
Int8List _createList(int size) => Int8List(size);
- @override
Int8Buffer _createBuffer(int size) => Int8Buffer(size);
}
@@ -417,9 +399,7 @@
factory Uint8ClampedQueue.fromList(List<int> elements) =>
Uint8ClampedQueue(elements.length)..addAll(elements);
- @override
Uint8ClampedList _createList(int size) => Uint8ClampedList(size);
- @override
Uint8ClampedBuffer _createBuffer(int size) => Uint8ClampedBuffer(size);
}
@@ -440,9 +420,7 @@
factory Uint16Queue.fromList(List<int> elements) =>
Uint16Queue(elements.length)..addAll(elements);
- @override
Uint16List _createList(int size) => Uint16List(size);
- @override
Uint16Buffer _createBuffer(int size) => Uint16Buffer(size);
}
@@ -464,9 +442,7 @@
factory Int16Queue.fromList(List<int> elements) =>
Int16Queue(elements.length)..addAll(elements);
- @override
Int16List _createList(int size) => Int16List(size);
- @override
Int16Buffer _createBuffer(int size) => Int16Buffer(size);
}
@@ -487,9 +463,7 @@
factory Uint32Queue.fromList(List<int> elements) =>
Uint32Queue(elements.length)..addAll(elements);
- @override
Uint32List _createList(int size) => Uint32List(size);
- @override
Uint32Buffer _createBuffer(int size) => Uint32Buffer(size);
}
@@ -511,9 +485,7 @@
factory Int32Queue.fromList(List<int> elements) =>
Int32Queue(elements.length)..addAll(elements);
- @override
Int32List _createList(int size) => Int32List(size);
- @override
Int32Buffer _createBuffer(int size) => Int32Buffer(size);
}
@@ -535,9 +507,7 @@
factory Uint64Queue.fromList(List<int> elements) =>
Uint64Queue(elements.length)..addAll(elements);
- @override
Uint64List _createList(int size) => Uint64List(size);
- @override
Uint64Buffer _createBuffer(int size) => Uint64Buffer(size);
}
@@ -559,9 +529,7 @@
factory Int64Queue.fromList(List<int> elements) =>
Int64Queue(elements.length)..addAll(elements);
- @override
Int64List _createList(int size) => Int64List(size);
- @override
Int64Buffer _createBuffer(int size) => Int64Buffer(size);
}
@@ -584,9 +552,7 @@
factory Float32Queue.fromList(List<double> elements) =>
Float32Queue(elements.length)..addAll(elements);
- @override
Float32List _createList(int size) => Float32List(size);
- @override
Float32Buffer _createBuffer(int size) => Float32Buffer(size);
}
@@ -606,9 +572,7 @@
factory Float64Queue.fromList(List<double> elements) =>
Float64Queue(elements.length)..addAll(elements);
- @override
Float64List _createList(int size) => Float64List(size);
- @override
Float64Buffer _createBuffer(int size) => Float64Buffer(size);
}
@@ -629,11 +593,8 @@
factory Int32x4Queue.fromList(List<Int32x4> elements) =>
Int32x4Queue(elements.length)..addAll(elements);
- @override
Int32x4List _createList(int size) => Int32x4List(size);
- @override
Int32x4Buffer _createBuffer(int size) => Int32x4Buffer(size);
- @override
Int32x4 get _defaultValue => _zero;
}
@@ -652,11 +613,8 @@
factory Float32x4Queue.fromList(List<Float32x4> elements) =>
Float32x4Queue(elements.length)..addAll(elements);
- @override
Float32x4List _createList(int size) => Float32x4List(size);
- @override
Float32x4Buffer _createBuffer(int size) => Float32x4Buffer(size);
- @override
Float32x4 get _defaultValue => Float32x4.zero();
}
diff --git a/lib/typed_data.dart b/lib/typed_data.dart
index 1dc9fc8..b23fdf0 100644
--- a/lib/typed_data.dart
+++ b/lib/typed_data.dart
@@ -5,5 +5,5 @@
/// Utilities and functionality related to the "dart:typed_data" library.
library typed_data;
-export 'src/typed_queue.dart';
-export 'typed_buffers.dart';
+export "src/typed_queue.dart";
+export "typed_buffers.dart";
diff --git a/test/queue_test.dart b/test/queue_test.dart
index 14cc2d6..82d96f6 100644
--- a/test/queue_test.dart
+++ b/test/queue_test.dart
@@ -4,96 +4,96 @@
// ignore_for_file: avoid_function_literals_in_foreach_calls
-import 'package:test/test.dart';
+import "package:test/test.dart";
-import 'package:typed_data/typed_data.dart';
+import "package:typed_data/typed_data.dart";
/// The initial capacity of queues if the user doesn't specify one.
const capacity = 16;
void main() {
- group('Uint8Queue()', () {
- test('creates an empty Uint8Queue', () {
+ group("Uint8Queue()", () {
+ test("creates an empty Uint8Queue", () {
expect(Uint8Queue(), isEmpty);
});
- test('takes an initial capacity', () {
+ test("takes an initial capacity", () {
expect(Uint8Queue(100), isEmpty);
});
});
- group('add() adds an element to the end', () {
+ group("add() adds an element to the end", () {
forEachInternalRepresentation((queue) {
queue.add(16);
expect(queue, equals(oneThrough(capacity)));
});
});
- group('addFirst() adds an element to the beginning', () {
+ group("addFirst() adds an element to the beginning", () {
forEachInternalRepresentation((queue) {
queue.addFirst(0);
expect(queue, equals([0, ...oneThrough(capacity - 1)]));
});
});
- group('removeFirst() removes an element from the beginning', () {
+ group("removeFirst() removes an element from the beginning", () {
forEachInternalRepresentation((queue) {
expect(queue.removeFirst(), equals(1));
expect(queue, equals(oneThrough(capacity - 1).skip(1)));
});
- test('throws a StateError for an empty queue', () {
+ test("throws a StateError for an empty queue", () {
expect(Uint8Queue().removeFirst, throwsStateError);
});
});
- group('removeLast() removes an element from the end', () {
+ group("removeLast() removes an element from the end", () {
forEachInternalRepresentation((queue) {
expect(queue.removeLast(), equals(15));
expect(queue, equals(oneThrough(capacity - 2)));
});
- test('throws a StateError for an empty queue', () {
+ test("throws a StateError for an empty queue", () {
expect(Uint8Queue().removeLast, throwsStateError);
});
});
- group('removeRange()', () {
- group('removes a prefix', () {
+ group("removeRange()", () {
+ group("removes a prefix", () {
forEachInternalRepresentation((queue) {
queue.removeRange(0, 5);
expect(queue, equals(oneThrough(capacity - 1).skip(5)));
});
});
- group('removes a suffix', () {
+ group("removes a suffix", () {
forEachInternalRepresentation((queue) {
queue.removeRange(10, 15);
expect(queue, equals(oneThrough(capacity - 6)));
});
});
- group('removes from the middle', () {
+ group("removes from the middle", () {
forEachInternalRepresentation((queue) {
queue.removeRange(5, 10);
expect(queue, equals([1, 2, 3, 4, 5, 11, 12, 13, 14, 15]));
});
});
- group('removes everything', () {
+ group("removes everything", () {
forEachInternalRepresentation((queue) {
queue.removeRange(0, 15);
expect(queue, isEmpty);
});
});
- test('throws a RangeError for an invalid range', () {
+ test("throws a RangeError for an invalid range", () {
expect(() => Uint8Queue().removeRange(0, 1), throwsRangeError);
});
});
- group('setRange()', () {
- group('sets a range to the contents of an iterable', () {
+ group("setRange()", () {
+ group("sets a range to the contents of an iterable", () {
forEachInternalRepresentation((queue) {
queue.setRange(5, 10, oneThrough(10).map((n) => 100 + n), 2);
expect(queue,
@@ -101,7 +101,7 @@
});
});
- group('sets a range to the contents of a list', () {
+ group("sets a range to the contents of a list", () {
forEachInternalRepresentation((queue) {
queue.setRange(5, 10, oneThrough(10).map((n) => 100 + n).toList(), 2);
expect(queue,
@@ -110,7 +110,7 @@
});
group(
- 'sets a range to a section of the same queue overlapping at the beginning',
+ "sets a range to a section of the same queue overlapping at the beginning",
() {
forEachInternalRepresentation((queue) {
queue.setRange(5, 10, queue, 2);
@@ -118,7 +118,7 @@
});
});
- group('sets a range to a section of the same queue overlapping at the end',
+ group("sets a range to a section of the same queue overlapping at the end",
() {
forEachInternalRepresentation((queue) {
queue.setRange(5, 10, queue, 6);
@@ -126,33 +126,33 @@
});
});
- test('throws a RangeError for an invalid range', () {
+ test("throws a RangeError for an invalid range", () {
expect(() => Uint8Queue().setRange(0, 1, [1]), throwsRangeError);
});
});
- group('length returns the length', () {
+ group("length returns the length", () {
forEachInternalRepresentation((queue) {
expect(queue.length, equals(15));
});
});
- group('length=', () {
- group('empties', () {
+ group("length=", () {
+ group("empties", () {
forEachInternalRepresentation((queue) {
queue.length = 0;
expect(queue, isEmpty);
});
});
- group('shrinks', () {
+ group("shrinks", () {
forEachInternalRepresentation((queue) {
queue.length = 5;
expect(queue, equals([1, 2, 3, 4, 5]));
});
});
- group('grows', () {
+ group("grows", () {
forEachInternalRepresentation((queue) {
queue.length = 20;
expect(
@@ -162,7 +162,7 @@
});
});
- group('zeroes out existing data', () {
+ group("zeroes out existing data", () {
forEachInternalRepresentation((queue) {
queue.length = 0;
queue.length = 15;
@@ -170,13 +170,13 @@
});
});
- test('throws a RangeError if length is less than 0', () {
+ test("throws a RangeError if length is less than 0", () {
expect(() => Uint8Queue().length = -1, throwsRangeError);
});
});
- group('[]', () {
- group('returns individual entries', () {
+ group("[]", () {
+ group("returns individual entries", () {
forEachInternalRepresentation((queue) {
for (var i = 0; i < capacity - 1; i++) {
expect(queue[i], equals(i + 1));
@@ -184,21 +184,21 @@
});
});
- test('throws a RangeError if the index is less than 0', () {
+ test("throws a RangeError if the index is less than 0", () {
var queue = Uint8Queue.fromList([1, 2, 3]);
expect(() => queue[-1], throwsRangeError);
});
test(
- 'throws a RangeError if the index is greater than or equal to the '
- 'length', () {
+ "throws a RangeError if the index is greater than or equal to the "
+ "length", () {
var queue = Uint8Queue.fromList([1, 2, 3]);
expect(() => queue[3], throwsRangeError);
});
});
- group('[]=', () {
- group('sets individual entries', () {
+ group("[]=", () {
+ group("sets individual entries", () {
forEachInternalRepresentation((queue) {
for (var i = 0; i < capacity - 1; i++) {
queue[i] = 100 + i;
@@ -207,7 +207,7 @@
});
});
- test('throws a RangeError if the index is less than 0', () {
+ test("throws a RangeError if the index is less than 0", () {
var queue = Uint8Queue.fromList([1, 2, 3]);
expect(() {
queue[-1] = 0;
@@ -215,8 +215,8 @@
});
test(
- 'throws a RangeError if the index is greater than or equal to the '
- 'length', () {
+ "throws a RangeError if the index is greater than or equal to the "
+ "length", () {
var queue = Uint8Queue.fromList([1, 2, 3]);
expect(() {
queue[3] = 4;
@@ -224,38 +224,38 @@
});
});
- group('throws a modification error for', () {
+ group("throws a modification error for", () {
Uint8Queue queue;
setUp(() {
queue = Uint8Queue.fromList([1, 2, 3]);
});
- test('add', () {
+ test("add", () {
expect(() => queue.forEach((_) => queue.add(4)),
throwsConcurrentModificationError);
});
- test('addAll', () {
+ test("addAll", () {
expect(() => queue.forEach((_) => queue.addAll([4, 5, 6])),
throwsConcurrentModificationError);
});
- test('addFirst', () {
+ test("addFirst", () {
expect(() => queue.forEach((_) => queue.addFirst(0)),
throwsConcurrentModificationError);
});
- test('removeFirst', () {
+ test("removeFirst", () {
expect(() => queue.forEach((_) => queue.removeFirst()),
throwsConcurrentModificationError);
});
- test('removeLast', () {
+ test("removeLast", () {
expect(() => queue.forEach((_) => queue.removeLast()),
throwsConcurrentModificationError);
});
- test('length=', () {
+ test("length=", () {
expect(() => queue.forEach((_) => queue.length = 1),
throwsConcurrentModificationError);
});
@@ -269,13 +269,13 @@
group("for a queue that's below capacity", () {
// Test with a queue whose elements are in one contiguous block, so `_head <
// _tail`.
- test('with contiguous elements', () {
+ test("with contiguous elements", () {
callback(Uint8Queue(capacity * 2)..addAll(oneThrough(capacity - 1)));
});
// Test with a queue whose elements are split across the ends of the table,
// so `_head > _tail`.
- test('with an internal gap', () {
+ test("with an internal gap", () {
var queue = Uint8Queue(capacity * 2);
for (var i = capacity ~/ 2; i < capacity; i++) {
queue.add(i);
@@ -290,11 +290,11 @@
// Test with a queue whose internal table will need to expand if one more
// element is added.
group("for a queue that's at capacity", () {
- test('with contiguous elements', () {
+ test("with contiguous elements", () {
callback(Uint8Queue()..addAll(oneThrough(capacity - 1)));
});
- test('with an internal gap', () {
+ test("with an internal gap", () {
var queue = Uint8Queue();
for (var i = capacity ~/ 2; i < capacity; i++) {
queue.add(i);
