Skip to content

Commit 7c83d70

Browse files
isoosisoos
committed
Fixing lints
1 parent c814216 commit 7c83d70

File tree

8 files changed

+97
-97
lines changed

8 files changed

+97
-97
lines changed

‎example/example.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:bit_array/bit_array.dart';
22

3-
main() {
3+
void main() {
44
final array = BitArray(1024);
55
array[12] = true;
66
array.setBit(123);

‎lib/src/bit_array.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class BitArray extends BitSet {
120120

121121
/// Sets all of the bits in the current [BitArray] to false.
122122
void clearAll() {
123-
for (int i = 0; i < _data.length; i++) {
123+
for (var i = 0; i < _data.length; i++) {
124124
_data[i] = 0;
125125
}
126126
}
@@ -137,7 +137,7 @@ class BitArray extends BitSet {
137137

138138
/// Sets all the bit values in the current [BitArray] to true.
139139
void setAll() {
140-
for (int i = 0; i < _data.length; i++) {
140+
for (var i = 0; i < _data.length; i++) {
141141
_data[i] = -1;
142142
}
143143
}
@@ -154,7 +154,7 @@ class BitArray extends BitSet {
154154

155155
/// Inverts all the bit values in the current [BitArray].
156156
void invertAll() {
157-
for (int i = 0; i < _data.length; i++) {
157+
for (var i = 0; i < _data.length; i++) {
158158
_data[i] = ~(_data[i]);
159159
}
160160
}
@@ -164,7 +164,7 @@ class BitArray extends BitSet {
164164
/// Excess size of the [set] is ignored.
165165
void and(BitSet set) {
166166
final iter = set.asUint32Iterable().iterator;
167-
int i = 0;
167+
var i = 0;
168168
for (; i < _data.length && iter.moveNext(); i++) {
169169
_data[i] &= iter.current;
170170
}
@@ -178,7 +178,7 @@ class BitArray extends BitSet {
178178
/// Excess size of the [set] is ignored.
179179
void andNot(BitSet set) {
180180
final iter = set.asUint32Iterable().iterator;
181-
for (int i = 0; i < _data.length && iter.moveNext(); i++) {
181+
for (var i = 0; i < _data.length && iter.moveNext(); i++) {
182182
_data[i] &= ~iter.current;
183183
}
184184
}
@@ -188,7 +188,7 @@ class BitArray extends BitSet {
188188
/// Excess size of the [set] is ignored.
189189
void or(BitSet set) {
190190
final iter = set.asUint32Iterable().iterator;
191-
for (int i = 0; i < _data.length && iter.moveNext(); i++) {
191+
for (var i = 0; i < _data.length && iter.moveNext(); i++) {
192192
_data[i] |= iter.current;
193193
}
194194
}
@@ -198,7 +198,7 @@ class BitArray extends BitSet {
198198
/// Excess size of the [set] is ignored.
199199
void xor(BitSet set) {
200200
final iter = set.asUint32Iterable().iterator;
201-
for (int i = 0; i < _data.length && iter.moveNext(); i++) {
201+
for (var i = 0; i < _data.length && iter.moveNext(); i++) {
202202
_data[i] = _data[i] ^ iter.current;
203203
}
204204
}
@@ -234,7 +234,7 @@ class BitArray extends BitSet {
234234
/// Creates a string of 0s and 1s of the content of the array.
235235
String toBinaryString() {
236236
final sb = StringBuffer();
237-
for (int i = 0; i < length; i++) {
237+
for (var i = 0; i < length; i++) {
238238
sb.write(this[i] ? '1' : '0');
239239
}
240240
return sb.toString();
@@ -262,7 +262,7 @@ final _clearMask = List<int>.generate(32, (i) => ~(1 << i));
262262
final _cardinalityBitCounts = List<int>.generate(256, _cardinalityOfByte);
263263

264264
int _cardinalityOfByte(int value) {
265-
int result = 0;
265+
var result = 0;
266266
while (value > 0) {
267267
if (value & 0x01 != 0) {
268268
result++;

‎lib/src/bit_counter.dart

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class BitCounter {
1818
/// The lowest 63-bit integer value at the given [index].
1919
/// TODO: add BigInt support.
2020
int operator [](int index) {
21-
int count = 0;
22-
for (int i = 0; i < _bits.length && i < 63; i++) {
21+
var count = 0;
22+
for (var i = 0; i < _bits.length && i < 63; i++) {
2323
if (_bits[i][index]) {
2424
count |= (1 << i);
2525
}
@@ -30,7 +30,7 @@ class BitCounter {
3030
/// Sets the lowest 63-bit integer value at the given [index].
3131
/// TODO: add BigInt support.
3232
void operator []=(int index, int value) {
33-
int pos = 0;
33+
var pos = 0;
3434
while (value > 0) {
3535
BitArray array;
3636
if (_bits.length == pos) {
@@ -51,7 +51,7 @@ class BitCounter {
5151
/// Returns the binary string representation of the count at the given [index].
5252
String toBinaryString(int index) {
5353
final sb = StringBuffer();
54-
for (int i = _bits.length - 1; i >= 0; i--) {
54+
for (var i = _bits.length - 1; i >= 0; i--) {
5555
final value = _bits[i][index];
5656
if (sb.isEmpty && !value) continue;
5757
sb.write(value ? '1' : '0');
@@ -75,15 +75,15 @@ class BitCounter {
7575
_length = set.length;
7676
_bits.forEach((a) => a.length = _length);
7777
}
78-
for (int i = _bits.length; i < shiftLeft; i++) {
78+
for (var i = _bits.length; i < shiftLeft; i++) {
7979
_bits.add(BitArray(_length));
8080
}
8181
final arrayDataLength = _bufferLength32(_length);
8282
final iterator = set.asUint32Iterable().iterator;
83-
for (int i = 0; i < arrayDataLength && iterator.moveNext(); i++) {
84-
int overflow = iterator.current;
83+
for (var i = 0; i < arrayDataLength && iterator.moveNext(); i++) {
84+
var overflow = iterator.current;
8585

86-
for (int pos = shiftLeft; overflow != 0; pos++) {
86+
for (var pos = shiftLeft; overflow != 0; pos++) {
8787
BitArray counter;
8888
if (_bits.length == pos) {
8989
counter = BitArray(_length);
@@ -103,7 +103,7 @@ class BitCounter {
103103
///
104104
/// The add starts at the bit position specified by [shiftLeft].
105105
void addBitCounter(BitCounter counter, {int shiftLeft = 0}) {
106-
for (int i = 0; i < counter.bitLength; i++) {
106+
for (var i = 0; i < counter.bitLength; i++) {
107107
addBitSet(counter.bits[i], shiftLeft: shiftLeft + i);
108108
}
109109
}
@@ -112,10 +112,10 @@ class BitCounter {
112112
///
113113
/// The increment starts at the bit position specified by [shiftLeft].
114114
void increment(int index, {int shiftLeft = 0}) {
115-
for (int i = _bits.length; i < shiftLeft; i++) {
115+
for (var i = _bits.length; i < shiftLeft; i++) {
116116
_bits.add(BitArray(_length));
117117
}
118-
for (int pos = shiftLeft;; pos++) {
118+
for (var pos = shiftLeft;; pos++) {
119119
BitArray counter;
120120
if (_bits.length == pos) {
121121
counter = BitArray(_length);
@@ -136,7 +136,7 @@ class BitCounter {
136136
/// Multiply this instance with [value] and return the result.
137137
BitCounter multiply(int value) {
138138
final result = BitCounter(_length);
139-
int shiftLeft = 0;
139+
var shiftLeft = 0;
140140
while (value > 0) {
141141
final bit = value & 0x01;
142142
if (bit == 1) {
@@ -151,8 +151,8 @@ class BitCounter {
151151
/// Multiply this instance with [counter] and return the result.
152152
BitCounter multiplyWithCounter(BitCounter counter) {
153153
final result = BitCounter(math.min(_length, counter._length));
154-
for (int i = 0; i < bitLength; i++) {
155-
for (int j = 0; j < counter.bitLength; j++) {
154+
for (var i = 0; i < bitLength; i++) {
155+
for (var j = 0; j < counter.bitLength; j++) {
156156
final ba = _bits[i].clone()..and(counter._bits[j]);
157157
result.addBitSet(ba, shiftLeft: i + j);
158158
}
@@ -196,7 +196,7 @@ class BitCounter {
196196
if (bitLength == 0) return BitArray(0);
197197
if (minValue == 1) {
198198
final r = _bits[0].clone();
199-
for (int i = 1; i < bitLength; i++) {
199+
for (var i = 1; i < bitLength; i++) {
200200
r.or(_bits[i]);
201201
}
202202
return r;
@@ -211,9 +211,9 @@ class BitCounter {
211211
final r = BitArray(_length);
212212
final bl = math.max(bitLength, other.length);
213213
final dataLength = _bits[0]._data.length;
214-
for (int i = 0; i < dataLength; i++) {
215-
int ub = -1;
216-
for (int j = 0; j < bl; j++) {
214+
for (var i = 0; i < dataLength; i++) {
215+
var ub = -1;
216+
for (var j = 0; j < bl; j++) {
217217
final av = j >= bitLength ? 0 : bits[j]._data[i];
218218
final bv = j >= other.length ? 0 : other[j];
219219

@@ -243,17 +243,17 @@ class BitCounter {
243243
_bits.add(BitArray(_length));
244244
}
245245
final dataLength = _bits[0]._data.length;
246-
for (int i = 0; i < dataLength; i++) {
247-
int ua = -1;
248-
for (int j = 0; j < bitLength; j++) {
246+
for (var i = 0; i < dataLength; i++) {
247+
var ua = -1;
248+
for (var j = 0; j < bitLength; j++) {
249249
final av = bits[j]._data[i];
250250
final bv = j >= other.bitLength ? 0 : other.bits[j]._data[i];
251251

252252
final ag = av & (~bv);
253253
final bg = bv & (~av);
254254
ua = ag | (ua & (~bg));
255255
}
256-
for (int j = 0; j < bitLength; j++) {
256+
for (var j = 0; j < bitLength; j++) {
257257
final av = bits[j]._data[i];
258258
final bv = j >= other.bitLength ? 0 : other.bits[j]._data[i];
259259
_bits[j]._data[i] = (ua & av) | ((~ua) & bv);
@@ -277,17 +277,17 @@ class BitCounter {
277277
}
278278
final mbl = math.max(bitLength, other.bitLength);
279279
final dataLength = _bits[0]._data.length;
280-
for (int i = 0; i < dataLength; i++) {
281-
int ub = -1;
282-
for (int j = 0; j < mbl; j++) {
280+
for (var i = 0; i < dataLength; i++) {
281+
var ub = -1;
282+
for (var j = 0; j < mbl; j++) {
283283
final av = j >= bitLength ? 0 : bits[j]._data[i];
284284
final bv = j >= other.bitLength ? 0 : other.bits[j]._data[i];
285285

286286
final ag = av & (~bv);
287287
final bg = bv & (~av);
288288
ub = ag | (ub & (~bg));
289289
}
290-
for (int j = 0; j < bitLength; j++) {
290+
for (var j = 0; j < bitLength; j++) {
291291
final av = bits[j]._data[i];
292292
final bv = j >= other.bitLength ? 0 : other.bits[j]._data[i];
293293
_bits[j]._data[i] = (ub & bv) | ((~ub) & av);
@@ -308,15 +308,15 @@ class BitCounter {
308308
if (bitLength == 0) return;
309309
final dataLength = _bits.first._data.length;
310310
final iter = set.asUint32Iterable().iterator;
311-
int i = 0;
311+
var i = 0;
312312
for (; i < dataLength && iter.moveNext(); i++) {
313313
final cv = iter.current;
314-
for (int j = 0; j < _bits.length; j++) {
314+
for (var j = 0; j < _bits.length; j++) {
315315
_bits[j]._data[i] &= cv;
316316
}
317317
}
318318
for (; i < dataLength; i++) {
319-
for (int j = 0; j < _bits.length; j++) {
319+
for (var j = 0; j < _bits.length; j++) {
320320
_bits[j]._data[i] = 0;
321321
}
322322
}
@@ -330,7 +330,7 @@ class BitCounter {
330330
/// The cloned instance starts at the bit position specified by [shiftRight].
331331
BitCounter clone({int shiftRight = 0}) {
332332
final c = BitCounter(_length);
333-
for (int i = shiftRight; i < bitLength; i++) {
333+
for (var i = shiftRight; i < bitLength; i++) {
334334
c._bits.add(_bits[i].clone());
335335
}
336336
return c;

‎lib/src/bit_set.dart

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ class ListSet extends BitSet {
9191

9292
@override
9393
bool operator [](int index) {
94-
int left = 0;
95-
int right = _list.length - 1;
94+
var left = 0;
95+
var right = _list.length - 1;
9696
while (left <= right) {
9797
final mid = (left + right) >> 1;
9898
final value = _list[mid];
@@ -140,8 +140,8 @@ class RangeSet extends BitSet {
140140

141141
@override
142142
bool operator [](int index) {
143-
int left = 0;
144-
int right = (_list.length >> 1) - 1;
143+
var left = 0;
144+
var right = (_list.length >> 1) - 1;
145145
while (left <= right) {
146146
final mid = (left + right) >> 1;
147147
final midIndex = mid << 1;
@@ -167,8 +167,8 @@ class RangeSet extends BitSet {
167167

168168
@override
169169
int get cardinality {
170-
int value = _list.length >> 1;
171-
for (int i = 1; i < _list.length; i += 2) {
170+
var value = _list.length >> 1;
171+
for (var i = 1; i < _list.length; i += 2) {
172172
value += _list[i];
173173
}
174174
return value;
@@ -184,9 +184,9 @@ class RangeSet extends BitSet {
184184

185185
@override
186186
Iterable<int> asIntIterable() sync* {
187-
for (int i = 0; i < _list.length; i += 2) {
188-
int value = _list[i];
189-
for (int j = _list[i + 1]; j >= 0; j--) {
187+
for (var i = 0; i < _list.length; i += 2) {
188+
var value = _list[i];
189+
for (var j = _list[i + 1]; j >= 0; j--) {
190190
yield value;
191191
value++;
192192
}
@@ -196,10 +196,10 @@ class RangeSet extends BitSet {
196196

197197
Iterable<int> _toUint32Iterable(Iterable<int> values) sync* {
198198
final iter = values.iterator;
199-
int blockOffset = 0;
200-
int blockLast = 31;
201-
int block = 0;
202-
bool hasCurrent = iter.moveNext();
199+
var blockOffset = 0;
200+
var blockLast = 31;
201+
var block = 0;
202+
var hasCurrent = iter.moveNext();
203203
while (hasCurrent) {
204204
if (block == 0 && iter.current > blockLast) {
205205
yield 0;

‎lib/src/composite_counter.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class CompositeCounter {
6363
if (set.chunkBits != chunkBits) {
6464
throw StateError('Only sets with the same chunkBits can be added');
6565
}
66-
for (BitSetChunk bsc in set.chunks) {
66+
for (var bsc in set.chunks) {
6767
final c = _getChunk(bsc.offset, true)!;
6868
c.bitCounter.addBitSet(bsc.bitSet, shiftLeft: shiftLeft);
6969
}
@@ -76,7 +76,7 @@ class CompositeCounter {
7676
if (counter.chunkBits != chunkBits) {
7777
throw StateError('Only counters with the same chunkBits can be added');
7878
}
79-
for (BitCounterChunk bcc in counter.chunks) {
79+
for (var bcc in counter.chunks) {
8080
final c = _getChunk(bcc.offset, true)!;
8181
c.bitCounter.addBitCounter(bcc.bitCounter, shiftLeft: shiftLeft);
8282
}
@@ -99,7 +99,7 @@ class CompositeCounter {
9999
'Only counters with the same chunkBits can be multiplied');
100100
}
101101
final result = CompositeCounter(chunkBits: counter.chunkBits);
102-
for (BitCounterChunk bcc in counter.chunks) {
102+
for (var bcc in counter.chunks) {
103103
final c = _getChunk(bcc.offset);
104104
if (c == null) continue;
105105
final m = c.bitCounter * bcc.bitCounter;
@@ -163,7 +163,7 @@ class CompositeCounter {
163163
if (chunkBits != other.chunkBits) {
164164
throw Exception('chunkBits must match: $chunkBits != ${other.chunkBits}');
165165
}
166-
for (BitCounterChunk oc in other.chunks) {
166+
for (var oc in other.chunks) {
167167
final c = _getChunk(oc.offset, true)!;
168168
if (c.bitCounter.bitLength == 0) {
169169
c.bitCounter._bits.addAll(oc.bitCounter._bits.map((a) => a.clone()));
@@ -185,7 +185,7 @@ class CompositeCounter {
185185
chunks.removeLast();
186186
}
187187
final newChunks = <BitCounterChunk>[];
188-
for (BitCounterChunk oc in other.chunks) {
188+
for (var oc in other.chunks) {
189189
final c = _getChunk(oc.offset, false);
190190
if (c == null) continue;
191191
c.bitCounter.min(oc.bitCounter);
@@ -211,7 +211,7 @@ class CompositeCounter {
211211
chunks.removeLast();
212212
}
213213
final newChunks = <BitCounterChunk>[];
214-
for (BitSetChunk oc in set.chunks) {
214+
for (var oc in set.chunks) {
215215
final c = _getChunk(oc.offset, false);
216216
if (c == null) continue;
217217
c.bitCounter.applyMask(oc.bitSet);
@@ -236,8 +236,8 @@ class CompositeCounter {
236236
}
237237

238238
BitCounterChunk? _getChunk(int offset, [bool forInsert = false]) {
239-
int left = 0;
240-
int right = chunks.length - 1;
239+
var left = 0;
240+
var right = chunks.length - 1;
241241
while (left <= right) {
242242
final mid = (left + right) >> 1;
243243
final value = chunks[mid];

0 commit comments

Comments
 (0)