change to TypeError

Author: michaelficarra

test/built-ins/Iterator/prototype/chunks/argument-effect-order.js

@@ -10,10 +10,12 @@ info: |
   1. Let O be the this value.
   2. If O is not an Object, throw a TypeError exception.
   3. Let iterated be the Iterator Record { [[Iterator]]: O, [[NextMethod]]: undefined, [[Done]]: false }.
-  4. If chunkSize is not an integral Number in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
+  4. If chunkSize is not a Number, throw a TypeError ... IteratorClose.
+  5. If chunkSize is not an integral Number, throw a TypeError ... IteratorClose.
+  6. If chunkSize is not in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
     a. Let error be ThrowCompletion(a newly created RangeError object).
     b. Return ? IteratorClose(iterated, error).
-  5. Set iterated to ? GetIteratorDirect(O).
+  7. Set iterated to ? GetIteratorDirect(O).
 
 includes: [compareArray.js]
 features: [iterator-chunking]

test/built-ins/Iterator/prototype/chunks/argument-validation-failure-closes-underlying.js

@@ -8,7 +8,9 @@ info: |
   Iterator.prototype.chunks ( chunkSize )
 
   3. Let iterated be the Iterator Record { [[Iterator]]: O, [[NextMethod]]: undefined, [[Done]]: false }.
-  4. If chunkSize is not an integral Number in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
+  4. If chunkSize is not a Number, throw a TypeError exception ... IteratorClose(iterated, error).
+  5. If chunkSize is not an integral Number, throw a TypeError exception ... IteratorClose(iterated, error).
+  6. If chunkSize is not in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
     a. Let error be ThrowCompletion(a newly created RangeError object).
     b. Return ? IteratorClose(iterated, error).
 
@@ -27,7 +29,7 @@ let closable = {
   },
 };
 
