Skip to content

Commit

Permalink
Tidy extern C usage (#69)
Browse files Browse the repository at this point in the history 
* Tidy extern C usage

* Spacing
  • Loading branch information
@andrjohns
andrjohns authored Jul 11, 2024
1 parent aaa18b9 commit d1ca06d
Show file tree
Hide file tree
Showing 2 changed files with 147 additions and 152 deletions.
25 changes: 9 additions & 16 deletions src/init.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#include <cpp11.hpp>
#include <Rinternals.h>
#include <R_ext/Visibility.h>

#ifdef __cplusplus
extern "C" {
#endif

SEXP qjs_context_(SEXP stack_size_);
SEXP qjs_source_(SEXP ctx_ptr_, SEXP input_, SEXP is_file_);
SEXP qjs_validate_(SEXP ctx_ptr_, SEXP code_string_);
Expand All @@ -16,7 +13,6 @@ extern "C" {
SEXP from_json_(SEXP json_);
SEXP qjs_version_();


static const R_CallMethodDef CallEntries[] = {
{"qjs_call_", (DL_FUNC) &qjs_call_, 3},
{"qjs_context_", (DL_FUNC) &qjs_context_, 1},
Expand All @@ -25,18 +21,15 @@ extern "C" {
{"qjs_validate_", (DL_FUNC) &qjs_validate_, 2},
{"qjs_get_", (DL_FUNC) &qjs_get_, 2},
{"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},
{"to_json_", (DL_FUNC) &to_json_, 2},
{"from_json_", (DL_FUNC) &from_json_, 1},
{"qjs_version_", (DL_FUNC) &qjs_version_, 0},
{NULL, NULL, 0}
};

#ifdef __cplusplus
}
#endif

extern "C" attribute_visible void R_init_QuickJSR(DllInfo* dll){
R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
R_useDynamicSymbols(dll, FALSE);
R_forceSymbols(dll, TRUE);
attribute_visible void R_init_QuickJSR(DllInfo* dll){
R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
R_useDynamicSymbols(dll, FALSE);
R_forceSymbols(dll, TRUE);
}
}
274 changes: 138 additions & 136 deletions src/quickjsr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,166 +13,168 @@ void JS_FreeRuntimeStdHandlers(JSRuntime* rt) {
using ContextXPtr = cpp11::external_pointer<JSContext, JS_FreeContext>;
using RuntimeXPtr = cpp11::external_pointer<JSRuntime, JS_FreeRuntimeStdHandlers>;

extern "C" SEXP qjs_context_(SEXP stack_size_) {
BEGIN_CPP11
int stack_size = cpp11::as_cpp<int>(stack_size_);
extern "C" {
SEXP qjs_context_(SEXP stack_size_) {
BEGIN_CPP11
int stack_size = cpp11::as_cpp<int>(stack_size_);

RuntimeXPtr rt(quickjsr::JS_NewCustomRuntime(stack_size));
ContextXPtr ctx(quickjsr::JS_NewCustomContext(rt.get()));
RuntimeXPtr rt(quickjsr::JS_NewCustomRuntime(stack_size));
ContextXPtr ctx(quickjsr::JS_NewCustomContext(rt.get()));

cpp11::writable::list result;
using cpp11::literals::operator""_nm;
result.push_back({"runtime_ptr"_nm = rt});
result.push_back({"context_ptr"_nm = ctx});
cpp11::writable::list result;
using cpp11::literals::operator""_nm;
result.push_back({"runtime_ptr"_nm = rt});
result.push_back({"context_ptr"_nm = ctx});

return cpp11::as_sexp(result);
END_CPP11
}

extern "C" SEXP qjs_source_(SEXP ctx_ptr_, SEXP input_, SEXP is_file_) {
BEGIN_CPP11
JSContext* ctx = ContextXPtr(ctx_ptr_).get();
int ret;
if (cpp11::as_cpp<bool>(is_file_)) {
const char* input = cpp11::as_cpp<const char*>(input_);
ret = quickjsr::eval_file(ctx, input, -1);
} else {
const char* input = cpp11::as_cpp<const char*>(input_);
ret = quickjsr::eval_buf(ctx, input, strlen(input), "<input>", JS_EVAL_TYPE_GLOBAL);
return cpp11::as_sexp(result);
END_CPP11
}
return cpp11::as_sexp(!ret);
END_CPP11
}

extern "C" SEXP qjs_validate_(SEXP ctx_ptr_, SEXP code_string_) {
BEGIN_CPP11
JSContext* ctx = ContextXPtr(ctx_ptr_).get();
std::string code_string = cpp11::as_cpp<std::string>(code_string_);
JSValue val = JS_Eval(ctx, code_string.c_str(), code_string.size(), "", JS_EVAL_FLAG_COMPILE_ONLY);
bool failed = JS_IsException(val);
JS_FreeValue(ctx, val);
return cpp11::as_sexp(!failed);
END_CPP11
}

extern "C" SEXP qjs_call_(SEXP ctx_ptr_, SEXP fun_name_, SEXP args_list_) {
BEGIN_CPP11
JSContext* ctx = ContextXPtr(ctx_ptr_).get();

int64_t n_args = Rf_xlength(args_list_);
std::vector<JSValue> args(n_args);
for (int64_t i = 0; i < n_args; i++) {
args[i] = quickjsr::SEXP_to_JSValue(ctx, VECTOR_ELT(args_list_, i), true);
SEXP qjs_source_(SEXP ctx_ptr_, SEXP input_, SEXP is_file_) {
BEGIN_CPP11
JSContext* ctx = ContextXPtr(ctx_ptr_).get();
int ret;
if (cpp11::as_cpp<bool>(is_file_)) {
const char* input = cpp11::as_cpp<const char*>(input_);
ret = quickjsr::eval_file(ctx, input, -1);
} else {
const char* input = cpp11::as_cpp<const char*>(input_);
ret = quickjsr::eval_buf(ctx, input, strlen(input), "<input>", JS_EVAL_TYPE_GLOBAL);
}
return cpp11::as_sexp(!ret);
END_CPP11
}

JSValue global = JS_GetGlobalObject(ctx);
JSValue fun = quickjsr::JS_GetPropertyRecursive(ctx, global, Rf_translateCharUTF8(STRING_ELT(fun_name_, 0)));
JSValue result_js = JS_Call(ctx, fun, global, args.size(), args.data());

SEXP result;
if (JS_IsException(result_js)) {
js_std_dump_error(ctx);
result = cpp11::as_sexp("Error!");
} else {
result = quickjsr::JSValue_to_SEXP(ctx, result_js);
SEXP qjs_validate_(SEXP ctx_ptr_, SEXP code_string_) {
BEGIN_CPP11
JSContext* ctx = ContextXPtr(ctx_ptr_).get();
std::string code_string = cpp11::as_cpp<std::string>(code_string_);
JSValue val = JS_Eval(ctx, code_string.c_str(), code_string.size(), "", JS_EVAL_FLAG_COMPILE_ONLY);
bool failed = JS_IsException(val);
JS_FreeValue(ctx, val);
return cpp11::as_sexp(!failed);
END_CPP11
}

JS_FreeValue(ctx, result_js);
for (auto&& arg : args) {
JS_FreeValue(ctx, arg);
SEXP qjs_call_(SEXP ctx_ptr_, SEXP fun_name_, SEXP args_list_) {
BEGIN_CPP11
JSContext* ctx = ContextXPtr(ctx_ptr_).get();

int64_t n_args = Rf_xlength(args_list_);
std::vector<JSValue> args(n_args);
for (int64_t i = 0; i < n_args; i++) {
args[i] = quickjsr::SEXP_to_JSValue(ctx, VECTOR_ELT(args_list_, i), true);
}

JSValue global = JS_GetGlobalObject(ctx);
JSValue fun = quickjsr::JS_GetPropertyRecursive(ctx, global, Rf_translateCharUTF8(STRING_ELT(fun_name_, 0)));
JSValue result_js = JS_Call(ctx, fun, global, args.size(), args.data());

SEXP result;
if (JS_IsException(result_js)) {
js_std_dump_error(ctx);
result = cpp11::as_sexp("Error!");
} else {
result = quickjsr::JSValue_to_SEXP(ctx, result_js);
}

JS_FreeValue(ctx, result_js);
for (auto&& arg : args) {
JS_FreeValue(ctx, arg);
}
JS_FreeValue(ctx, fun);
JS_FreeValue(ctx, global);

return result;
END_CPP11
}
JS_FreeValue(ctx, fun);
JS_FreeValue(ctx, global);

return result;
END_CPP11
}

extern "C" SEXP qjs_get_(SEXP ctx_ptr_, SEXP js_obj_name) {
BEGIN_CPP11
JSContext* ctx = ContextXPtr(ctx_ptr_).get();
JSValue global = JS_GetGlobalObject(ctx);
JSValue result = quickjsr::JS_GetPropertyRecursive(ctx, global, CHAR(STRING_ELT(js_obj_name, 0)));
SEXP rtn = quickjsr::JSValue_to_SEXP(ctx, result);

JS_FreeValue(ctx, result);
JS_FreeValue(ctx, global);
SEXP qjs_get_(SEXP ctx_ptr_, SEXP js_obj_name) {
BEGIN_CPP11
JSContext* ctx = ContextXPtr(ctx_ptr_).get();
JSValue global = JS_GetGlobalObject(ctx);
JSValue result = quickjsr::JS_GetPropertyRecursive(ctx, global, Rf_translateCharUTF8(STRING_ELT(js_obj_name, 0)));
SEXP rtn = quickjsr::JSValue_to_SEXP(ctx, result);

return rtn;
END_CPP11
}
JS_FreeValue(ctx, result);
JS_FreeValue(ctx, global);

extern "C" SEXP qjs_assign_(SEXP ctx_ptr_, SEXP js_obj_name_, SEXP value_) {
BEGIN_CPP11
JSContext* ctx = ContextXPtr(ctx_ptr_).get();
JSValue global = JS_GetGlobalObject(ctx);
JSValue value = quickjsr::SEXP_to_JSValue(ctx, value_, true);
int result = quickjsr::JS_SetPropertyRecursive(ctx, global, CHAR(STRING_ELT(js_obj_name_, 0)), value);
JS_FreeValue(ctx, global);
return rtn;
END_CPP11
}

return cpp11::as_sexp(result);
END_CPP11
}
SEXP qjs_assign_(SEXP ctx_ptr_, SEXP js_obj_name_, SEXP value_) {
BEGIN_CPP11
JSContext* ctx = ContextXPtr(ctx_ptr_).get();
JSValue global = JS_GetGlobalObject(ctx);
JSValue value = quickjsr::SEXP_to_JSValue(ctx, value_, true);
int result = quickjsr::JS_SetPropertyRecursive(ctx, global, Rf_translateCharUTF8(STRING_ELT(js_obj_name_, 0)), value);
JS_FreeValue(ctx, global);

extern "C" SEXP qjs_eval_(SEXP eval_string_) {
BEGIN_CPP11
std::string eval_string = cpp11::as_cpp<std::string>(eval_string_);
JSRuntime* rt = quickjsr::JS_NewCustomRuntime(0);
JSContext* ctx = quickjsr::JS_NewCustomContext(rt);

JSValue val = JS_Eval(ctx, eval_string.c_str(), eval_string.size(), "", 0);
SEXP result;
if (JS_IsException(val)) {
js_std_dump_error(ctx);
result = cpp11::as_sexp("Error!");
} else {
result = quickjsr::JSValue_to_SEXP(ctx, val);
return cpp11::as_sexp(result);
END_CPP11
}

JS_FreeValue(ctx, val);
JS_FreeContext(ctx);
JS_FreeRuntimeStdHandlers(rt);

return result;
END_CPP11
}
SEXP qjs_eval_(SEXP eval_string_) {
BEGIN_CPP11
std::string eval_string = cpp11::as_cpp<std::string>(eval_string_);
JSRuntime* rt = quickjsr::JS_NewCustomRuntime(0);
JSContext* ctx = quickjsr::JS_NewCustomContext(rt);

JSValue val = JS_Eval(ctx, eval_string.c_str(), eval_string.size(), "", 0);
SEXP result;
if (JS_IsException(val)) {
js_std_dump_error(ctx);
result = cpp11::as_sexp("Error!");
} else {
result = quickjsr::JSValue_to_SEXP(ctx, val);
}

JS_FreeValue(ctx, val);
JS_FreeContext(ctx);
JS_FreeRuntimeStdHandlers(rt);

return result;
END_CPP11
}

extern "C" SEXP to_json_(SEXP arg_, SEXP auto_unbox_) {
BEGIN_CPP11
JSRuntime* rt = quickjsr::JS_NewCustomRuntime(0);
JSContext* ctx = quickjsr::JS_NewCustomContext(rt);
SEXP to_json_(SEXP arg_, SEXP auto_unbox_) {
BEGIN_CPP11
JSRuntime* rt = quickjsr::JS_NewCustomRuntime(0);
JSContext* ctx = quickjsr::JS_NewCustomContext(rt);

JSValue arg = quickjsr::SEXP_to_JSValue(ctx, arg_,
cpp11::as_cpp<bool>(auto_unbox_));
std::string result = quickjsr::JSValue_to_JSON(ctx, arg);
JSValue arg = quickjsr::SEXP_to_JSValue(ctx, arg_,
cpp11::as_cpp<bool>(auto_unbox_));
std::string result = quickjsr::JSValue_to_JSON(ctx, arg);

JS_FreeValue(ctx, arg);
JS_FreeContext(ctx);
JS_FreeRuntimeStdHandlers(rt);
JS_FreeValue(ctx, arg);
JS_FreeContext(ctx);
JS_FreeRuntimeStdHandlers(rt);

return cpp11::as_sexp(result);
END_CPP11
}
return cpp11::as_sexp(result);
END_CPP11
}

extern "C" SEXP from_json_(SEXP json_) {
BEGIN_CPP11
JSRuntime* rt = quickjsr::JS_NewCustomRuntime(0);
JSContext* ctx = quickjsr::JS_NewCustomContext(rt);
SEXP from_json_(SEXP json_) {
BEGIN_CPP11
JSRuntime* rt = quickjsr::JS_NewCustomRuntime(0);
JSContext* ctx = quickjsr::JS_NewCustomContext(rt);

std::string json = cpp11::as_cpp<std::string>(json_);
JSValue result = quickjsr::JSON_to_JSValue(ctx, json);
SEXP rtn = quickjsr::JSValue_to_SEXP(ctx, result);
std::string json = cpp11::as_cpp<std::string>(json_);
JSValue result = quickjsr::JSON_to_JSValue(ctx, json);
SEXP rtn = quickjsr::JSValue_to_SEXP(ctx, result);

JS_FreeValue(ctx, result);
JS_FreeContext(ctx);
JS_FreeRuntimeStdHandlers(rt);
JS_FreeValue(ctx, result);
JS_FreeContext(ctx);
JS_FreeRuntimeStdHandlers(rt);

return rtn;
END_CPP11
}
return rtn;
END_CPP11
}

extern "C" SEXP qjs_version_() {
BEGIN_CPP11
return cpp11::as_sexp(JS_GetVersion());
END_CPP11
SEXP qjs_version_() {
BEGIN_CPP11
return cpp11::as_sexp(JS_GetVersion());
END_CPP11
}
}

0 comments on commit d1ca06d

Please sign in to comment.