Break the while loop early in touchNext

projectfluent · Jun 8, 2018 · 7747baf · 7747baf
1 parent dca60f8
commit 7747baf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/cached_async_iterable.mjs b/src/cached_async_iterable.mjs
@@ -76,9 +76,11 @@ export default class CachedAsyncIterable extends CachedIterable {
     async touchNext(count = 1) {
         let idx = 0;
         while (idx++ < count) {
-            if (this.length === 0 || this[this.length - 1].done === false) {
-                this.push(await this.iterator.next());
+            const last = this[this.length - 1];
+            if (last && last.done) {
+                break;
             }
+            this.push(await this.iterator.next());
         }
         // Return the last cached {value, done} object to allow the calling
         // code to decide if it needs to call touchNext again.

diff --git a/src/cached_sync_iterable.mjs b/src/cached_sync_iterable.mjs
@@ -46,9 +46,11 @@ export default class CachedSyncIterable extends CachedIterable {
     touchNext(count = 1) {
         let idx = 0;
         while (idx++ < count) {
-            if (this.length === 0 || this[this.length - 1].done === false) {
-                this.push(this.iterator.next());
+            const last = this[this.length - 1];
+            if (last && last.done) {
+                break;
             }
+            this.push(this.iterator.next());
         }
         // Return the last cached {value, done} object to allow the calling
         // code to decide if it needs to call touchNext again.