Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ jobs:
popd
echo "CC=tcc" >> $GITHUB_ENV;

- name: Install extra dependencies
if: ${{ matrix.config.arch != '' }}
shell: 'sh'
run: |
sudo apt update && sudo apt install -y binfmt-support

- name: Setup Alpine
if: ${{ matrix.config.arch != '' }}
uses: jirutka/setup-alpine@v1
Expand Down
29 changes: 29 additions & 0 deletions quickjs.c
Original file line number Diff line number Diff line change
Expand Up @@ -48018,6 +48018,34 @@ static JSValue js_promise_withResolvers(JSContext *ctx, JSValue this_val,
return obj;
}

static JSValue js_promise_try(JSContext *ctx, JSValue this_val,
int argc, JSValue *argv)
{
JSValue result_promise, resolving_funcs[2], ret, ret2;
BOOL is_reject = 0;

if (!JS_IsObject(this_val))
return JS_ThrowTypeErrorNotAnObject(ctx);
result_promise = js_new_promise_capability(ctx, resolving_funcs, this_val);
if (JS_IsException(result_promise))
return result_promise;
ret = JS_Call(ctx, argv[0], JS_UNDEFINED, argc - 1, argv + 1);
if (JS_IsException(ret)) {
is_reject = 1;
ret = JS_GetException(ctx);
}
ret2 = JS_Call(ctx, resolving_funcs[is_reject], JS_UNDEFINED, 1, &ret);
JS_FreeValue(ctx, resolving_funcs[0]);
JS_FreeValue(ctx, resolving_funcs[1]);
JS_FreeValue(ctx, ret);
if (JS_IsException(ret2)) {
JS_FreeValue(ctx, result_promise);
return ret2;
}
JS_FreeValue(ctx, ret2);
return result_promise;
}

static __exception int remainingElementsCount_add(JSContext *ctx,
JSValue resolve_element_env,
int addend)
Expand Down Expand Up @@ -48505,6 +48533,7 @@ static const JSCFunctionListEntry js_promise_funcs[] = {
JS_CFUNC_MAGIC_DEF("all", 1, js_promise_all, PROMISE_MAGIC_all ),
JS_CFUNC_MAGIC_DEF("allSettled", 1, js_promise_all, PROMISE_MAGIC_allSettled ),
JS_CFUNC_MAGIC_DEF("any", 1, js_promise_all, PROMISE_MAGIC_any ),
JS_CFUNC_DEF("try", 1, js_promise_try ),
JS_CFUNC_DEF("race", 1, js_promise_race ),
JS_CFUNC_DEF("withResolvers", 0, js_promise_withResolvers ),
JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL),
Expand Down
2 changes: 1 addition & 1 deletion test262.conf
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Object.is
optional-catch-binding
optional-chaining
Promise
promise-try=skip
promise-try
promise-with-resolvers
Promise.allSettled
Promise.any
Expand Down