Skip to content
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

Jump to bottom

portability: global structs cant be statically initialized with external symbols #3

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

portability: global structs cant be statically initialized with external symbols #3

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
21 changes: 18 additions & 3 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42193,14 +42193,29 @@ static JSValue js_math_random(JSContext *ctx, JSValueConst this_val,
return __JS_NewFloat64(ctx, u.d - 1.0);
}
trufae marked this conversation as resolved.
Show resolved Hide resolved

static double qjs_ceil(double x)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking closer at the QuickJS style, it looks like we should fix two inconsistencies here:

  • namespace these like the other functions here, e.g. js_math_ceil() instead of qjs_ceil()
  • make sure the function definitions are in the same order here as they are down in js_math_funcs

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uhm not really. the js_* functions are javascript functions. what im wrapping here is libc functions

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh well. seems like js_math is also used to wrap c functions. so its a bit inconsistent. but ill follow their inconsistency

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually the convnetion is just prefix them with js_ because the direct calls are accessed thru the f_f and f_f_f functions and those are the ones that handle the js context instead

{
return ceil(x);
}

static double qjs_floor(double x)
{
return floor(x);
}

static double qjs_sqrt(double x)
{
return sqrt(x);
}

static const JSCFunctionListEntry js_math_funcs[] = {
JS_CFUNC_MAGIC_DEF("min", 2, js_math_min_max, 0 ),
JS_CFUNC_MAGIC_DEF("max", 2, js_math_min_max, 1 ),
JS_CFUNC_SPECIAL_DEF("abs", 1, f_f, fabs ),
JS_CFUNC_SPECIAL_DEF("floor", 1, f_f, floor ),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry just noticed one thing that I missed last time 😓 Is there a reason floor() and ceil() are wrapped but not fabs(), acos(), etc.?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the compiler didnt complained about those.. for some unknown reason

JS_CFUNC_SPECIAL_DEF("ceil", 1, f_f, ceil ),
JS_CFUNC_SPECIAL_DEF("floor", 1, f_f, qjs_floor ),
JS_CFUNC_SPECIAL_DEF("ceil", 1, f_f, qjs_ceil ),
JS_CFUNC_SPECIAL_DEF("round", 1, f_f, js_math_round ),
JS_CFUNC_SPECIAL_DEF("sqrt", 1, f_f, sqrt ),
JS_CFUNC_SPECIAL_DEF("sqrt", 1, f_f, qjs_sqrt ),

JS_CFUNC_SPECIAL_DEF("acos", 1, f_f, acos ),
JS_CFUNC_SPECIAL_DEF("asin", 1, f_f, asin ),
Expand Down