Refactor to ignore iterator return values

kgryte · kgryte · commit b79f3d6e12a5 · 2021-12-15T21:21:28.000-08:00
diff --git a/lib/node_modules/@stdlib/iter/length/benchmark/benchmark.js b/lib/node_modules/@stdlib/iter/length/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 ( isnan( v ) ) {
 			b.fail( 'should not be NaN' );
 		}
+		arr.reset();
 	}
 	b.toc();
 	if ( isnan( v ) ) {
@@ -103,6 +108,7 @@ bench( pkg+'::loop', function benchmark( b ) {
 		if ( count !== values.length ) {
 			b.fail( 'unexpected result' );
 		}
+		arr.reset();
 	}
 	b.toc();
 	if ( count !== values.length ) {
diff --git a/lib/node_modules/@stdlib/iter/length/lib/main.js b/lib/node_modules/@stdlib/iter/length/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 //
@@ -51,15 +50,10 @@ function iterLength( iterator ) {
 	while ( true ) {
 		v = iterator.next();
 		if ( v.done ) {
-			if ( hasOwnProp( v, 'value' ) ) {
-				count += 1;
-				return count;
-			}
-			break;
+			return count;
 		}
 		count += 1;
 	}
-	return count;
 }
 
 
diff --git a/lib/node_modules/@stdlib/iter/length/test/test.js b/lib/node_modules/@stdlib/iter/length/test/test.js
@@ -83,42 +83,3 @@ tape( 'the function returns the iterator length', function test( t ) {
 	t.strictEqual( v, 5, 'returns expected value' );
 	t.end();
 });
-
-tape( 'the function returns the iterator length (value+done)', function test( t ) {
-	var arr;
-	var v;
-
-	arr = createIterator( [ 0, 0, 1 ] );
-	v = iterLength( arr );
-
-	t.strictEqual( v, 3, 'returns expected value' );
-	t.end();
-
-	function createIterator( arr ) {
-		var len;
-		var it;
-		var i;
-
-		len = arr.length;
-		i = -1;
-
-		it = {};
-		it.next = next;
-
-		return it;
-
-		function next() {
-			var out;
-			i += 1;
-			if ( i < len ) {
-				out = {};
-				out.value = arr[ i ];
-				out.done = ( i === len-1 );
-				return out;
-			}
-			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 ( isnan( v ) ) {`
`74`	`78`	`b.fail( 'should not be NaN' );`
`75`	`79`	`}`
	`80`	`+ arr.reset();`
`76`	`81`	`}`
`77`	`82`	`b.toc();`
`78`	`83`	`if ( isnan( v ) ) {`
`@@ -103,6 +108,7 @@ bench( pkg+'::loop', function benchmark( b ) {`
`103`	`108`	`if ( count !== values.length ) {`
`104`	`109`	`b.fail( 'unexpected result' );`
`105`	`110`	`}`
	`111`	`+ arr.reset();`
`106`	`112`	`}`
`107`	`113`	`b.toc();`
`108`	`114`	`if ( count !== values.length ) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`// MODULES //`
`22`	`22`
`23`	`23`	`var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );`
`24`		`-var hasOwnProp = require( '@stdlib/assert/has-own-property' );`
`25`	`24`
`26`	`25`
`27`	`26`	`// MAIN //`
`@@ -51,15 +50,10 @@ function iterLength( iterator ) {`
`51`	`50`	`while ( true ) {`
`52`	`51`	`v = iterator.next();`
`53`	`52`	`if ( v.done ) {`
`54`		`- if ( hasOwnProp( v, 'value' ) ) {`
`55`		`- count += 1;`
`56`		`- return count;`
`57`		`- }`
`58`		`- break;`
	`53`	`+ return count;`
`59`	`54`	`}`
`60`	`55`	`count += 1;`
`61`	`56`	`}`
`62`		`- return count;`
`63`	`57`	`}`
`64`	`58`
`65`	`59`