Revision: 20037
Author: [email protected]
Date: Tue Mar 18 14:55:43 2014 UTC
Log: Promises: make null a legal argument for .then
[email protected]
BUG=
Review URL: https://codereview.chromium.org/203453002
http://code.google.com/p/v8/source/detail?r=20037
Modified:
/branches/bleeding_edge/src/promise.js
/branches/bleeding_edge/test/mjsunit/es6/promises.js
=======================================
--- /branches/bleeding_edge/src/promise.js Fri Mar 14 10:35:01 2014 UTC
+++ /branches/bleeding_edge/src/promise.js Tue Mar 18 14:55:43 2014 UTC
@@ -210,7 +210,10 @@
// Multi-unwrapped chaining with thenable coercion.
function PromiseThen(onResolve, onReject) {
- onResolve = IS_UNDEFINED(onResolve) ? PromiseIdResolveHandler :
onResolve;
+ onResolve =
+ IS_NULL_OR_UNDEFINED(onResolve) ? PromiseIdResolveHandler : onResolve;
+ onReject =
+ IS_NULL_OR_UNDEFINED(onReject) ? PromiseIdRejectHandler : onReject;
var that = this;
var constructor = this.constructor;
return this.chain(
@@ -230,11 +233,10 @@
var then;
try {
then = x.then;
- } catch(e) {
- var deferred = %_CallFunction(constructor, PromiseDeferred);
- PromiseCoerce.table.set(x, deferred.promise);
- deferred.reject(e);
- return deferred.promise;
+ } catch(r) {
+ var promise = %_CallFunction(constructor, r, PromiseRejected);
+ PromiseCoerce.table.set(x, promise);
+ return promise;
}
if (typeof then === 'function') {
if (PromiseCoerce.table.has(x)) {
@@ -244,8 +246,8 @@
PromiseCoerce.table.set(x, deferred.promise);
try {
%_CallFunction(x, deferred.resolve, deferred.reject, then);
- } catch(e) {
- deferred.reject(e);
+ } catch(r) {
+ deferred.reject(r);
}
return deferred.promise;
}
=======================================
--- /branches/bleeding_edge/test/mjsunit/es6/promises.js Tue Mar 18
09:57:14 2014 UTC
+++ /branches/bleeding_edge/test/mjsunit/es6/promises.js Tue Mar 18
14:55:43 2014 UTC
@@ -100,16 +100,26 @@
(function() {
Promise.resolve(5).then(undefined, assertUnreachable).chain(
- function(x) { assertAsync(x === 5, "resolved/then-nohandler") },
+ function(x) { assertAsync(x ===
5, "resolved/then-nohandler-undefined") },
assertUnreachable
)
+ assertAsyncRan()
+ Promise.resolve(6).then(null, assertUnreachable).chain(
+ function(x) { assertAsync(x === 6, "resolved/then-nohandler-null") },
+ assertUnreachable
+ )
assertAsyncRan()
})();
(function() {
Promise.reject(5).then(assertUnreachable, undefined).chain(
assertUnreachable,
- function(r) { assertAsync(r === 5, "rejected/then-nohandler") }
+ function(r) { assertAsync(r ===
5, "rejected/then-nohandler-undefined") }
+ )
+ assertAsyncRan()
+ Promise.reject(6).then(assertUnreachable, null).chain(
+ assertUnreachable,
+ function(r) { assertAsync(r === 6, "rejected/then-nohandler-null") }
)
assertAsyncRan()
})();
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
