RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 13:17:35 +00:00
Code Issues Activity Actions

LibJS: Implement IteratorClose with Completions and align to the spec

Browse source
This commit is contained in:
Timothy Flynn 2021-10-20 13:36:14 -04:00 • committed by Linus Groh
parent 04b4307b3d
commit ec54a7b5b0
8 changed files with 97 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Userland/Libraries/LibJS/Runtime/PromiseConstructor.cpp
View file

@ -302,11 +302,16 @@ JS_DEFINE_OLD_NATIVE_FUNCTION(PromiseConstructor::all)
auto* iterator_record = iterator_record_or_error.release_value();
auto result = perform_promise_all(global_object, *iterator_record, constructor, promise_capability, promise_resolve);
if (vm.exception()) {
if (!iterator_record_is_complete(global_object, *iterator_record))
iterator_close(*iterator_record);
if (auto* exception = vm.exception()) {
// FIXME: Once perform_promise_all returns a throw completion, pass that to iterator_close() instead.
auto result_error = throw_completion(exception->value());
auto abrupt = if_abrupt_reject_promise(global_object, result, promise_capability);
if (!iterator_record_is_complete(global_object, *iterator_record)) {
TemporaryClearException clear_exception(vm); // iterator_close() may invoke vm.call(), which VERIFYs no exception.
result_error = iterator_close(*iterator_record, move(result_error));
}
auto abrupt = if_abrupt_reject_promise(global_object, result_error, promise_capability);
return abrupt.value();
}
@ -332,11 +337,16 @@ JS_DEFINE_OLD_NATIVE_FUNCTION(PromiseConstructor::all_settled)
auto* iterator_record = iterator_record_or_error.release_value();
auto result = perform_promise_all_settled(global_object, *iterator_record, constructor, promise_capability, promise_resolve);
if (vm.exception()) {
if (!iterator_record_is_complete(global_object, *iterator_record))
iterator_close(*iterator_record);
if (auto* exception = vm.exception()) {
// FIXME: Once perform_promise_all_settled returns a throw completion, pass that to iterator_close() instead.
auto result_error = throw_completion(exception->value());
auto abrupt = if_abrupt_reject_promise(global_object, result, promise_capability);
if (!iterator_record_is_complete(global_object, *iterator_record)) {
TemporaryClearException clear_exception(vm); // iterator_close() may invoke vm.call(), which VERIFYs no exception.
result_error = iterator_close(*iterator_record, move(result_error));
}
auto abrupt = if_abrupt_reject_promise(global_object, result_error, promise_capability);
return abrupt.value();
}
@ -362,11 +372,16 @@ JS_DEFINE_OLD_NATIVE_FUNCTION(PromiseConstructor::any)
auto* iterator_record = iterator_record_or_error.release_value();
auto result = perform_promise_any(global_object, *iterator_record, constructor, promise_capability, promise_resolve);
if (vm.exception()) {
if (!iterator_record_is_complete(global_object, *iterator_record))
iterator_close(*iterator_record);
if (auto* exception = vm.exception()) {
// FIXME: Once perform_promise_any returns a throw completion, pass that to iterator_close() instead.
auto result_error = throw_completion(exception->value());
auto abrupt = if_abrupt_reject_promise(global_object, result, promise_capability);
if (!iterator_record_is_complete(global_object, *iterator_record)) {
TemporaryClearException clear_exception(vm); // iterator_close() may invoke vm.call(), which VERIFYs no exception.
result_error = iterator_close(*iterator_record, move(result_error));
}
auto abrupt = if_abrupt_reject_promise(global_object, result_error, promise_capability);
return abrupt.value();
}
@ -392,11 +407,16 @@ JS_DEFINE_OLD_NATIVE_FUNCTION(PromiseConstructor::race)
auto* iterator_record = iterator_record_or_error.release_value();
auto result = perform_promise_race(global_object, *iterator_record, constructor, promise_capability, promise_resolve);
if (vm.exception()) {
if (!iterator_record_is_complete(global_object, *iterator_record))
iterator_close(*iterator_record);
if (auto* exception = vm.exception()) {
// FIXME: Once perform_promise_race returns a throw completion, pass that to iterator_close() instead.
auto result_error = throw_completion(exception->value());
auto abrupt = if_abrupt_reject_promise(global_object, result, promise_capability);
if (!iterator_record_is_complete(global_object, *iterator_record)) {
TemporaryClearException clear_exception(vm);
result_error = iterator_close(*iterator_record, move(result_error)); // iterator_close() may invoke vm.call(), which VERIFYs no exception.
}
auto abrupt = if_abrupt_reject_promise(global_object, result_error, promise_capability);
return abrupt.value();
}