Merge pull request #1625 from rstudio/c-api-compliance

Moving into R's C API compliance

NEWS.md

@@ -1,5 +1,7 @@
 # reticulate (development version)
 
+- Internal updates for compliance with R's upcoming formalized C API. (#1625)
+
 - Added support for converting NumPy StringDType arrays to R character arrays. (#1623)
 
 - Internal updates for NumPy 2.0 (#1621)

src/python.cpp

@@ -502,20 +502,11 @@ SEXP current_env(void) {
     // are looking for to begin with. We use instead this workaround:
     // Call `sys.frame()` from a closure to push a new frame on the
     // stack, and use negative indexing to get the previous frame.
-    ParseStatus status;
-    SEXP code = PROTECT(Rf_mkString("sys.frame(-1)"));
-    SEXP parsed = PROTECT(R_ParseVector(code, -1, &status, R_NilValue));
-    SEXP body = VECTOR_ELT(parsed, 0);
-
-    SEXP fn = PROTECT(Rf_allocSExp(CLOSXP));
-    SET_FORMALS(fn, R_NilValue);
-    SET_BODY(fn, body);
-    SET_CLOENV(fn, R_BaseEnv);
-
+    SEXP fn = PROTECT(R_ParseEvalString("function() sys.frame(-1)", R_BaseEnv));
     SEXP call = Rf_lang1(fn);
     R_PreserveObject(call);
 
-    UNPROTECT(3);
+    UNPROTECT(1);
     return call;
   }();
 
@@ -808,20 +799,13 @@ bool traceback_enabled() {
 
 SEXP get_current_call(void) {
   static SEXP call = []() {
-    ParseStatus status;
-    SEXP code = PROTECT(Rf_mkString("sys.call(-1)"));
-    SEXP parsed = PROTECT(R_ParseVector(code, -1, &status, R_NilValue));
-    SEXP body = VECTOR_ELT(parsed, 0);
 
-    SEXP fn = PROTECT(Rf_allocSExp(CLOSXP));
-    SET_FORMALS(fn, R_NilValue);
-    SET_BODY(fn, body);
-    SET_CLOENV(fn, R_BaseEnv);
+    SEXP fn = PROTECT(R_ParseEvalString("function() sys.call(-1)", R_BaseEnv));
 
     SEXP call = Rf_lang1(fn);
     R_PreserveObject(call);
 
-    UNPROTECT(3);
+    UNPROTECT(1);
     return call;
   }();