From 21f887ca0cbba9efb1738b163d2e84b61bd74ec2 Mon Sep 17 00:00:00 2001
From: hmsk <k.hamasaki@gmail.com>
Date: Wed, 19 Jun 2024 07:33:37 -0700
Subject: [PATCH] support returning float
---
ext/quickjsrb/quickjsrb.c | 13 ++++++++++---
test/quickjs_test.rb | 5 +++++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ext/quickjsrb/quickjsrb.c b/ext/quickjsrb/quickjsrb.c
index 7bdaff0..7953450 100644
--- a/ext/quickjsrb/quickjsrb.c
+++ b/ext/quickjsrb/quickjsrb.c
@@ -49,7 +49,6 @@ VALUE rb_module_eval_js_code(
JSValue res = JS_Eval(ctx, code, strlen(code), "<code>", JS_EVAL_TYPE_GLOBAL);
VALUE result;
- int r = 0;
if (JS_IsException(res)) {
rb_raise(rb_eRuntimeError, "Something happened by evaluating as JavaScript code");
result = Qnil;
@@ -71,8 +70,16 @@ VALUE rb_module_eval_js_code(
} else if (JS_VALUE_IS_NAN(res)) {
result = ID2SYM(rb_intern(nanId));
} else if (JS_IsNumber(res)) {
- JS_ToInt32(ctx, &r, res);
- result = INT2NUM(r);
+ int tag = JS_VALUE_GET_TAG(res);
+ if (JS_TAG_IS_FLOAT64(tag)) {
+ double double_res;
+ JS_ToFloat64(ctx, &double_res, res);
+ result = DBL2NUM(double_res);
+ } else {
+ int int_res;
+ JS_ToInt32(ctx, &int_res, res);
+ result = INT2NUM(int_res);
+ }
} else if (JS_IsString(res)) {
JSValue maybeString = JS_ToString(ctx, res);
const char *msg = JS_ToCString(ctx, maybeString);
diff --git a/test/quickjs_test.rb b/test/quickjs_test.rb
index e643f99..d265208 100644
--- a/test/quickjs_test.rb
+++ b/test/quickjs_test.rb
@@ -38,6 +38,11 @@ class QuickjsTest < Test::Unit::TestCase
assert_equal(::Quickjs.evalCode("const func = () => 8; func();"), 8)
end
+ test "support returning float" do
+ assert_equal(::Quickjs.evalCode("1.0"), 1.0)
+ assert_equal(::Quickjs.evalCode("2 ** 0.5"), 1.4142135623730951)
+ end
+
test "support returning boolean" do
assert_equal(::Quickjs.evalCode("false"), false)
assert_equal(::Quickjs.evalCode("true"), true)