Skip to content

Commit fd8cbd2

Browse files
kgrytekgryte
committed
Refactor to ignore iterator return values
1 parent ccdda58 commit fd8cbd2

3 files changed

Lines changed: 9 additions & 145 deletions

File tree

‎lib/node_modules/@stdlib/iter/some-by/benchmark/benchmark.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,27 @@ function createIterator( arr ) {
3838

3939
it = {};
4040
it.next = next;
41+
it.reset = reset;
4142

4243
return it;
4344

4445
function next() {
4546
i += 1;
46-
if ( i < len-1 ) {
47+
if ( i < len ) {
4748
return {
4849
'value': arr[ i ],
4950
'done': false
5051
};
5152
}
5253
i = -1; // reset index
5354
return {
54-
'value': arr[ len-1 ],
5555
'done': true
5656
};
5757
}
58+
59+
function reset() {
60+
i = -1;
61+
}
5862
}
5963

6064

@@ -73,6 +77,7 @@ bench( pkg, function benchmark( b ) {
7377
if ( !isBoolean( bool ) ) {
7478
b.fail( 'should return a boolean' );
7579
}
80+
arr.reset();
7681
}
7782
b.toc();
7883
if ( !isBoolean( bool ) ) {
@@ -113,6 +118,7 @@ bench( pkg+'::loop', function benchmark( b ) {
113118
if ( !isBoolean( bool ) ) {
114119
b.fail( 'should be a boolean' );
115120
}
121+
arr.reset();
116122
}
117123
b.toc();
118124
if ( !isBoolean( bool ) ) {

‎lib/node_modules/@stdlib/iter/some-by/lib/main.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
2424
var isFunction = require( '@stdlib/assert/is-function' );
25-
var hasOwnProp = require( '@stdlib/assert/has-own-property' );
2625
var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimitive;
2726

2827

@@ -71,11 +70,7 @@ function iterSomeBy( iterator, n, predicate, thisArg ) {
7170
i += 1;
7271
v = iterator.next();
7372
if ( v.done ) {
74-
if ( hasOwnProp( v, 'value' ) && predicate.call( thisArg, v.value, i ) ) {
75-
count += 1;
76-
return ( count === n );
77-
}
78-
break;
73+
return false;
7974
}
8075
if ( predicate.call( thisArg, v.value, i ) ) {
8176
count += 1;
@@ -84,7 +79,6 @@ function iterSomeBy( iterator, n, predicate, thisArg ) {
8479
}
8580
}
8681
}
87-
return false;
8882
}
8983

9084

‎lib/node_modules/@stdlib/iter/some-by/test/test.js‎

Lines changed: 0 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -152,49 +152,6 @@ tape( 'the function returns `true` if at least `n` iterated values pass a test i
152152
}
153153
});
154154

155-
tape( 'the function returns `true` if at least `n` iterated values pass a test implemented by a predicate function (value+done)', function test( t ) {
156-
var bool;
157-
var arr;
158-
159-
arr = createIterator( [ 1, 1, 0, 0, 1 ] );
160-
bool = iterSomeBy( arr, 3, predicate );
161-
162-
t.strictEqual( bool, true, 'returns expected value' );
163-
t.end();
164-
165-
function predicate( v ) {
166-
return ( v > 0 );
167-
}
168-
169-
function createIterator( arr ) {
170-
var len;
171-
var it;
172-
var i;
173-
174-
len = arr.length;
175-
i = -1;
176-
177-
it = {};
178-
it.next = next;
179-
180-
return it;
181-
182-
function next() {
183-
var out;
184-
i += 1;
185-
if ( i < len ) {
186-
out = {};
187-
out.value = arr[ i ];
188-
out.done = ( i === len-1 );
189-
return out;
190-
}
191-
return {
192-
'done': true
193-
};
194-
}
195-
}
196-
});
197-
198155
tape( 'the function returns `false` if fewer than `n` iterated values pass a test implemented by a predicate function', function test( t ) {
199156
var bool;
200157
var arr;
@@ -210,49 +167,6 @@ tape( 'the function returns `false` if fewer than `n` iterated values pass a tes
210167
}
211168
});
212169

213-
tape( 'the function returns `false` if fewer than `n` iterated values pass a test implemented by a predicate function (value+done)', function test( t ) {
214-
var bool;
215-
var arr;
216-
217-
arr = createIterator( [ 1, 0, 1 ] );
218-
bool = iterSomeBy( arr, 3, predicate );
219-
220-
t.strictEqual( bool, false, 'returns expected value' );
221-
t.end();
222-
223-
function predicate( v ) {
224-
return ( v > 0 );
225-
}
226-
227-
function createIterator( arr ) {
228-
var len;
229-
var it;
230-
var i;
231-
232-
len = arr.length;
233-
i = -1;
234-
235-
it = {};
236-
it.next = next;
237-
238-
return it;
239-
240-
function next() {
241-
var out;
242-
i += 1;
243-
if ( i < len ) {
244-
out = {};
245-
out.value = arr[ i ];
246-
out.done = ( i === len-1 );
247-
return out;
248-
}
249-
return {
250-
'done': true
251-
};
252-
}
253-
}
254-
});
255-
256170
tape( 'the function supports providing an execution context', function test( t ) {
257171
var bool;
258172
var arr;
@@ -274,53 +188,3 @@ tape( 'the function supports providing an execution context', function test( t )
274188
return ( v > 0 );
275189
}
276190
});
277-
278-
tape( 'the function supports providing an execution context (value+done)', function test( t ) {
279-
var bool;
280-
var arr;
281-
var ctx;
282-
283-
ctx = {
284-
'count': 0
285-
};
286-
287-
arr = createIterator( [ 1, 0, 1, 1, 0 ] );
288-
bool = iterSomeBy( arr, 3, predicate, ctx );
289-
290-
t.strictEqual( bool, true, 'returns expected value' );
291-
t.strictEqual( ctx.count, 4, 'returns expected value' );
292-
t.end();
293-
294-
function predicate( v ) {
295-
this.count += 1; // eslint-disable-line no-invalid-this
296-
return ( v > 0 );
297-
}
298-
299-
function createIterator( arr ) {
300-
var len;
301-
var it;
302-
var i;
303-
304-
len = arr.length;
305-
i = -1;
306-
307-
it = {};
308-
it.next = next;
309-
310-
return it;
311-
312-
function next() {
313-
var out;
314-
i += 1;
315-
if ( i < len ) {
316-
out = {};
317-
out.value = arr[ i ];
318-
out.done = ( i === len-1 );
319-
return out;
320-
}
321-
return {
322-
'done': true
323-
};
324-
}
325-
}
326-
});

0 commit comments

Comments
 (0)