Refactor to ignore iterator return values

kgryte · kgryte · commit ccdda582bc12 · 2021-12-16T00:37:35.000-08:00
diff --git a/lib/node_modules/@stdlib/iter/some/benchmark/benchmark.js b/lib/node_modules/@stdlib/iter/some/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 ) ) {
@@ -112,6 +117,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/some/lib/main.js b/lib/node_modules/@stdlib/iter/some/lib/main.js
@@ -55,17 +55,16 @@ function iterSome( iterator, n ) {
 	count = 0;
 	while ( true ) {
 		v = iterator.next();
+		if ( v.done ) {
+			return false;
+		}
 		if ( v.value ) {
 			count += 1;
 			if ( count === n ) {
 				return true;
 			}
 		}
-		if ( v.done ) {
-			break;
-		}
 	}
-	return false;
 }
 
 

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 ) ) {`
`@@ -112,6 +117,7 @@ bench( pkg+'::loop', function benchmark( b ) {`
`112`	`117`	`if ( !isBoolean( bool ) ) {`
`113`	`118`	`b.fail( 'should be a boolean' );`
`114`	`119`	`}`
	`120`	`+ arr.reset();`
`115`	`121`	`}`
`116`	`122`	`b.toc();`
`117`	`123`	`if ( !isBoolean( bool ) ) {`
Original file line number	Diff line number	Diff line change
`@@ -55,17 +55,16 @@ function iterSome( iterator, n ) {`
`55`	`55`	`count = 0;`
`56`	`56`	`while ( true ) {`
`57`	`57`	`v = iterator.next();`
	`58`	`+ if ( v.done ) {`
	`59`	`+ return false;`
	`60`	`+ }`
`58`	`61`	`if ( v.value ) {`
`59`	`62`	`count += 1;`
`60`	`63`	`if ( count === n ) {`
`61`	`64`	`return true;`
`62`	`65`	`}`
`63`	`66`	`}`
`64`		`- if ( v.done ) {`
`65`		`- break;`
`66`		`- }`
`67`	`67`	`}`
`68`		`- return false;`
`69`	`68`	`}`
`70`	`69`
`71`	`70`