Skip to content

fix: R API #2597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
maelle wants to merge 2 commits into
base: main
Choose a base branch
from
+25 −16
Draft

fix: R API #2597

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6805e1
fix: R API
maelle Mar 26, 2026
9c06bd4
fix older R version error
schochastics Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions src/rinterface_extra.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,22 @@ enum igraph_versions {

#define R_IGRAPH_VERSION_VAR ".__igraph_version__."

#if R_VERSION >= R_Version(4, 5, 0)
# define IGRAPH_R_GET_VAR(sym, env, inherits) \
R_getVar((sym), (env), (inherits))
# define IGRAPH_R_GET_VAR_EX(sym, env, inherits, ifnotfound) \
R_getVarEx((sym), (env), (inherits), (ifnotfound))
#else
static inline SEXP IGRAPH_R_GET_VAR(SEXP sym, SEXP env, Rboolean inherits) {
return inherits ? Rf_findVar(sym, env) : Rf_findVarInFrame(env, sym);
}

static inline SEXP IGRAPH_R_GET_VAR_EX(SEXP sym, SEXP env, Rboolean inherits, SEXP ifnotfound) {
SEXP val = IGRAPH_R_GET_VAR(sym, env, inherits);
return val == R_UnboundValue ? ifnotfound : val;
}
#endif

/* The following three R_check_... functions must only be called from top-level C code,
* i.e. in contexts where igraph_error() does NOT return. */

Expand Down Expand Up @@ -2443,7 +2459,7 @@ igraph_error_t Rx_igraph_status_handler(const char *message, void *data) {
}

static R_xlen_t Rx_igraph_altrep_length(SEXP vec) {
SEXP xp=Rf_findVar(Rf_install("igraph"), R_altrep_data1(vec));
SEXP xp=IGRAPH_R_GET_VAR(Rf_install("igraph"), R_altrep_data1(vec), TRUE);
igraph_t *g=(igraph_t*)(R_ExternalPtrAddr(xp));
return igraph_ecount(g);
}
Expand All @@ -2452,7 +2468,7 @@ static void *Rx_igraph_altrep_from(SEXP vec, Rboolean writeable) {
SEXP data=R_altrep_data2(vec);
if (data == R_NilValue) {
Rx_igraph_status_handler("Materializing 'from' vector.\n", NULL);
SEXP xp=Rf_findVar(Rf_install("igraph"), R_altrep_data1(vec));
SEXP xp=IGRAPH_R_GET_VAR(Rf_install("igraph"), R_altrep_data1(vec), TRUE);
igraph_t *g=(igraph_t*)(R_ExternalPtrAddr(xp));

data=Ry_igraph_vector_int_to_SEXP(&g->from);
Expand All @@ -2467,7 +2483,7 @@ static void *Rx_igraph_altrep_to(SEXP vec, Rboolean writeable) {
if (data == R_NilValue) {
Rx_igraph_status_handler("Materializing 'to' vector.\n", NULL);

SEXP xp=Rf_findVar(Rf_install("igraph"), R_altrep_data1(vec));
SEXP xp=IGRAPH_R_GET_VAR(Rf_install("igraph"), R_altrep_data1(vec), TRUE);
igraph_t *g=(igraph_t*)(R_ExternalPtrAddr(xp));

data=Ry_igraph_vector_int_to_SEXP(&g->to);
Expand Down Expand Up @@ -2873,17 +2889,17 @@ igraph_t *Rx_igraph_get_pointer(SEXP graph) {
Rf_error("This graph was created by a now unsupported old igraph version.\n Call upgrade_graph() before using igraph functions on that object.");
}

SEXP xp=Rf_findVar(Rf_install("igraph"), Rx_igraph_graph_env(graph));
SEXP xp=IGRAPH_R_GET_VAR_EX(Rf_install("igraph"), Rx_igraph_graph_env(graph), TRUE, R_UnboundValue);
if (xp == R_UnboundValue || xp == R_NilValue) {
Rx_igraph_restore_pointer(graph);
xp=Rf_findVar(Rf_install("igraph"), Rx_igraph_graph_env(graph));
xp=IGRAPH_R_GET_VAR_EX(Rf_install("igraph"), Rx_igraph_graph_env(graph), TRUE, R_UnboundValue);
}

igraph_t *pgraph=(igraph_t*)(R_ExternalPtrAddr(xp));

if (!pgraph) {
Rx_igraph_restore_pointer(graph);
xp=Rf_findVar(Rf_install("igraph"), Rx_igraph_graph_env(graph));
xp=IGRAPH_R_GET_VAR_EX(Rf_install("igraph"), Rx_igraph_graph_env(graph), TRUE, R_UnboundValue);
pgraph=(igraph_t*)(R_ExternalPtrAddr(xp));
}

Expand Down Expand Up @@ -7707,7 +7723,7 @@ SEXP Rx_igraph_graph_version(SEXP graph) {
return Rf_ScalarInteger(ver_0_4);
}

SEXP ver = Rf_findVar(Rf_install(R_IGRAPH_VERSION_VAR), Rx_igraph_graph_env(graph));
SEXP ver = IGRAPH_R_GET_VAR_EX(Rf_install(R_IGRAPH_VERSION_VAR), Rx_igraph_graph_env(graph), TRUE, R_UnboundValue);
if (ver == R_UnboundValue) {
return Rf_ScalarInteger(ver_0_7_999);
}
Expand Down Expand Up @@ -7755,14 +7771,7 @@ SEXP Rx_igraph_add_env(SEXP graph) {
Rf_copyMostAttrib(graph, result);
}

// Get the base namespace
SEXP base_ns = PROTECT(R_FindNamespace(Rf_mkString("base"))); px++;
// Get the emptyenv function
SEXP empty_env_fun = PROTECT(Rf_findVarInFrame(base_ns, Rf_install("emptyenv"))); px++;
// Call emptyenv()
SEXP empty_env = PROTECT(Rf_eval(PROTECT(Rf_lang1(empty_env_fun)), R_GlobalEnv)); px++; px++;
// Evaluate the call
SEXP env = PROTECT(R_NewEnv(empty_env, 0, 0)); px++;
SEXP env = PROTECT(R_NewEnv(R_EmptyEnv, 0, 0)); px++;

SET_VECTOR_ELT(result, igraph_t_idx_env, env);

Expand All @@ -7786,7 +7795,7 @@ SEXP Rx_igraph_add_env(SEXP graph) {
}

SEXP Rx_igraph_get_graph_id(SEXP graph) {
return Rf_findVar(Rf_install("myid"), Rx_igraph_graph_env(graph));
return IGRAPH_R_GET_VAR(Rf_install("myid"), Rx_igraph_graph_env(graph), TRUE);
}

// Wrapper functions for functions not in aaa-auto.R
Expand Down
Loading