-assert.throws(RangeError, function () {
+assert.throws(TypeError, function () {
   closable.chunks();
 });
 assert.sameValue(closed, true, 'iterator closed when chunkSize is undefined');
@@ -39,13 +41,13 @@ assert.throws(RangeError, function () {
 assert.sameValue(closed, true, 'iterator closed when chunkSize is 0');
 
 closed = false;
-assert.throws(RangeError, function () {
+assert.throws(TypeError, function () {
   closable.chunks(NaN);
 });
 assert.sameValue(closed, true, 'iterator closed when chunkSize is NaN');
 
 closed = false;
-assert.throws(RangeError, function () {
+assert.throws(TypeError, function () {
   closable.chunks('1');
 });
 assert.sameValue(closed, true, 'iterator closed when chunkSize is a string');

test/built-ins/Iterator/prototype/chunks/chunkSize-no-coercion.js

@@ -9,16 +9,14 @@ description: >
 info: |
   Iterator.prototype.chunks ( chunkSize )
 
-  4. If chunkSize is not an integral Number in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
-    a. Let error be ThrowCompletion(a newly created RangeError object).
-    b. Return ? IteratorClose(iterated, error).
+  4. If chunkSize is not a Number, throw a TypeError exception.
 
 features: [iterator-chunking]
 ---*/
 let iterator = (function* () {})();
 
 let valueOfCalled = false;
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.chunks({
     valueOf() {
       valueOfCalled = true;
@@ -29,7 +27,7 @@ assert.throws(RangeError, () => {
 assert.sameValue(valueOfCalled, false, 'valueOf must not be called');
 
 let toStringCalled = false;
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.chunks({
     toString() {
       toStringCalled = true;

test/built-ins/Iterator/prototype/chunks/chunkSize-not-a-number.js

@@ -3,46 +3,66 @@
 /*---
 esid: sec-iterator.prototype.chunks
 description: >
-  Iterator.prototype.chunks throws RangeError when chunkSize is not a Number
+  Iterator.prototype.chunks throws TypeError when chunkSize is not an integral
+  Number
 info: |
   Iterator.prototype.chunks ( chunkSize )
 
-  4. If chunkSize is not an integral Number in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
-    a. Let error be ThrowCompletion(a newly created RangeError object).
-    b. Return ? IteratorClose(iterated, error).
+  4. If chunkSize is not a Number, throw a TypeError exception.
+  5. If chunkSize is not an integral Number, throw a TypeError exception.
 
 features: [iterator-chunking]
 ---*/
 let iterator = (function* () {})();
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.chunks();
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.chunks(undefined);
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.chunks('1');
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.chunks(true);
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.chunks(null);
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.chunks({});
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.chunks(Symbol());
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.chunks([2]);
 });
+
+assert.throws(TypeError, () => {
+  iterator.chunks(NaN);
+});
+
+assert.throws(TypeError, () => {
+  iterator.chunks(0.5);
+});
+
+assert.throws(TypeError, () => {
+  iterator.chunks(1.5);
+});
+
+assert.throws(TypeError, () => {
+  iterator.chunks(Infinity);
+});
+
+assert.throws(TypeError, () => {
+  iterator.chunks(-Infinity);
+});

test/built-ins/Iterator/prototype/chunks/chunkSize-out-of-range.js

@@ -3,12 +3,12 @@
 /*---
 esid: sec-iterator.prototype.chunks
 description: >
-  Iterator.prototype.chunks throws RangeError when chunkSize is out of the
-  valid range [1, 2^32 - 1]
+  Iterator.prototype.chunks throws RangeError when chunkSize is an integral
+  Number outside the valid range [1, 2^32 - 1]
 info: |
   Iterator.prototype.chunks ( chunkSize )
 
-  4. If chunkSize is not an integral Number in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
+  6. If chunkSize is not in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
     a. Let error be ThrowCompletion(a newly created RangeError object).
     b. Return ? IteratorClose(iterated, error).
 
@@ -28,26 +28,6 @@ assert.throws(RangeError, () => {
   iterator.chunks(-1);
 });
 
-assert.throws(RangeError, () => {
-  iterator.chunks(-Infinity);
-});
-
-assert.throws(RangeError, () => {
-  iterator.chunks(0.5);
-});
-
-assert.throws(RangeError, () => {
-  iterator.chunks(1.5);
-});
-
-assert.throws(RangeError, () => {
-  iterator.chunks(NaN);
-});
-
-assert.throws(RangeError, () => {
-  iterator.chunks(Infinity);
-});
-
 assert.throws(RangeError, () => {
   iterator.chunks(2 ** 32);
 });

test/built-ins/Iterator/prototype/windows/argument-effect-order.js

@@ -10,14 +10,16 @@ info: |
   1. Let O be the this value.
   2. If O is not an Object, throw a TypeError exception.
   3. Let iterated be the Iterator Record { [[Iterator]]: O, [[NextMethod]]: undefined, [[Done]]: false }.
-  4. If windowSize is not an integral Number in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
+  4. If windowSize is not a Number, throw a TypeError ... IteratorClose.
+  5. If windowSize is not an integral Number, throw a TypeError ... IteratorClose.
+  6. If windowSize is not in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
     a. Let error be ThrowCompletion(a newly created RangeError object).
     b. Return ? IteratorClose(iterated, error).
-  5. If undersized is undefined, set undersized to "only-full".
-  6. If undersized is neither "only-full" nor "allow-partial", then
+  7. If undersized is undefined, set undersized to "only-full".
+  8. If undersized is neither "only-full" nor "allow-partial", then
     a. Let error be ThrowCompletion(a newly created TypeError object).
     b. Return ? IteratorClose(iterated, error).
-  7. Set iterated to ? GetIteratorDirect(O).
+  9. Set iterated to ? GetIteratorDirect(O).
 
 includes: [compareArray.js]
 features: [iterator-chunking]

test/built-ins/Iterator/prototype/windows/argument-validation-failure-closes-underlying.js

@@ -8,11 +8,13 @@ info: |
   Iterator.prototype.windows ( windowSize [ , undersized ] )
 
   3. Let iterated be the Iterator Record { [[Iterator]]: O, [[NextMethod]]: undefined, [[Done]]: false }.
-  4. If windowSize is not an integral Number in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
+  4. If windowSize is not a Number, throw a TypeError exception ... IteratorClose(iterated, error).
+  5. If windowSize is not an integral Number, throw a TypeError exception ... IteratorClose(iterated, error).
+  6. If windowSize is not in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
     a. Let error be ThrowCompletion(a newly created RangeError object).
     b. Return ? IteratorClose(iterated, error).
   ...
-  6. If undersized is neither "only-full" nor "allow-partial", then
+  8. If undersized is neither "only-full" nor "allow-partial", then
     a. Let error be ThrowCompletion(a newly created TypeError object).
     b. Return ? IteratorClose(iterated, error).
 
@@ -32,7 +34,7 @@ let closable = {
 };
 
 // windowSize validation failure closes
-assert.throws(RangeError, function () {
+assert.throws(TypeError, function () {
   closable.windows();
 });
 assert.sameValue(closed, true, 'iterator closed when windowSize is undefined');
@@ -44,13 +46,13 @@ assert.throws(RangeError, function () {
 assert.sameValue(closed, true, 'iterator closed when windowSize is 0');
 
 closed = false;
-assert.throws(RangeError, function () {
+assert.throws(TypeError, function () {
   closable.windows(NaN);
 });
 assert.sameValue(closed, true, 'iterator closed when windowSize is NaN');
 
 closed = false;
-assert.throws(RangeError, function () {
+assert.throws(TypeError, function () {
   closable.windows('1');
 });
 assert.sameValue(closed, true, 'iterator closed when windowSize is a string');

test/built-ins/Iterator/prototype/windows/windowSize-no-coercion.js

@@ -9,16 +9,14 @@ description: >
 info: |
   Iterator.prototype.windows ( windowSize [ , undersized ] )
 
-  4. If windowSize is not an integral Number in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
-    a. Let error be ThrowCompletion(a newly created RangeError object).
-    b. Return ? IteratorClose(iterated, error).
+  4. If windowSize is not a Number, throw a TypeError exception.
 
 features: [iterator-chunking]
 ---*/
 let iterator = (function* () {})();
 
 let valueOfCalled = false;
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.windows({
     valueOf() {
       valueOfCalled = true;
@@ -29,7 +27,7 @@ assert.throws(RangeError, () => {
 assert.sameValue(valueOfCalled, false, 'valueOf must not be called');
 
 let toStringCalled = false;
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.windows({
     toString() {
       toStringCalled = true;

test/built-ins/Iterator/prototype/windows/windowSize-not-a-number.js

@@ -3,46 +3,66 @@
 /*---
 esid: sec-iterator.prototype.windows
 description: >
-  Iterator.prototype.windows throws RangeError when windowSize is not a Number
+  Iterator.prototype.windows throws TypeError when windowSize is not an
+  integral Number
 info: |
   Iterator.prototype.windows ( windowSize [ , undersized ] )
 
-  4. If windowSize is not an integral Number in the inclusive interval from 1𝔽 to 𝔽(2^32 - 1), then
-    a. Let error be ThrowCompletion(a newly created RangeError object).
-    b. Return ? IteratorClose(iterated, error).
+  4. If windowSize is not a Number, throw a TypeError exception.
+  5. If windowSize is not an integral Number, throw a TypeError exception.
 
 features: [iterator-chunking]
 ---*/
 let iterator = (function* () {})();
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.windows();
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.windows(undefined);
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.windows('1');
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.windows(true);
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.windows(null);
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.windows({});
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.windows(Symbol());
 });
 
-assert.throws(RangeError, () => {
+assert.throws(TypeError, () => {
   iterator.windows([2]);
 });
+
+assert.throws(TypeError, () => {
+  iterator.windows(NaN);
+});
+
+assert.throws(TypeError, () => {
+  iterator.windows(0.5);
+});
+
+assert.throws(TypeError, () => {
+  iterator.windows(1.5);
+});
+
+assert.throws(TypeError, () => {
+  iterator.windows(Infinity);
+});
+
+assert.throws(TypeError, () => {
+  iterator.windows(-Infinity);
+});