Testing quickjs-ng as base (#57)

* Migrate to QJS-ng base * Pedantic branch * More compat * More compat * Disable R36, fix R API NOTE
andrjohns · Jun 22, 2024 · 75b3f89 · 75b3f89
1 parent a7e1b1b
commit 75b3f89
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 46 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -29,7 +29,7 @@ jobs:
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
           - {os: ubuntu-latest,   r: 'oldrel'}
-          - {os: ubuntu-latest,   r: '3.6'}
+#          - {os: ubuntu-latest,   r: '3.6'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "src/quickjs"]
 	path = src/quickjs
-	url = https://github.com/andrjohns/quickjs
-  branch = wpedantic-compat
+	url = https://github.com/andrjohns/quickjs-ng
+  branch = v0.5.0-pedantic
diff --git a/R/qjs.R b/R/qjs.R
@@ -69,3 +69,11 @@ to_json <- function(arg, auto_unbox = FALSE) {
 from_json <- function(json) {
   .Call(`from_json_`, json)
 }
+
+#' Get the version of the bundled QuickJS library
+#'
+#' @return Character string of the version of the bundled QuickJS library
+#' @export
+quickjs_version <- function() {
+  .Call(`qjs_version_`)
+}
diff --git a/R/utils.R b/R/utils.R
@@ -1,12 +1,3 @@
-#' Get the version of the bundled QuickJS library
-#'
-#' @return Character string of the version of the bundled QuickJS library
-#' @export
-quickjs_version <- function() {
-  version_file <- system.file("VERSION", package = "QuickJSR", mustWork = TRUE)
-  readLines(version_file)
-}
-
 get_tz_offset_seconds <- function() {
   as.POSIXlt(Sys.time())$gmtoff
 }
diff --git a/inst/include/cpp11/environment.hpp b/inst/include/cpp11/environment.hpp
@@ -36,7 +36,7 @@ class environment {
       safe[Rf_defineVar](name_, as_sexp(value), parent_);
       return *this;
     }
-    operator SEXP() const { return safe[Rf_findVarInFrame3](parent_, name_, TRUE); };
+    operator SEXP() const { return safe[Rf_findVarInFrame](parent_, name_); };
     operator sexp() const { return SEXP(); };
   };
 
@@ -48,8 +48,7 @@ class environment {
   proxy operator[](const std::string& name) const { return operator[](name.c_str()); }
 
   bool exists(SEXP name) const {
-    SEXP res = safe[Rf_findVarInFrame3](env_, name, FALSE);
-    return res != R_UnboundValue;
+    return safe[R_existsVarInFrame](env_, name);
   }
   bool exists(const char* name) const { return exists(safe[Rf_install](name)); }
 

diff --git a/inst/include/quickjs_helpers.hpp b/inst/include/quickjs_helpers.hpp
@@ -69,11 +69,6 @@ namespace quickjsr {
         return NULL;
     }
 
-    JS_AddIntrinsicBigFloat(ctx);
-    JS_AddIntrinsicBigDecimal(ctx);
-    JS_AddIntrinsicOperators(ctx);
-    JS_EnableBignumExt(ctx, TRUE);
-
     /* system modules */
     js_init_module_std(ctx, "std");
     js_init_module_os(ctx, "os");

diff --git a/inst/include/quickjsr/JSValue_Date.hpp b/inst/include/quickjsr/JSValue_Date.hpp
@@ -30,26 +30,6 @@ inline bool JS_IsDate(JSContext* ctx, const JSValue& val) {
   return isDate;
 }
 
-inline JSValue JS_NewDate(JSContext* ctx, double timestamp, bool posixct = false) {
-  static constexpr double milliseconds_day = 86400000;
-  static constexpr double milliseconds_second = 1000;
-  double tz_offset_seconds = get_tz_offset_seconds();
-  JSValue global_obj = JS_GetGlobalObject(ctx);
-  JSValue date_ctor = JS_GetPropertyStr(ctx, global_obj, "Date");
-  JSValue timestamp_val;
-  if (posixct) {
-    timestamp_val = JS_NewFloat64(ctx, (timestamp + tz_offset_seconds) * milliseconds_second);
-  } else {
-    timestamp_val = JS_NewFloat64(ctx, timestamp * milliseconds_day);
-  }
-  JSValue date = JS_CallConstructor(ctx, date_ctor, 1, &timestamp_val);
-
-  JS_FreeValue(ctx, global_obj);
-  JS_FreeValue(ctx, date_ctor);
-  JS_FreeValue(ctx, timestamp_val);
-  return date;
-}
-
 inline JSValue JS_GetTime(JSContext* ctx, const JSValue& val) {
   JSAtom timeAtom = JS_NewAtom(ctx, "getTime");
   JSValue timeVal = JS_Invoke(ctx, val, timeAtom, 0, NULL);

diff --git a/inst/include/quickjsr/SEXP_to_JSValue.hpp b/inst/include/quickjsr/SEXP_to_JSValue.hpp
@@ -145,9 +145,12 @@ namespace quickjsr {
       }
       case REALSXP: {
         if (Rf_inherits(x, "POSIXct")) {
-          return JS_NewDate(ctx, REAL_ELT(x, index), true);
+          static constexpr double milliseconds_second = 1000;
+          double tz_offset_seconds = get_tz_offset_seconds();
+          return JS_NewDate(ctx, (REAL_ELT(x, index) + tz_offset_seconds) * milliseconds_second);
         } else if (Rf_inherits(x, "Date")) {
-          return JS_NewDate(ctx, REAL_ELT(x, index));
+          static constexpr double milliseconds_day = 86400000;
+          return JS_NewDate(ctx, REAL_ELT(x, index) * milliseconds_day);
         } else {
           return JS_NewFloat64(ctx, REAL_ELT(x, index));
         }

diff --git a/src/Makevars b/src/Makevars
@@ -1,6 +1,5 @@
 PKG_CPPFLAGS = -I"../inst/include/" -I"../inst/include/quickjs"
 PKG_CPPFLAGS += -D_GNU_SOURCE -DCONFIG_BIGNUM
-PKG_CPPFLAGS += -DCONFIG_VERSION=\"$(shell cat quickjs/VERSION)\"
 PKG_LIBS = ../inst/lib/$(R_ARCH)/libquickjs.a
 
 ifeq ($(OS),Windows_NT)
@@ -48,7 +47,7 @@ endif
 QUICKJS_C_FILES = cutils.c libbf.c libregexp.c libunicode.c quickjs.c quickjs-libc.c
 QUICKJS_C_HEADERS = $(QUICKJS_C_FILES:.c=.h) \
 					libregexp-opcode.h libunicode-table.h list.h \
-					quickjs-atom.h quickjs-opcode.h
+					quickjs-atom.h quickjs-opcode.h quickjs-c-atomics.h
 
 QUICKJS_SOURCES = $(QUICKJS_C_FILES:%=quickjs/%)
 QUICKJS_OBJECTS = $(QUICKJS_SOURCES:.c=.o)
@@ -65,7 +64,6 @@ $(SHLIB): build-static
 package-quickjs:
 	@mkdir -p ../inst/include/quickjs
 	@cp $(QUICKJS_C_HEADERS:%=quickjs/%) ../inst/include/quickjs
-	@cp quickjs/VERSION ../inst/
 
 build-static: $(QUICKJS_OBJECTS)
 	@mkdir -p ../inst/lib/$(R_ARCH)

diff --git a/src/init.cpp b/src/init.cpp
@@ -14,6 +14,7 @@ extern "C" {
   SEXP qjs_eval_(SEXP eval_string_);
   SEXP to_json_(SEXP arg_, SEXP auto_unbox_);
   SEXP from_json_(SEXP json_);
+  SEXP qjs_version_();
 
 
   static const R_CallMethodDef CallEntries[] = {
@@ -26,6 +27,7 @@ extern "C" {
     {"qjs_assign_",   (DL_FUNC) &qjs_assign_,   3},
     {"to_json_", (DL_FUNC) &to_json_, 2},
     {"from_json_", (DL_FUNC) &from_json_, 1},
+    {"qjs_version_", (DL_FUNC) &qjs_version_, 0},
     {NULL, NULL, 0}
   };
 

diff --git a/src/quickjs b/src/quickjs
diff --git a/src/quickjsr.cpp b/src/quickjsr.cpp
@@ -170,3 +170,9 @@ extern "C" SEXP from_json_(SEXP json_) {
   return rtn;
   END_CPP11
 }
+
+extern "C" SEXP qjs_version_() {
+  BEGIN_CPP11
+  return cpp11::as_sexp(JS_GetVersion());
+  END_CPP11
+}