Move build-time deps to src, remove wrappers

Author: andrjohns

R/JSContext.R

@@ -109,13 +109,15 @@ get <- NULL
 assign <- NULL
 
 new_JSContext <- function(stack_size = NULL) {
-  stack_size_int = ifelse(is.null(stack_size), -1, stack_size)
-  ContextList = list(
-    runtime_context_ptr = qjs_context(stack_size_int)
+  stack_size_int <- ifelse(is.null(stack_size), -1, stack_size)
+  rt_and_ctx <- qjs_context(stack_size_int)
+  ContextList <- list(
+    runtime = rt_and_ctx$runtime_ptr,
+    context = rt_and_ctx$context_ptr
   )
 
   ContextList$validate <- function(code_string) {
-    qjs_validate(ContextList$runtime_context_ptr, code_string)
+    qjs_validate(ContextList$context, code_string)
   }
 
   ContextList$source <- function(file = NULL, code = NULL) {
@@ -125,10 +127,10 @@ new_JSContext <- function(stack_size = NULL) {
         warning("Both a filepath and code string cannot be provided,",
                 " code will be ignored!", call. = FALSE)
       }
-      eval_success <- qjs_source(ContextList$runtime_context_ptr,
+      eval_success <- qjs_source(ContextList$context,
                                   input = normalizePath(file), is_file = TRUE)
     } else if (!is.null(code)) {
-      eval_success <- qjs_source(ContextList$runtime_context_ptr, input = code, is_file = FALSE)
+      eval_success <- qjs_source(ContextList$context, input = code, is_file = FALSE)
     } else {
       stop("No JS code provided!", call. = FALSE)
     }
@@ -139,13 +141,13 @@ new_JSContext <- function(stack_size = NULL) {
     invisible(NULL)
   }
   ContextList$call <- function(function_name, ...) {
-    qjs_call(ContextList$runtime_context_ptr, function_name, ...)
+    qjs_call(ContextList$context, function_name, ...)
   }
   ContextList$get <- function(var_name) {
-    qjs_get(ContextList$runtime_context_ptr, var_name)
+    qjs_get(ContextList$context, var_name)
   }
   ContextList$assign <- function(var_name, value) {
-    qjs_assign(ContextList$runtime_context_ptr, var_name, value)
+    qjs_assign(ContextList$context, var_name, value)
   }
   structure(
     class = "JSContext",

inst/include/quickjsr/JS_Containers.hpp

@@ -1,17 +1,17 @@
-PKG_CPPFLAGS = -I"../inst/include/" -I"quickjs" -D_GNU_SOURCE
+PKG_CPPFLAGS = -I"include" -I"quickjs" -D_GNU_SOURCE
 PKG_LIBS = libquickjs.o
 
 ifeq ($(OS),Windows_NT)
-  DLL := .dll
+	DLL := .dll
 else
 	DLL := .so
 endif
 
 ifdef R_HOME
-  R_CC := $(shell $(R_HOME)/bin$(R_ARCH_BIN)/R CMD config CC)
-  R_CXX := $(shell $(R_HOME)/bin$(R_ARCH_BIN)/R CMD config CXX)
+	R_CC := $(shell $(R_HOME)/bin$(R_ARCH_BIN)/R CMD config CC)
+	R_CXX := $(shell $(R_HOME)/bin$(R_ARCH_BIN)/R CMD config CXX)
 else
-  R_CC := $(CC)
+	R_CC := $(CC)
 	R_CXX := $(CXX)
 endif