Refactor to ignore iterator return values

kgryte · kgryte · commit e27231760fff · 2021-12-15T18:01:09.000-08:00
diff --git a/lib/node_modules/@stdlib/iter/every/benchmark/benchmark.js b/lib/node_modules/@stdlib/iter/every/benchmark/benchmark.js
@@ -38,23 +38,27 @@ function createIterator( arr ) {
 
 	it = {};
 	it.next = next;
+	it.reset = reset;
 
 	return it;
 
 	function next() {
 		i += 1;
-		if ( i < len-1 ) {
+		if ( i < len ) {
 			return {
 				'value': arr[ i ],
 				'done': false
 			};
 		}
 		i = -1; // reset index
 		return {
-			'value': arr[ len-1 ],
 			'done': true
 		};
 	}
+
+	function reset() {
+		i = -1;
+	}
 }
 
 
@@ -73,6 +77,7 @@ bench( pkg, function benchmark( b ) {
 		if ( !isBoolean( bool ) ) {
 			b.fail( 'should return a boolean' );
 		}
+		arr.reset();
 	}
 	b.toc();
 	if ( !isBoolean( bool ) ) {
@@ -104,6 +109,7 @@ bench( pkg+'::loop', function benchmark( b ) {
 		if ( !isBoolean( bool ) ) {
 			b.fail( 'should be a boolean' );
 		}
+		arr.reset();
 	}
 	b.toc();
 	if ( !isBoolean( bool ) ) {
diff --git a/lib/node_modules/@stdlib/iter/every/lib/main.js b/lib/node_modules/@stdlib/iter/every/lib/main.js
@@ -21,7 +21,6 @@
 // MODULES //
 
 var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
-var hasOwnProp = require( '@stdlib/assert/has-own-property' );
 
 
 // MAIN //
@@ -48,20 +47,13 @@ function iterEvery( iterator ) {
 	}
 	while ( true ) {
 		v = iterator.next();
-		if ( v.value ) {
-			if ( v.done ) {
-				break;
-			}
-		} else if ( v.done ) {
-			if ( hasOwnProp( v, 'value' ) ) {
-				return false;
-			}
-			break;
-		} else {
+		if ( v.done ) {
+			return true;
+		}
+		if ( !v.value ) {
 			return false;
 		}
 	}
-	return true;
 }
 
 
diff --git a/lib/node_modules/@stdlib/iter/every/test/test.js b/lib/node_modules/@stdlib/iter/every/test/test.js
@@ -84,50 +84,6 @@ tape( 'the function returns `true` if all iterated values are truthy', function
 	t.end();
 });
 
-tape( 'the function returns `true` if all iterated values are truthy (value+done)', function test( t ) {
-	var bool;
-	var arr;
-
-	arr = createIterator( [ 1, 1, 1, 1 ] );
-	bool = iterEvery( arr );
-
-	t.strictEqual( bool, true, 'returns true' );
-	t.end();
-
-	function createIterator( arr ) {
-		var len;
-		var it;
-		var i;
-
-		len = arr.length;
-		i = -1;
-
-		it = {};
-		it.next = next;
-
-		return it;
-
-		function next() {
-			i += 1;
-			if ( i < len-1 ) {
-				return {
-					'value': arr[ i ],
-					'done': false
-				};
-			}
-			if ( i === len-1 ) {
-				return {
-					'value': arr[ i ],
-					'done': true
-				};
-			}
-			return {
-				'done': true
-			};
-		}
-	}
-});
-
 tape( 'the function returns `false` if at least one iterated value is falsy', function test( t ) {
 	var bool;
 	var arr;
@@ -138,47 +94,3 @@ tape( 'the function returns `false` if at least one iterated value is falsy', fu
 	t.strictEqual( bool, false, 'returns false' );
 	t.end();
 });
-
-tape( 'the function returns `false` if at least one iterated value is falsy (value+done)', function test( t ) {
-	var bool;
-	var arr;
-
-	arr = createIterator( [ 1, 1, 1, 0 ] );
-	bool = iterEvery( arr );
-
-	t.strictEqual( bool, false, 'returns false' );
-	t.end();
-
-	function createIterator( arr ) {
-		var len;
-		var it;
-		var i;
-
-		len = arr.length;
-		i = -1;
-
-		it = {};
-		it.next = next;
-
-		return it;
-
-		function next() {
-			i += 1;
-			if ( i < len-1 ) {
-				return {
-					'value': arr[ i ],
-					'done': false
-				};
-			}
-			if ( i === len-1 ) {
-				return {
-					'value': arr[ i ],
-					'done': true
-				};
-			}
-			return {
-				'done': true
-			};
-		}
-	}
-});

Original file line number	Diff line number	Diff line change
`@@ -38,23 +38,27 @@ function createIterator( arr ) {`
`38`	`38`
`39`	`39`	`it = {};`
`40`	`40`	`it.next = next;`
	`41`	`+ it.reset = reset;`
`41`	`42`
`42`	`43`	`return it;`
`43`	`44`
`44`	`45`	`function next() {`
`45`	`46`	`i += 1;`
`46`		`- if ( i < len-1 ) {`
	`47`	`+ if ( i < len ) {`
`47`	`48`	`return {`
`48`	`49`	`'value': arr[ i ],`
`49`	`50`	`'done': false`
`50`	`51`	`};`
`51`	`52`	`}`
`52`	`53`	`i = -1; // reset index`
`53`	`54`	`return {`
`54`		`- 'value': arr[ len-1 ],`
`55`	`55`	`'done': true`
`56`	`56`	`};`
`57`	`57`	`}`
	`58`	`+`
	`59`	`+ function reset() {`
	`60`	`+ i = -1;`
	`61`	`+ }`
`58`	`62`	`}`
`59`	`63`
`60`	`64`
`@@ -73,6 +77,7 @@ bench( pkg, function benchmark( b ) {`
`73`	`77`	`if ( !isBoolean( bool ) ) {`
`74`	`78`	`b.fail( 'should return a boolean' );`
`75`	`79`	`}`
	`80`	`+ arr.reset();`
`76`	`81`	`}`
`77`	`82`	`b.toc();`
`78`	`83`	`if ( !isBoolean( bool ) ) {`
`@@ -104,6 +109,7 @@ bench( pkg+'::loop', function benchmark( b ) {`
`104`	`109`	`if ( !isBoolean( bool ) ) {`
`105`	`110`	`b.fail( 'should be a boolean' );`
`106`	`111`	`}`
	`112`	`+ arr.reset();`
`107`	`113`	`}`
`108`	`114`	`b.toc();`
`109`	`115`	`if ( !isBoolean( bool ) ) {`