Skip to content

DRY "is function?" type checks #1159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2025
Merged

DRY "is function?" type checks #1159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 7 additions & 9 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41531,11 +41531,10 @@ static JSValue js_array_toSorted(JSContext *ctx, JSValueConst this_val,
JSObject *p;
int64_t i, len;
uint32_t count32;
int ok;

ok = JS_IsUndefined(argv[0]) || JS_IsFunction(ctx, argv[0]);
if (!ok)
return JS_ThrowTypeErrorNotAFunction(ctx);
if (!JS_IsUndefined(argv[0]))
if (check_function(ctx, argv[0]))
return JS_EXCEPTION;

ret = JS_EXCEPTION;
arr = JS_UNDEFINED;
Expand Down Expand Up @@ -49069,8 +49068,8 @@ static JSValue js_map_getOrInsert(JSContext *ctx, JSValueConst this_val,

if (!s)
return JS_EXCEPTION;
if (computed && !JS_IsFunction(ctx, argv[1]))
return JS_ThrowTypeError(ctx, "not a function");
if (computed && check_function(ctx, argv[1]))
return JS_EXCEPTION;
key = map_normalize_key_const(ctx, argv[0]);
if (s->is_weak && !is_valid_weakref_target(key))
return JS_ThrowTypeError(ctx, "invalid value used as WeakMap key");
Expand Down Expand Up @@ -57436,9 +57435,8 @@ static JSValue js_finrec_constructor(JSContext *ctx, JSValueConst new_target,
if (JS_IsUndefined(new_target))
return JS_ThrowTypeError(ctx, "constructor requires 'new'");
JSValueConst cb = argv[0];
if (!JS_IsFunction(ctx, cb))
return JS_ThrowTypeError(ctx, "argument must be a function");

if (check_function(ctx, cb))
return JS_EXCEPTION;
JSValue obj = js_create_from_ctor(ctx, new_target, JS_CLASS_FINALIZATION_REGISTRY);
if (JS_IsException(obj))
return JS_EXCEPTION;
Expand Down
Loading