Rename to harp::env_parent()

Author: lionel-

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

@@ -7,7 +7,6 @@
 
 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;
@@ -480,7 +479,7 @@ pub(super) unsafe fn completion_item_from_namespace(
     };
 
     // Otherwise, try the imports environment.
-    let imports = r_env_parent(namespace);
+    let imports = harp::env_parent(namespace);
     let error_imports = match completion_item_from_symbol(
         name,
         imports,

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

@@ -5,7 +5,7 @@
 //
 //
 
-use harp::environment::r_env_parent;
+use harp::env_parent;
 use harp::exec::RFunction;
 use harp::exec::RFunctionExt;
 use harp::utils::r_env_is_pkg_env;
@@ -113,7 +113,7 @@ fn completions_from_search_path(
             }
 
             // Get the next environment.
-            env = r_env_parent(env);
+            env = env_parent(env);
         }
 
         // Include installed packages as well.

crates/harp/src/environment.rs

@@ -74,7 +74,7 @@ impl Environment {
     }
 
     pub fn parent(&self) -> Option<Environment> {
-        let parent = r_env_parent(self.inner.sexp);
+        let parent = crate::r::env_parent(self.inner.sexp);
         if parent == R_ENVS.empty {
             None
         } else {
@@ -240,18 +240,6 @@ 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/r.rs

@@ -66,6 +66,17 @@ pub fn env_bind_force(env: SEXP, sym: SEXP, value: SEXP) {
     }
 }
 
+/// Returns the parent (enclosing) environment.
+pub fn env_parent(env: SEXP) -> SEXP {
+    unsafe {
+        if libr::has::R_ParentEnv() {
+            libr::R_ParentEnv(env)
+        } else {
+            libr::ENCLOS(env)
+        }
+    }
+}
+
 // --- Attributes ---
 
 /// Gets an attribute from `x`.

crates/harp/src/size.rs

@@ -13,7 +13,6 @@ 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;
@@ -22,6 +21,7 @@ use crate::object::r_chr_get;
 use crate::object::r_length;
 use crate::r::attrib_for_each;
 use crate::r::attrib_has_any;
+use crate::r::env_parent;
 use crate::r::fn_body;
 use crate::r::fn_env;
 use crate::r::fn_formals;
@@ -297,7 +297,7 @@ fn obj_size_tree(
             }
 
             size += obj_size_tree(
-                r_env_parent(x),
+                env_parent(x),
                 base_env,
                 sizeof_node,
                 sizeof_vector,