Rf_findVar -> R_getVar and related

Author: gaborcsardi

src/cleancall.c

@@ -35,8 +35,12 @@ void cleancall_SetExternalPtrAddrFn(SEXP s, DL_FUNC p) {
 // Initialised at load time with the `.Call` primitive
 SEXP cleancall_fns_dot_call = NULL;
 
+#if (defined(R_VERSION) && R_VERSION < R_Version(4, 5, 0))
+#define R_getVar(x,y,z) Rf_findVar(x,y)
+#endif
+
 void cleancall_init(void) {
-  cleancall_fns_dot_call = Rf_findVar(Rf_install(".Call"), R_BaseEnv);
+  cleancall_fns_dot_call = R_getVar(Rf_install(".Call"), R_BaseEnv, TRUE);
 }
 
 struct eval_args {

src/init.c

@@ -100,6 +100,10 @@ static const R_CallMethodDef callMethods[]  = {
 
 #define RCC(fun) R_RegisterCCallable("cli", # fun, (DL_FUNC) fun);
 
+#if (defined(R_VERSION) && R_VERSION < R_Version(4, 5, 0))
+#define R_getVar(x,y,z) Rf_findVar(x,y)
+#endif
+
 r_export
 void R_init_cli(DllInfo *dll) {
 #if R_VERSION >= R_Version(3, 5, 0)
@@ -110,7 +114,7 @@ void R_init_cli(DllInfo *dll) {
   R_useDynamicSymbols(dll, FALSE);
   R_forceSymbols(dll, TRUE);
 
-  cleancall_fns_dot_call = Rf_findVar(Rf_install(".Call"), R_BaseEnv);
+  cleancall_fns_dot_call = R_getVar(Rf_install(".Call"), R_BaseEnv, TRUE);
 
   RCC(cli_progress_add);
   RCC(cli_progress_bar);

src/progress.c

@@ -96,6 +96,7 @@ SEXP clic_get_time(void) {
   return Rf_ScalarReal(ts);
 }
 
+#if (defined(R_VERSION) && R_VERSION < R_Version(4, 5, 0))
 SEXP clic__find_var(SEXP rho, SEXP symbol) {
   SEXP ret = Rf_findVarInFrame(rho, symbol);
   if (ret == R_UnboundValue) {
@@ -111,6 +112,25 @@ SEXP clic__find_var(SEXP rho, SEXP symbol) {
     return ret;
   }
 }
+#else
+SEXP clic__find_var(SEXP rho, SEXP symbol) {
+  Rboolean ex = R_existsVarInFrame(rho, symbol);
+  if (!ex) {
+    error("Cannot find variable `%s`.", CHAR(PRINTNAME(symbol)));
+  }
+
+  SEXP ret = R_getVar(symbol, rho, TRUE);
+  if (TYPEOF(ret) == PROMSXP) {
+    PROTECT(ret);
+    SEXP ret2 = Rf_eval(ret, rho);
+    UNPROTECT(1);
+    return(ret2);
+
+  } else {
+    return ret;
+  }
+}
+#endif
 
 static int cli__counter = 0;
 

tests/testthat/progresstest/src/cleancall.c

@@ -35,8 +35,12 @@ void cleancall_SetExternalPtrAddrFn(SEXP s, DL_FUNC p) {
 // Initialised at load time with the `.Call` primitive
 SEXP cleancall_fns_dot_call = NULL;
 
+#if (defined(R_VERSION) && R_VERSION < R_Version(4, 5, 0))
+#define R_getVar(x,y,z) Rf_findVar(x,y)
+#endif
+
 void cleancall_init() {
-  cleancall_fns_dot_call = Rf_findVar(Rf_install(".Call"), R_BaseEnv);
+  cleancall_fns_dot_call = R_getVar(Rf_install(".Call"), R_BaseEnv, TRUE);
 }
 
 struct eval_args {

tests/testthat/progresstest/src/test.c

@@ -97,9 +97,13 @@ static const R_CallMethodDef CallEntries[] = {
   { NULL, NULL, 0 }
 };
 
+#if (defined(R_VERSION) && R_VERSION < R_Version(4, 5, 0))
+#define R_getVar(x,y,z) Rf_findVar(x,y)
+#endif
+
 void R_init_progresstest(DllInfo *dll) {
   R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
   R_useDynamicSymbols(dll, FALSE);
   R_forceSymbols(dll, TRUE);
-  cleancall_fns_dot_call = Rf_findVar(Rf_install(".Call"), R_BaseEnv);
+  cleancall_fns_dot_call = R_getVar(Rf_install(".Call"), R_BaseEnv, TRUE);
 }