github_mirrors/quickjs
3
0
Fork 1
mirror of https://github.com/bellard/quickjs.git synced 2025-09-27 05:38:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

removed function cast warnings (initial patch by saghul)

Browse Source
This commit is contained in:
Fabrice Bellard 2025-08-27 15:16:52 +02:00
parent 5689f30cd0
commit 0b3c73ed9c
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
quickjs.c
View File

@ -16199,6 +16199,7 @@ static __exception int js_append_enumerate(JSContext *ctx, JSValue *sp)
int is_array_iterator; int is_array_iterator;
JSValue *arrp; JSValue *arrp;
uint32_t i, count32, pos; uint32_t i, count32, pos;
JSCFunctionType ft;
if (JS_VALUE_GET_TAG(sp[-2]) != JS_TAG_INT) { if (JS_VALUE_GET_TAG(sp[-2]) != JS_TAG_INT) {
JS_ThrowInternalError(ctx, "invalid index for append"); JS_ThrowInternalError(ctx, "invalid index for append");
@ -16216,8 +16217,8 @@ static __exception int js_append_enumerate(JSContext *ctx, JSValue *sp)
iterator = JS_GetProperty(ctx, sp[-1], JS_ATOM_Symbol_iterator); iterator = JS_GetProperty(ctx, sp[-1], JS_ATOM_Symbol_iterator);
if (JS_IsException(iterator)) if (JS_IsException(iterator))
return -1; return -1;
is_array_iterator = JS_IsCFunction(ctx, iterator, ft.generic_magic = js_create_array_iterator;
(JSCFunction *)js_create_array_iterator, is_array_iterator = JS_IsCFunction(ctx, iterator, ft.generic,
JS_ITERATOR_KIND_VALUE); JS_ITERATOR_KIND_VALUE);
JS_FreeValue(ctx, iterator); JS_FreeValue(ctx, iterator);
@ -16229,8 +16230,10 @@ static __exception int js_append_enumerate(JSContext *ctx, JSValue *sp)
JS_FreeValue(ctx, enumobj); JS_FreeValue(ctx, enumobj);
return -1; return -1;
} }
ft.iterator_next = js_array_iterator_next;
if (is_array_iterator if (is_array_iterator
&& JS_IsCFunction(ctx, method, (JSCFunction *)js_array_iterator_next, 0) && JS_IsCFunction(ctx, method, ft.generic, 0)
&& js_get_fast_array(ctx, sp[-1], &arrp, &count32)) { && js_get_fast_array(ctx, sp[-1], &arrp, &count32)) {
uint32_t len; uint32_t len;
if (js_get_length32(ctx, &len, sp[-1])) if (js_get_length32(ctx, &len, sp[-1]))
@ -50639,6 +50642,7 @@ void JS_AddIntrinsicPromise(JSContext *ctx)
{ {
JSRuntime *rt = ctx->rt; JSRuntime *rt = ctx->rt;
JSValue obj1; JSValue obj1;
JSCFunctionType ft;
if (!JS_IsRegisteredClass(rt, JS_CLASS_PROMISE)) { if (!JS_IsRegisteredClass(rt, JS_CLASS_PROMISE)) {
init_class_range(rt, js_async_class_def, JS_CLASS_PROMISE, init_class_range(rt, js_async_class_def, JS_CLASS_PROMISE,
@ -50667,7 +50671,8 @@ void JS_AddIntrinsicPromise(JSContext *ctx)
/* AsyncFunction */ /* AsyncFunction */
ctx->class_proto[JS_CLASS_ASYNC_FUNCTION] = JS_NewObjectProto(ctx, ctx->function_proto); ctx->class_proto[JS_CLASS_ASYNC_FUNCTION] = JS_NewObjectProto(ctx, ctx->function_proto);
obj1 = JS_NewCFunction3(ctx, (JSCFunction *)js_function_constructor, ft.generic_magic = js_function_constructor;
obj1 = JS_NewCFunction3(ctx, ft.generic,
"AsyncFunction", 1, "AsyncFunction", 1,
JS_CFUNC_constructor_or_func_magic, JS_FUNC_ASYNC, JS_CFUNC_constructor_or_func_magic, JS_FUNC_ASYNC,
ctx->function_ctor); ctx->function_ctor);
@ -50703,7 +50708,8 @@ void JS_AddIntrinsicPromise(JSContext *ctx)
/* AsyncGeneratorFunction */ /* AsyncGeneratorFunction */
ctx->class_proto[JS_CLASS_ASYNC_GENERATOR_FUNCTION] = ctx->class_proto[JS_CLASS_ASYNC_GENERATOR_FUNCTION] =
JS_NewObjectProto(ctx, ctx->function_proto); JS_NewObjectProto(ctx, ctx->function_proto);
obj1 = JS_NewCFunction3(ctx, (JSCFunction *)js_function_constructor, ft.generic_magic = js_function_constructor;
obj1 = JS_NewCFunction3(ctx, ft.generic,
"AsyncGeneratorFunction", 1, "AsyncGeneratorFunction", 1,
JS_CFUNC_constructor_or_func_magic, JS_CFUNC_constructor_or_func_magic,
JS_FUNC_ASYNC_GENERATOR, JS_FUNC_ASYNC_GENERATOR,
@ -52427,6 +52433,7 @@ void JS_AddIntrinsicBaseObjects(JSContext *ctx)
int i; int i;
JSValueConst obj, number_obj; JSValueConst obj, number_obj;
JSValue obj1; JSValue obj1;
JSCFunctionType ft;
ctx->throw_type_error = JS_NewCFunction(ctx, js_throw_type_error, NULL, 0); ctx->throw_type_error = JS_NewCFunction(ctx, js_throw_type_error, NULL, 0);
@ -52467,7 +52474,7 @@ void JS_AddIntrinsicBaseObjects(JSContext *ctx)
JS_SetPropertyFunctionList(ctx, obj1, js_error_funcs, countof(js_error_funcs)); JS_SetPropertyFunctionList(ctx, obj1, js_error_funcs, countof(js_error_funcs));
/* Used to squelch a -Wcast-function-type warning. */ /* Used to squelch a -Wcast-function-type warning. */
JSCFunctionType ft = { .generic_magic = js_error_constructor }; ft.generic_magic = js_error_constructor;
for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) { for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) {
JSValue func_obj; JSValue func_obj;
int n_args; int n_args;
@ -52610,7 +52617,8 @@ void JS_AddIntrinsicBaseObjects(JSContext *ctx)
countof(js_generator_proto_funcs)); countof(js_generator_proto_funcs));
ctx->class_proto[JS_CLASS_GENERATOR_FUNCTION] = JS_NewObjectProto(ctx, ctx->function_proto); ctx->class_proto[JS_CLASS_GENERATOR_FUNCTION] = JS_NewObjectProto(ctx, ctx->function_proto);
obj1 = JS_NewCFunction3(ctx, (JSCFunction *)js_function_constructor, ft.generic_magic = js_function_constructor;
obj1 = JS_NewCFunction3(ctx, ft.generic,
"GeneratorFunction", 1, "GeneratorFunction", 1,
JS_CFUNC_constructor_or_func_magic, JS_FUNC_GENERATOR, JS_CFUNC_constructor_or_func_magic, JS_FUNC_GENERATOR,
ctx->function_ctor); ctx->function_ctor);

4
quickjs.h
View File

@ -1049,7 +1049,9 @@ static inline JSValue JS_NewCFunctionMagic(JSContext *ctx, JSCFunctionMagic *fun
const char *name, const char *name,
int length, JSCFunctionEnum cproto, int magic) int length, JSCFunctionEnum cproto, int magic)
{ {
return JS_NewCFunction2(ctx, (JSCFunction *)func, name, length, cproto, magic); /* Used to squelch a -Wcast-function-type warning. */
JSCFunctionType ft = { .generic_magic = func };
return JS_NewCFunction2(ctx, ft.generic, name, length, cproto, magic);
} }
void JS_SetConstructor(JSContext *ctx, JSValueConst func_obj, void JS_SetConstructor(JSContext *ctx, JSValueConst func_obj,
JSValueConst proto); JSValueConst proto);