From fccd9c4b81de64b9689f43377c958165b6cd090f Mon Sep 17 00:00:00 2001 From: Alexey Shvayka Date: Wed, 1 Apr 2020 07:09:58 +0300 Subject: [PATCH] Add IteratorClose tests --- ...ator-close-non-throw-get-method-abrupt.js} | 21 +++++++-- ...close-non-throw-get-method-non-callable.js | 47 +++++++++++++++++++ .../iterator-close-throw-get-method-abrupt.js | 46 ++++++++++++++++++ ...tor-close-throw-get-method-non-callable.js | 46 ++++++++++++++++++ 4 files changed, 157 insertions(+), 3 deletions(-) rename test/language/statements/for-of/{iterator-close-get-method-error.js => iterator-close-non-throw-get-method-abrupt.js} (51%) create mode 100644 test/language/statements/for-of/iterator-close-non-throw-get-method-non-callable.js create mode 100644 test/language/statements/for-of/iterator-close-throw-get-method-abrupt.js create mode 100644 test/language/statements/for-of/iterator-close-throw-get-method-non-callable.js diff --git a/test/language/statements/for-of/iterator-close-get-method-error.js b/test/language/statements/for-of/iterator-close-non-throw-get-method-abrupt.js similarity index 51% rename from test/language/statements/for-of/iterator-close-get-method-error.js rename to test/language/statements/for-of/iterator-close-non-throw-get-method-abrupt.js index cec2854534..66a806849f 100644 --- a/test/language/statements/for-of/iterator-close-get-method-error.js +++ b/test/language/statements/for-of/iterator-close-non-throw-get-method-abrupt.js @@ -1,10 +1,25 @@ // Copyright (C) 2015 the V8 project authors. All rights reserved. // This code is governed by the BSD license found in the LICENSE file. /*--- -es6id: 13.6.4.13 +esid: sec-iteratorclose description: > - If retrieving an iterator's `return` method generates an error while - closing the iterator, the error should be forwarded to the runtime. + If retrieving an iterator's `return` method generates an error while + closing the iterator with non-throw completion, the error should be + forwarded to the runtime. +info: | + IteratorClose ( iteratorRecord, completion ) + + [...] + 4. Let innerResult be GetMethod(iterator, "return"). + 5. If innerResult.[[Type]] is normal, + [...] + 6. If completion.[[Type]] is throw, return Completion(completion). + 7. If innerResult.[[Type]] is throw, return Completion(innerResult). + + GetMethod ( V, P ) + + [...] + 2. Let func be ? GetV(V, P). features: [Symbol.iterator] ---*/ diff --git a/test/language/statements/for-of/iterator-close-non-throw-get-method-non-callable.js b/test/language/statements/for-of/iterator-close-non-throw-get-method-non-callable.js new file mode 100644 index 0000000000..04228521d8 --- /dev/null +++ b/test/language/statements/for-of/iterator-close-non-throw-get-method-non-callable.js @@ -0,0 +1,47 @@ +// Copyright (C) 2020 Alexey Shvayka. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. +/*--- +esid: sec-iteratorclose +description: > + If retrieving an iterator's `return` method generates an error while + closing the iterator with non-throw completion, the error should be + forwarded to the runtime. +info: | + IteratorClose ( iteratorRecord, completion ) + + [...] + 4. Let innerResult be GetMethod(iterator, "return"). + 5. If innerResult.[[Type]] is normal, + [...] + 6. If completion.[[Type]] is throw, return Completion(completion). + 7. If innerResult.[[Type]] is throw, return Completion(innerResult). + + GetMethod ( V, P ) + + [...] + 2. Let func be ? GetV(V, P). + 3. If func is either undefined or null, return undefined. + 4. If IsCallable(func) is false, throw a TypeError exception. +features: [Symbol.iterator] +---*/ + +var iterable = {}; +var iterationCount = 0; + +iterable[Symbol.iterator] = function() { + return { + next: function() { + return { done: false, value: null }; + }, + return: 1, + }; +}; + +assert.throws(TypeError, function() { + for (var x of iterable) { + iterationCount += 1; + break; + } +}); + +assert.sameValue(iterationCount, 1, 'The loop body is evaluated'); diff --git a/test/language/statements/for-of/iterator-close-throw-get-method-abrupt.js b/test/language/statements/for-of/iterator-close-throw-get-method-abrupt.js new file mode 100644 index 0000000000..67752c9292 --- /dev/null +++ b/test/language/statements/for-of/iterator-close-throw-get-method-abrupt.js @@ -0,0 +1,46 @@ +// Copyright (C) 2020 Alexey Shvayka. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. +/*--- +esid: sec-iteratorclose +description: > + If retrieving an iterator's `return` method generates an error while + closing the iterator with throw completion, this error should be suppressed. +info: | + IteratorClose ( iteratorRecord, completion ) + + [...] + 4. Let innerResult be GetMethod(iterator, "return"). + 5. If innerResult.[[Type]] is normal, + [...] + 6. If completion.[[Type]] is throw, return Completion(completion). + 7. If innerResult.[[Type]] is throw, return Completion(innerResult). + + GetMethod ( V, P ) + + [...] + 2. Let func be ? GetV(V, P). +features: [Symbol.iterator] +---*/ + +var iterable = {}; +var iterationCount = 0; + +iterable[Symbol.iterator] = function() { + return { + next: function() { + return { done: false, value: null }; + }, + get return() { + throw { name: 'inner error' }; + }, + }; +}; + +assert.throws(Test262Error, function() { + for (var x of iterable) { + iterationCount += 1; + throw new Test262Error('should not be overriden'); + } +}); + +assert.sameValue(iterationCount, 1, 'The loop body is evaluated'); diff --git a/test/language/statements/for-of/iterator-close-throw-get-method-non-callable.js b/test/language/statements/for-of/iterator-close-throw-get-method-non-callable.js new file mode 100644 index 0000000000..81e1cc6354 --- /dev/null +++ b/test/language/statements/for-of/iterator-close-throw-get-method-non-callable.js @@ -0,0 +1,46 @@ +// Copyright (C) 2020 Alexey Shvayka. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. +/*--- +esid: sec-iteratorclose +description: > + If retrieving an iterator's `return` method generates an error while + closing the iterator with throw completion, this error should be suppressed. +info: | + IteratorClose ( iteratorRecord, completion ) + + [...] + 4. Let innerResult be GetMethod(iterator, "return"). + 5. If innerResult.[[Type]] is normal, + [...] + 6. If completion.[[Type]] is throw, return Completion(completion). + 7. If innerResult.[[Type]] is throw, return Completion(innerResult). + + GetMethod ( V, P ) + + [...] + 2. Let func be ? GetV(V, P). + 3. If func is either undefined or null, return undefined. + 4. If IsCallable(func) is false, throw a TypeError exception. +features: [Symbol.iterator] +---*/ + +var iterable = {}; +var iterationCount = 0; + +iterable[Symbol.iterator] = function() { + return { + next: function() { + return { done: false, value: null }; + }, + return: 'str', + }; +}; + +assert.throws(Test262Error, function() { + for (var x of iterable) { + iterationCount += 1; + throw new Test262Error('should not be overriden'); + } +}); + +assert.sameValue(iterationCount, 1, 'The loop body is evaluated');