Compatibility with R 4.6

crates/ark/src/lsp/completions/completion_item.rs

@@ -7,6 +7,7 @@
 
 use std::fs::DirEntry;
 
+use harp::environment::r_env_parent;
 use harp::r_symbol;
 use harp::syntax::is_valid_symbol;
 use harp::syntax::sym_quote;
@@ -19,7 +20,6 @@ use harp::utils::r_typeof;
 use libr::R_UnboundValue;
 use libr::Rf_findVarInFrame;
 use libr::Rf_isFunction;
-use libr::ENCLOS;
 use libr::PROMSXP;
 use libr::PRVALUE;
 use libr::SEXP;
@@ -480,7 +480,7 @@ pub(super) unsafe fn completion_item_from_namespace(
     };
 
     // Otherwise, try the imports environment.
-    let imports = ENCLOS(namespace);
+    let imports = r_env_parent(namespace);
     let error_imports = match completion_item_from_symbol(
         name,
         imports,

crates/ark/src/lsp/completions/sources/composite/search_path.rs

@@ -5,6 +5,7 @@
 //
 //
 
+use harp::environment::r_env_parent;
 use harp::exec::RFunction;
 use harp::exec::RFunctionExt;
 use harp::utils::r_env_is_pkg_env;
@@ -14,7 +15,6 @@ use harp::vector::Vector;
 use harp::RObject;
 use libr::R_EmptyEnv;
 use libr::R_lsInternal;
-use libr::ENCLOS;
 use tower_lsp::lsp_types::CompletionItem;
 
 use crate::console;
@@ -113,7 +113,7 @@ fn completions_from_search_path(
             }
 
             // Get the next environment.
-            env = ENCLOS(env);
+            env = r_env_parent(env);
         }
 
         // Include installed packages as well.

crates/harp/src/environment.rs

@@ -76,16 +76,14 @@ impl Environment {
     }
 
     pub fn parent(&self) -> Option<Environment> {
-        unsafe {
-            let parent = ENCLOS(self.inner.sexp);
-            if parent == R_ENVS.empty {
-                None
-            } else {
-                Some(Self::new_filtered(
-                    RObject::new(parent),
-                    self.filter.clone(),
-                ))
-            }
+        let parent = r_env_parent(self.inner.sexp);
+        if parent == R_ENVS.empty {
+            None
+        } else {
+            Some(Self::new_filtered(
+                RObject::new(parent),
+                self.filter.clone(),
+            ))
         }
     }
 
@@ -253,6 +251,18 @@ impl Environment {
     }
 }
 
+/// Returns the parent (enclosing) environment. Uses `R_ParentEnv` on
+/// R >= 4.5 where `ENCLOS` is hidden, with fallback to `ENCLOS` for older R.
+pub fn r_env_parent(env: SEXP) -> SEXP {
+    unsafe {
+        if libr::has::R_ParentEnv() {
+            libr::R_ParentEnv(env)
+        } else {
+            libr::ENCLOS(env)
+        }
+    }
+}
+
 impl From<Environment> for SEXP {
     fn from(object: Environment) -> Self {
         object.inner.sexp

crates/harp/src/size.rs

@@ -13,6 +13,7 @@ use std::u32;
 use libc::c_double;
 use libr::*;
 
+use crate::environment::r_env_parent;
 use crate::environment::BindingValue;
 use crate::environment::Environment;
 use crate::environment::R_ENVS;
@@ -294,7 +295,7 @@ fn obj_size_tree(
             }
 
             size += obj_size_tree(
-                unsafe { libr::ENCLOS(x) },
+                r_env_parent(x),
                 base_env,
                 sizeof_node,
                 sizeof_vector,
@@ -359,15 +360,15 @@ fn obj_size_tree(
         EXTPTRSXP => {
             size += size_of::<*mut c_void>(); // the actual pointer
             size += obj_size_tree(
-                unsafe { libr::EXTPTR_PROT(x) },
+                unsafe { libr::R_ExternalPtrProtected(x) },
                 base_env,
                 sizeof_node,
                 sizeof_vector,
                 seen,
                 depth + 1,
             );
             size += obj_size_tree(
-                unsafe { libr::EXTPTR_TAG(x) },
+                unsafe { libr::R_ExternalPtrTag(x) },
                 base_env,
                 sizeof_node,
                 sizeof_vector,

crates/harp/src/utils.rs

@@ -126,11 +126,11 @@ pub fn r_is_altrep(object: SEXP) -> bool {
 }
 
 pub fn r_is_object(object: SEXP) -> bool {
-    unsafe { libr::OBJECT(object) != 0 }
+    unsafe { libr::Rf_isObject(object) != 0 }
 }
 
 pub fn r_is_s4(object: SEXP) -> bool {
-    unsafe { libr::IS_S4_OBJECT(object) != 0 }
+    unsafe { libr::Rf_isS4(object) != 0 }
 }
 
 pub fn r_is_unbound(object: SEXP) -> bool {

crates/libr/src/r.rs

@@ -21,6 +21,8 @@ use crate::types::*;
 functions::generate! {
     pub fn R_NewEnv(enclos: SEXP, hash: std::ffi::c_int, size: std::ffi::c_int) -> SEXP;
 
+    pub fn R_ParentEnv(x: SEXP) -> SEXP;
+
     pub fn Rf_initialize_R(ac: std::ffi::c_int, av: *mut *mut std::ffi::c_char) -> std::ffi::c_int;
 
     pub fn run_Rmainloop();
@@ -60,6 +62,10 @@ functions::generate! {
 
     pub fn R_ExternalPtrAddr(s: SEXP) -> *mut std::ffi::c_void;
 
+    pub fn R_ExternalPtrProtected(s: SEXP) -> SEXP;
+
+    pub fn R_ExternalPtrTag(s: SEXP) -> SEXP;
+
     pub fn R_MakeExternalPtr(p: *mut std::ffi::c_void, tag: SEXP, prot: SEXP) -> SEXP;
 
     pub fn R_MakeWeakRefC(key: SEXP, val: SEXP, fin: R_CFinalizer_t, onexit: Rboolean) -> SEXP;
@@ -166,6 +172,10 @@ functions::generate! {
 
     pub fn Rf_isInteger(arg1: SEXP) -> Rboolean;
 
+    pub fn Rf_isObject(arg1: SEXP) -> Rboolean;
+
+    pub fn Rf_isS4(arg1: SEXP) -> Rboolean;
+
     pub fn Rf_isMatrix(arg1: SEXP) -> Rboolean;
 
     pub fn Rf_isNumeric(arg1: SEXP) -> Rboolean;