From bd8c91e250690567240e3aa4ade9a740b94b1aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Wed, 2 Dec 2015 18:07:06 +0100 Subject: [PATCH] Updates for ES2016 Draft 2015-12-01 - RegExp.prototype[Symbol.split] calls ToUint32 (https://github.com/tc39/ecma262/issues/92) - Species lookup removed from Promise.all and Promise.race (https://github.com/tc39/ecma262/issues/151) - Generator functions are no longer constructors (https://github.com/tc39/ecma262/pull/171) Fixes #444 --- .../next/context-constructor-invocation.js | 16 ---------------- test/built-ins/Promise/all/species-get-error.js | 16 ++++++++-------- test/built-ins/Promise/race/species-get-error.js | 16 ++++++++-------- .../prototype/Symbol.split/coerce-limit.js | 6 +++--- .../expressions/generators/has-instance.js | 1 - .../generators/invoke-as-constructor.js | 14 ++++++++++++++ .../expressions/generators/prototype-value.js | 5 ----- .../method-definition/generator-invoke-ctor.js | 8 ++++---- .../statements/generators/has-instance.js | 1 - .../generators/invoke-as-constructor.js | 14 ++++++++++++++ .../statements/generators/prototype-value.js | 5 ----- 11 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 test/built-ins/GeneratorPrototype/next/context-constructor-invocation.js create mode 100755 test/language/expressions/generators/invoke-as-constructor.js create mode 100755 test/language/statements/generators/invoke-as-constructor.js diff --git a/test/built-ins/GeneratorPrototype/next/context-constructor-invocation.js b/test/built-ins/GeneratorPrototype/next/context-constructor-invocation.js deleted file mode 100644 index 1c5643cdd2..0000000000 --- a/test/built-ins/GeneratorPrototype/next/context-constructor-invocation.js +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (C) 2013 the V8 project authors. All rights reserved. -// This code is governed by the BSD license found in the LICENSE file. -/*--- -es6id: 25.2 -description: > - If the generator was invoked using [[Construct]], the this bind is not - initialized and any references to `this` within the FunctionBody will - produce a ReferenceError exception. ----*/ - -function* g() { this; } -var iter = new g(); - -assert.throws(ReferenceError, function() { - iter.next(); -}); diff --git a/test/built-ins/Promise/all/species-get-error.js b/test/built-ins/Promise/all/species-get-error.js index 2deb108382..0ddf88dde2 100644 --- a/test/built-ins/Promise/all/species-get-error.js +++ b/test/built-ins/Promise/all/species-get-error.js @@ -3,23 +3,23 @@ /*--- description: > - Error thrown when retrieving `Symbol.species` property of the `this` value + Promise.all() does not retrieve `Symbol.species` property of the `this` value es6id: 25.4.4.1 info: > 1. Let C be the this value. 2. If Type(C) is not Object, throw a TypeError exception. - 3. Let S be Get(C, @@species). - 4. ReturnIfAbrupt(S). + 3. Let promiseCapability be ? NewPromiseCapability(C). + ... features: [Symbol.species] ---*/ -var C = {}; +function C(executor) { + executor(function(){}, function(){}); +} Object.defineProperty(C, Symbol.species, { get: function() { - throw new Test262Error(); + $ERROR("Getter for Symbol.species called"); } }); -assert.throws(Test262Error, function() { - Promise.all.call(C); -}); +Promise.all.call(C, []); diff --git a/test/built-ins/Promise/race/species-get-error.js b/test/built-ins/Promise/race/species-get-error.js index 78b01acf15..975021b04a 100644 --- a/test/built-ins/Promise/race/species-get-error.js +++ b/test/built-ins/Promise/race/species-get-error.js @@ -3,23 +3,23 @@ /*--- description: > - Error thrown when retrieving `Symbol.species` property of the `this` value + Promise.race() does not retrieve `Symbol.species` property of the `this` value es6id: 25.4.4.3 info: > 1. Let C be the this value. 2. If Type(C) is not Object, throw a TypeError exception. - 3. Let S be Get(C, @@species). - 4. ReturnIfAbrupt(S). + 3. Let promiseCapability be ? NewPromiseCapability(C). + ... features: [Symbol.species] ---*/ -var C = {}; +function C(executor) { + executor(function(){}, function(){}); +} Object.defineProperty(C, Symbol.species, { get: function() { - throw new Test262Error(); + $ERROR("Getter for Symbol.species called"); } }); -assert.throws(Test262Error, function() { - Promise.race.call(C); -}); +Promise.race.call(C, []); diff --git a/test/built-ins/RegExp/prototype/Symbol.split/coerce-limit.js b/test/built-ins/RegExp/prototype/Symbol.split/coerce-limit.js index db9236ecce..7686827116 100644 --- a/test/built-ins/RegExp/prototype/Symbol.split/coerce-limit.js +++ b/test/built-ins/RegExp/prototype/Symbol.split/coerce-limit.js @@ -6,17 +6,17 @@ es6id: 21.2.5.11 description: Length coercion of `limit` argument info: > [...] - 17. If limit is undefined, let lim be 253–1; else let lim be - ToLength(limit). + 17. If limit is undefined, let lim be 2^32-1; else let lim be ? ToUint32(limit). [...] features: [Symbol.split] ---*/ var result; +// ToUint32(-23) = 4294967273 result = /./[Symbol.split]('abc', -23); assert(Array.isArray(result)); -assert.sameValue(result.length, 0); +assert.sameValue(result.length, 4); result = /./[Symbol.split]('abc', 1.9); assert(Array.isArray(result)); diff --git a/test/language/expressions/generators/has-instance.js b/test/language/expressions/generators/has-instance.js index f4f8806eb9..b49d7c44c4 100644 --- a/test/language/expressions/generators/has-instance.js +++ b/test/language/expressions/generators/has-instance.js @@ -10,4 +10,3 @@ es6id: 25.3 var g = function*() {}; assert(g() instanceof g, 'Instance created via function invocation'); -assert(new g() instanceof g, 'Instance created via constructor invocation'); diff --git a/test/language/expressions/generators/invoke-as-constructor.js b/test/language/expressions/generators/invoke-as-constructor.js new file mode 100755 index 0000000000..ada8990b1b --- /dev/null +++ b/test/language/expressions/generators/invoke-as-constructor.js @@ -0,0 +1,14 @@ +// Copyright (C) 2015 André Bargull. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +description: > + Generator expressions cannot be used as constructors. +es6id: 14.4 +---*/ + +var g = function*(){}; + +assert.throws(TypeError, function() { + var instance = new g(); +}); diff --git a/test/language/expressions/generators/prototype-value.js b/test/language/expressions/generators/prototype-value.js index 0d5066bca2..2a0055de7a 100644 --- a/test/language/expressions/generators/prototype-value.js +++ b/test/language/expressions/generators/prototype-value.js @@ -16,8 +16,3 @@ assert.sameValue( g.prototype, 'Instance created via function invocation' ); -assert.sameValue( - Object.getPrototypeOf(new g()), - g.prototype, - 'Instance created via constructor invocation' -); diff --git a/test/language/expressions/object/method-definition/generator-invoke-ctor.js b/test/language/expressions/object/method-definition/generator-invoke-ctor.js index 6bbe5d855b..467c2572d9 100644 --- a/test/language/expressions/object/method-definition/generator-invoke-ctor.js +++ b/test/language/expressions/object/method-definition/generator-invoke-ctor.js @@ -3,13 +3,13 @@ /*--- description: > - Generator functions declared as methods may be used as constructors. + Generator functions declared as methods cannot be used as constructors. es6id: 14.4.13 features: [generators] ---*/ var method = { *method() {} }.method; -var instance = new method(); - -assert.sameValue(instance instanceof method, true); +assert.throws(TypeError, function() { + var instance = new method(); +}); diff --git a/test/language/statements/generators/has-instance.js b/test/language/statements/generators/has-instance.js index ddf9d239a5..83b03f4888 100644 --- a/test/language/statements/generators/has-instance.js +++ b/test/language/statements/generators/has-instance.js @@ -10,4 +10,3 @@ es6id: 25.3 function* g() {} assert(g() instanceof g, 'Instance created via function invocation'); -assert(new g() instanceof g, 'Instance created via constructor invocation'); diff --git a/test/language/statements/generators/invoke-as-constructor.js b/test/language/statements/generators/invoke-as-constructor.js new file mode 100755 index 0000000000..8252e70fbb --- /dev/null +++ b/test/language/statements/generators/invoke-as-constructor.js @@ -0,0 +1,14 @@ +// Copyright (C) 2015 André Bargull. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +description: > + Generator statements cannot be used as constructors. +es6id: 14.4 +---*/ + +function* g(){} + +assert.throws(TypeError, function() { + var instance = new g(); +}); diff --git a/test/language/statements/generators/prototype-value.js b/test/language/statements/generators/prototype-value.js index c74f8ccad0..feadf6d4e0 100644 --- a/test/language/statements/generators/prototype-value.js +++ b/test/language/statements/generators/prototype-value.js @@ -16,8 +16,3 @@ assert.sameValue( g.prototype, 'Instance created via function invocation' ); -assert.sameValue( - Object.getPrototypeOf(new g()), - g.prototype, - 'Instance created via constructor invocation' -);