From 4bdcec66a56adc52e782d4c36d8dab46f0db85b7 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Wed, 15 Jun 2016 10:13:49 -0700
Subject: [PATCH] revert R_Interactive to global variable
---
com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c | 6 +++++-
com.oracle.truffle.r.native/fficall/src/jni/variables.c | 6 ------
com.oracle.truffle.r.native/include/Makefile | 4 ++--
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c b/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
index b22fbd7949..0f0ae19055 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
@@ -13,6 +13,7 @@
#include <sys/utsname.h>
#include <rffiutils.h>
#include <R_ext/RStartup.h>
+#include <Rinterface.h>
static JavaVM *javaVM;
@@ -25,6 +26,9 @@ static jclass rStartParamsClass;
int R_running_as_main_program;
int R_SignalHandlers;
+FILE * R_Consolefile;
+FILE * R_Outputfile;
+
typedef jint (JNICALL *JNI_CreateJavaVMFunc)
(JavaVM **pvm, void **penv, void *args);
@@ -190,7 +194,7 @@ void R_set_command_line_arguments(int argc, char **argv) {
int Rf_initEmbeddedR(int argc, char *argv[]) {
Rf_initialize_R(argc, argv);
-// R_Interactive = TRUE;
+ R_Interactive = TRUE;
setup_Rmainloop();
return 1;
}
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/variables.c b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
index d9c9497e38..c872132c31 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/variables.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
@@ -58,12 +58,6 @@ SEXP FASTR_NamespaceRegistry() {
return (*env)->CallStaticObjectMethod(env, CallRFFIHelperClass, getNamespaceRegistryMethodID);
}
-Rboolean FASTR_IsInteractive() {
- JNIEnv *env = getEnv();
- return (*env)->CallStaticIntMethod(env, CallRFFIHelperClass, isInteractiveMethodID);
-}
-
-
void init_variables(JNIEnv *env, jobjectArray initialValues) {
// initialValues is an array of enums
jclass enumClass = (*env)->GetObjectClass(env, (*env)->GetObjectArrayElement(env, initialValues, 0));
diff --git a/com.oracle.truffle.r.native/include/Makefile b/com.oracle.truffle.r.native/include/Makefile
index c65a01a741..b2d1e14b4b 100644
--- a/com.oracle.truffle.r.native/include/Makefile
+++ b/com.oracle.truffle.r.native/include/Makefile
@@ -37,7 +37,7 @@ R_EXT_HEADERS_TO_LINK := $(filter-out $(notdir $(R_EXT_HEADERS_LOCAL)),$(R_EXT_H
R_HEADERS := $(wildcard $(GNUR_HOME)/include/*.h)
R_HEADERS_FILENAMES := $(notdir $(R_HEADERS))
#$(info R_HEADERS_FILENAMES=$(R_HEADERS_FILENAMES))
-R_HEADERS_LOCAL := src/libintl.h src/Rinternals.h src/Rinterface.h
+R_HEADERS_LOCAL := src/libintl.h src/Rinternals.h # src/Rinterface.h
#$(info R_HEADERS_LOCAL=$(R_HEADERS_LOCAL))>
R_HEADERS_TO_LINK := $(filter-out $(notdir $(R_HEADERS_LOCAL)),$(R_HEADERS_FILENAMES))
#$(info R_HEADERS_TO_LINK=$(R_HEADERS_TO_LINK))
@@ -49,7 +49,7 @@ linked: ed_Rinternals ed_Rinterface ed_GraphicsEngine
$(foreach file,$(R_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/$(file) $(file);)
ln -sf src/libintl.h
ed $(GNUR_HOME)/include/Rinternals.h < ed_Rinternals
- ed $(GNUR_HOME)/include/Rinterface.h < ed_Rinterface
+# ed $(GNUR_HOME)/include/Rinterface.h < ed_Rinterface
ed $(GNUR_HOME)/include/R_ext/GraphicsEngine.h < ed_GraphicsEngine
$(foreach file,$(R_EXT_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/R_ext/$(file) R_ext/$(file);)
# cp $(R_EXT_HEADERS_LOCAL) R_ext
--
GitLab