Update doc

andrjohns · Oct 15, 2023 · f291e9c · f291e9c
1 parent 05fefd1
commit f291e9c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 45 deletions.
diff --git a/R/JSContext.R b/R/JSContext.R
@@ -53,12 +53,13 @@ JSContext <- R6::R6Class(
           warning("Both a filepath and code string cannot be provided,",
                   " code will be ignored!", call. = FALSE)
         }
-        eval_success <- qjs_source_file(private$context_, file)
+        code_string <- paste0(readLines(con = file), collapse = "\n")
       } else if (!is.null(code)) {
-        eval_success <- qjs_source(private$context_, code)
+        code_string <- code
       } else {
         stop("No JS code provided!", call. = FALSE)
       }
+      eval_success <- qjs_source(private$context_, code_string)
       if (!eval_success) {
         stop("Evaluating JS code failed, see message above!", call. = FALSE)
       }

diff --git a/R/qjs.R b/R/qjs.R
@@ -28,10 +28,6 @@ qjs_source <- function(ctx_ptr, code_string) {
   .Call(`qjs_source_`, ctx_ptr, code_string)
 }
 
-qjs_source_file <- function(ctx_ptr, filename) {
-  .Call(`qjs_source_file_`, ctx_ptr, filename)
-}
-
 qjs_call <- function(ctx_ptr, function_name, args_json) {
   parse_return(.Call(`qjs_call_`, ctx_ptr, function_name, args_json))
 }

diff --git a/man/JSContext.Rd b/man/JSContext.Rd
diff --git a/src/init.cpp b/src/init.cpp
@@ -13,7 +13,6 @@ extern "C"  {
 
 SEXP qjs_context_(SEXP stack_size_);
 SEXP qjs_source_(SEXP ctx_ptr_, SEXP code_string_);
-SEXP qjs_source_file_(SEXP ctx_ptr_, SEXP filename_);
 SEXP qjs_validate_(SEXP ctx_ptr_, SEXP function_name_);
 SEXP qjs_call_(SEXP ctx_ptr_, SEXP function_name_, SEXP args_json_);
 SEXP qjs_eval_(SEXP eval_string_);
@@ -28,7 +27,6 @@ SEXP qjs_eval_(SEXP eval_string_);
 static const R_CallMethodDef CallEntries[] = {
   CALLDEF(qjs_context_, 1),
   CALLDEF(qjs_source_, 2),
-  CALLDEF(qjs_source_file_, 2),
   CALLDEF(qjs_validate_, 2),
   CALLDEF(qjs_call_, 3),
   CALLDEF(qjs_eval_, 1),

diff --git a/src/qjs.cpp b/src/qjs.cpp
@@ -21,7 +21,6 @@ extern "C" {
   void js_std_add_helpers(JSContext *ctx, int argc, char **argv);
 
   bool qjs_source_impl(JSContext* ctx, const char* code_string);
-  bool qjs_source_file_impl(JSContext* ctx, const char* code_string);
   bool qjs_validate_impl(JSContext* ctx, const char* function_name);
   const char* qjs_call_impl(JSContext* ctx, const char* wrapped_name,
                         const char* call_wrapper, const char* args_json);
@@ -52,14 +51,6 @@ RcppExport SEXP qjs_context_(SEXP stack_size_) {
   );
 }
 
-RcppExport SEXP qjs_source_file_(SEXP ctx_ptr_, SEXP filename_) {
-  JSContext* ctx = ContextXPtr(ctx_ptr_);
-  const char* filename = Rcpp::as<const char*>(filename_);
-  bool succeeded = qjs_source_file_impl(ctx, filename);
-
-  return Rcpp::wrap(succeeded);
-}
-
 RcppExport SEXP qjs_source_(SEXP ctx_ptr_, SEXP code_string_) {
   JSContext* ctx = ContextXPtr(ctx_ptr_);
   const char* code_string = Rcpp::as<const char*>(code_string_);

diff --git a/src/qjs_impl.c b/src/qjs_impl.c
@@ -2,28 +2,6 @@
 #include <stdbool.h>
 #include <string.h>
 
-bool qjs_source_file_impl(JSContext* ctx, const char* filename) {
-  uint8_t *buf;
-  size_t buf_len;
-  buf = js_load_file(ctx, &buf_len, filename);
-  if (!buf) {
-    JS_ThrowReferenceError(ctx, "could not load '%s'", filename);
-    js_std_dump_error(ctx);
-    js_free(ctx, buf);
-    return false;
-  }
-  JSValue val = JS_Eval(ctx, (char *)buf, buf_len, filename,
-                JS_EVAL_TYPE_GLOBAL);
-  js_free(ctx, buf);
-  bool failed = JS_IsException(val);
-  if (failed) {
-    js_std_dump_error(ctx);
-  }
-  JS_FreeValue(ctx, val);
-
-  return !failed;
-}
-
 bool qjs_source_impl(JSContext* ctx, const char* code_string) {
   JSValue val = JS_Eval(ctx, code_string, strlen(code_string), "", 0);
   bool failed = JS_IsException(val);