Skip to content

Add Integer detection when converting from QuickJS to JUCE #1514

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+24 −5
Open

Add Integer detection when converting from QuickJS to JUCE #1514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9d45f2
Better type support in QuickJSToJuce
benkuper Feb 25, 2025
9550c87
fix linux compil, var ambiguity
benkuper Feb 25, 2025
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
10 changes: 8 additions & 2 deletions modules/juce_javascript/choc/javascript/choc_javascript_QuickJS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8912,7 +8912,13 @@ static inline JS_BOOL JS_IsNumber(JSValueConst v)
return tag == JS_TAG_INT || JS_TAG_IS_FLOAT64(tag);
}

static inline JS_BOOL JS_IsBigInt(JSContext *ctx, JSValueConst v)
static inline JS_BOOL JS_IsInteger(JSValueConst v)
{
int tag = JS_VALUE_GET_TAG(v);
return tag == JS_TAG_INT;
}

static inline JS_BOOL JS_IsBigInt(JSValueConst v)
{
int tag = JS_VALUE_GET_TAG(v);
return tag == JS_TAG_BIG_INT;
Expand Down Expand Up @@ -20782,7 +20788,7 @@ inline int JS_ToInt64(JSContext *ctx, int64_t *pres, JSValueConst val)

inline int JS_ToInt64Ext(JSContext *ctx, int64_t *pres, JSValueConst val)
{
if (JS_IsBigInt(ctx, val))
if (JS_IsBigInt(val))
return JS_ToBigInt64(ctx, pres, val);
else
return JS_ToInt64(ctx, pres, val);
Expand Down
19 changes: 16 additions & 3 deletions modules/juce_javascript/detail/juce_QuickJSHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,22 @@ static var tryQuickJSToJuce (const qjs::QuickJSContext::ValuePtr& ptr,

if (JS_IsNumber (ptr.value))
{
double d = 0;
JS_ToFloat64 (ptr.context, std::addressof (d), ptr.value);
return d;
if(JS_IsBigInt(ptr.value))
{
int64_t i = 0;
JS_ToBigInt64 (ptr.context, std::addressof (i), ptr.value);
return var((juce::int64)i);
}if(JS_IsInteger(ptr.value))
{
int32_t i = 0;
JS_ToInt32 (ptr.context, std::addressof (i), ptr.value);
return i;
}
{
double d = 0;
JS_ToFloat64 (ptr.context, std::addressof (d), ptr.value);
return d;
}
}

if (JS_IsBool (ptr.value))
Expand Down