Skip to content

chore: Use Rx_ and similar prefixes consistently #2478

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

Merged
krlmlr merged 4 commits into from
Nov 2, 2025
Merged

chore: Use Rx_ and similar prefixes consistently #2478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7656602
Rx
krlmlr Nov 2, 2025
59d0bcb
Ry_
krlmlr Nov 2, 2025
69aaa55
Rz_
krlmlr Nov 2, 2025
28e89d1
Rw_
krlmlr Nov 2, 2025
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
2 changes: 1 addition & 1 deletion R/bipartite.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ bipartite_projection <- function(
on.exit(.Call(Rx_igraph_finalizer))
# Function call
res <- .Call(
R_igraph_bipartite_projection,
Rx_igraph_bipartite_projection,
graph,
types,
as.numeric(probe1),
Expand Down
2 changes: 1 addition & 1 deletion R/cliques.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ max_cliques <- function(
} else {
on.exit(.Call(Rx_igraph_finalizer))
res <- .Call(
R_igraph_maximal_cliques,
Rx_igraph_maximal_cliques,
graph,
subset,
as.numeric(min),
Expand Down
2 changes: 1 addition & 1 deletion R/conversion.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ get.adjacency.dense <- function(
on.exit(.Call(Rx_igraph_finalizer))
type <- switch(type, "upper" = 0, "lower" = 1, "both" = 2)
res <- .Call(
R_igraph_get_adjacency,
Rx_igraph_get_adjacency,
graph,
as.numeric(type),
weights,
Expand Down
4 changes: 2 additions & 2 deletions R/make.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ graph.full <- function(n, directed = FALSE, loops = FALSE) {
lifecycle::deprecate_soft("2.1.0", "graph.full()", "make_full_graph()")
on.exit(.Call(Rx_igraph_finalizer))
res <- .Call(
R_igraph_full,
Rx_igraph_full,
as.numeric(n),
as.logical(directed),
as.logical(loops)
Expand Down Expand Up @@ -1918,7 +1918,7 @@ star <- function(...) constructor_spec(make_star, ...)
make_full_graph <- function(n, directed = FALSE, loops = FALSE) {
on.exit(.Call(Rx_igraph_finalizer))
res <- .Call(
R_igraph_full,
Rx_igraph_full,
as.numeric(n),
as.logical(directed),
as.logical(loops)
Expand Down
2 changes: 1 addition & 1 deletion R/structural-properties.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2768,7 +2768,7 @@ bfs <- function(

on.exit(.Call(Rx_igraph_finalizer))
res <- .Call(
R_igraph_bfs,
Rx_igraph_bfs,
graph,
root,
roots,
Expand Down
4 changes: 2 additions & 2 deletions R/versions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ upgrade_graph <- function(graph) {
graph[igraph_t_idx_oi:igraph_t_idx_is] <- list(NULL)
class(graph) <- "igraph"

# Calling for side effect: error if R_SEXP_to_igraph() fails, create native igraph,
# Calling for side effect: error if Rz_SEXP_to_igraph() fails, create native igraph,
# update "me" element of environment
V(graph)

Expand All @@ -125,7 +125,7 @@ upgrade_graph <- function(graph) {
## Check that the version is the latest

warn_version <- function(graph) {
# Calling for side effect: error if R_SEXP_to_igraph() fails
# Calling for side effect: error if Rz_SEXP_to_igraph() fails
# Don't call vcount_impl() to avoid recursion
.Call(Rx_igraph_vcount, graph)

Expand Down
20 changes: 10 additions & 10 deletions src/cpp11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,12 @@ extern SEXP R_igraph_average_path_length_dijkstra(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_avg_nearest_neighbor_degree(SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_betweenness_cutoff(SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_betweenness_subset(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_bfs(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_bfs_simple(SEXP, SEXP, SEXP);
extern SEXP R_igraph_biadjacency(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_bibcoupling(SEXP, SEXP);
extern SEXP R_igraph_biconnected_components(SEXP);
extern SEXP R_igraph_bipartite_game_gnm(SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_bipartite_game_gnp(SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_bipartite_projection(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_bipartite_projection_size(SEXP, SEXP);
extern SEXP R_igraph_bond_percolation(SEXP, SEXP);
extern SEXP R_igraph_bridges(SEXP);
Expand Down Expand Up @@ -141,13 +139,11 @@ extern SEXP R_igraph_find_cycle(SEXP, SEXP);
extern SEXP R_igraph_forest_fire_game(SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_from_hrg_dendrogram(SEXP);
extern SEXP R_igraph_from_prufer(SEXP);
extern SEXP R_igraph_full(SEXP, SEXP, SEXP);
extern SEXP R_igraph_full_bipartite(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_full_citation(SEXP, SEXP);
extern SEXP R_igraph_full_multipartite(SEXP, SEXP, SEXP);
extern SEXP R_igraph_fundamental_cycles(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_generalized_petersen(SEXP, SEXP);
extern SEXP R_igraph_get_adjacency(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_get_adjacency_sparse(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_get_all_eids_between(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_get_all_shortest_paths(SEXP, SEXP, SEXP, SEXP);
Expand Down Expand Up @@ -272,7 +268,6 @@ extern SEXP R_igraph_local_scan_neighborhood_ecount(SEXP, SEXP, SEXP);
extern SEXP R_igraph_local_scan_subset_ecount(SEXP, SEXP, SEXP);
extern SEXP R_igraph_maxdegree(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_maxflow(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_maximal_cliques(SEXP, SEXP, SEXP, SEXP);
extern SEXP R_igraph_maximal_cliques_count(SEXP, SEXP, SEXP);
extern SEXP R_igraph_maximal_cliques_hist(SEXP, SEXP, SEXP);
extern SEXP R_igraph_maximal_independent_vertex_sets(SEXP);
Expand Down Expand Up @@ -403,6 +398,8 @@ extern SEXP Rx_igraph_arpack(SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_arpack_unpack_complex(SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_barabasi_aging_game(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_barabasi_game(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_bfs(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_bipartite_projection(SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_callaway_traits_game(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_cited_type_game(SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_citing_cited_type_game(SEXP, SEXP, SEXP, SEXP, SEXP);
Expand Down Expand Up @@ -431,6 +428,8 @@ extern SEXP Rx_igraph_es_path(SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_establishment_game(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_farthest_points(SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_finalizer(void);
extern SEXP Rx_igraph_full(SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_get_adjacency(SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_get_adjedgelist(SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_get_adjlist(SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_get_all_simple_paths_pp(SEXP);
Expand Down Expand Up @@ -462,6 +461,7 @@ extern SEXP Rx_igraph_layout_lgl(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP)
extern SEXP Rx_igraph_layout_merge_dla(SEXP, SEXP);
extern SEXP Rx_igraph_layout_reingold_tilford(SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_make_weak_ref(SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_maximal_cliques(SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_maximal_cliques_count(SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_maximal_cliques_file(SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP Rx_igraph_mybracket2(SEXP, SEXP, SEXP);
Expand Down Expand Up @@ -530,14 +530,12 @@ static const R_CallMethodDef CallEntries[] = {
{"R_igraph_avg_nearest_neighbor_degree", (DL_FUNC) &R_igraph_avg_nearest_neighbor_degree, 5},
{"R_igraph_betweenness_cutoff", (DL_FUNC) &R_igraph_betweenness_cutoff, 5},
{"R_igraph_betweenness_subset", (DL_FUNC) &R_igraph_betweenness_subset, 6},
{"R_igraph_bfs", (DL_FUNC) &R_igraph_bfs, 15},
{"R_igraph_bfs_simple", (DL_FUNC) &R_igraph_bfs_simple, 3},
{"R_igraph_biadjacency", (DL_FUNC) &R_igraph_biadjacency, 4},
{"R_igraph_bibcoupling", (DL_FUNC) &R_igraph_bibcoupling, 2},
{"R_igraph_biconnected_components", (DL_FUNC) &R_igraph_biconnected_components, 1},
{"R_igraph_bipartite_game_gnm", (DL_FUNC) &R_igraph_bipartite_game_gnm, 5},
{"R_igraph_bipartite_game_gnp", (DL_FUNC) &R_igraph_bipartite_game_gnp, 5},
{"R_igraph_bipartite_projection", (DL_FUNC) &R_igraph_bipartite_projection, 4},
{"R_igraph_bipartite_projection_size", (DL_FUNC) &R_igraph_bipartite_projection_size, 2},
{"R_igraph_bond_percolation", (DL_FUNC) &R_igraph_bond_percolation, 2},
{"R_igraph_bridges", (DL_FUNC) &R_igraph_bridges, 1},
Expand Down Expand Up @@ -628,13 +626,11 @@ static const R_CallMethodDef CallEntries[] = {
{"R_igraph_forest_fire_game", (DL_FUNC) &R_igraph_forest_fire_game, 5},
{"R_igraph_from_hrg_dendrogram", (DL_FUNC) &R_igraph_from_hrg_dendrogram, 1},
{"R_igraph_from_prufer", (DL_FUNC) &R_igraph_from_prufer, 1},
{"R_igraph_full", (DL_FUNC) &R_igraph_full, 3},
{"R_igraph_full_bipartite", (DL_FUNC) &R_igraph_full_bipartite, 4},
{"R_igraph_full_citation", (DL_FUNC) &R_igraph_full_citation, 2},
{"R_igraph_full_multipartite", (DL_FUNC) &R_igraph_full_multipartite, 3},
{"R_igraph_fundamental_cycles", (DL_FUNC) &R_igraph_fundamental_cycles, 4},
{"R_igraph_generalized_petersen", (DL_FUNC) &R_igraph_generalized_petersen, 2},
{"R_igraph_get_adjacency", (DL_FUNC) &R_igraph_get_adjacency, 4},
{"R_igraph_get_adjacency_sparse", (DL_FUNC) &R_igraph_get_adjacency_sparse, 4},
{"R_igraph_get_all_eids_between", (DL_FUNC) &R_igraph_get_all_eids_between, 4},
{"R_igraph_get_all_shortest_paths", (DL_FUNC) &R_igraph_get_all_shortest_paths, 4},
Expand Down Expand Up @@ -759,7 +755,6 @@ static const R_CallMethodDef CallEntries[] = {
{"R_igraph_local_scan_subset_ecount", (DL_FUNC) &R_igraph_local_scan_subset_ecount, 3},
{"R_igraph_maxdegree", (DL_FUNC) &R_igraph_maxdegree, 4},
{"R_igraph_maxflow", (DL_FUNC) &R_igraph_maxflow, 4},
{"R_igraph_maximal_cliques", (DL_FUNC) &R_igraph_maximal_cliques, 4},
{"R_igraph_maximal_cliques_count", (DL_FUNC) &R_igraph_maximal_cliques_count, 3},
{"R_igraph_maximal_cliques_hist", (DL_FUNC) &R_igraph_maximal_cliques_hist, 3},
{"R_igraph_maximal_independent_vertex_sets", (DL_FUNC) &R_igraph_maximal_independent_vertex_sets, 1},
Expand Down Expand Up @@ -890,6 +885,8 @@ static const R_CallMethodDef CallEntries[] = {
{"Rx_igraph_arpack_unpack_complex", (DL_FUNC) &Rx_igraph_arpack_unpack_complex, 3},
{"Rx_igraph_barabasi_aging_game", (DL_FUNC) &Rx_igraph_barabasi_aging_game, 12},
{"Rx_igraph_barabasi_game", (DL_FUNC) &Rx_igraph_barabasi_game, 9},
{"Rx_igraph_bfs", (DL_FUNC) &Rx_igraph_bfs, 15},
{"Rx_igraph_bipartite_projection", (DL_FUNC) &Rx_igraph_bipartite_projection, 4},
{"Rx_igraph_callaway_traits_game", (DL_FUNC) &Rx_igraph_callaway_traits_game, 6},
{"Rx_igraph_cited_type_game", (DL_FUNC) &Rx_igraph_cited_type_game, 5},
{"Rx_igraph_citing_cited_type_game", (DL_FUNC) &Rx_igraph_citing_cited_type_game, 5},
Expand Down Expand Up @@ -918,6 +915,8 @@ static const R_CallMethodDef CallEntries[] = {
{"Rx_igraph_establishment_game", (DL_FUNC) &Rx_igraph_establishment_game, 6},
{"Rx_igraph_farthest_points", (DL_FUNC) &Rx_igraph_farthest_points, 4},
{"Rx_igraph_finalizer", (DL_FUNC) &Rx_igraph_finalizer, 0},
{"Rx_igraph_full", (DL_FUNC) &Rx_igraph_full, 3},
{"Rx_igraph_get_adjacency", (DL_FUNC) &Rx_igraph_get_adjacency, 4},
{"Rx_igraph_get_adjedgelist", (DL_FUNC) &Rx_igraph_get_adjedgelist, 3},
{"Rx_igraph_get_adjlist", (DL_FUNC) &Rx_igraph_get_adjlist, 4},
{"Rx_igraph_get_all_simple_paths_pp", (DL_FUNC) &Rx_igraph_get_all_simple_paths_pp, 1},
Expand Down Expand Up @@ -949,6 +948,7 @@ static const R_CallMethodDef CallEntries[] = {
{"Rx_igraph_layout_merge_dla", (DL_FUNC) &Rx_igraph_layout_merge_dla, 2},
{"Rx_igraph_layout_reingold_tilford", (DL_FUNC) &Rx_igraph_layout_reingold_tilford, 5},
{"Rx_igraph_make_weak_ref", (DL_FUNC) &Rx_igraph_make_weak_ref, 3},
{"Rx_igraph_maximal_cliques", (DL_FUNC) &Rx_igraph_maximal_cliques, 4},
{"Rx_igraph_maximal_cliques_count", (DL_FUNC) &Rx_igraph_maximal_cliques_count, 4},
{"Rx_igraph_maximal_cliques_file", (DL_FUNC) &Rx_igraph_maximal_cliques_file, 5},
{"Rx_igraph_mybracket2", (DL_FUNC) &Rx_igraph_mybracket2, 3},
Expand Down
8 changes: 4 additions & 4 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

#include "igraph.h"

extern "C" void R_igraph_init_handlers(DllInfo* dll);
extern "C" void R_igraph_init_vector_class(DllInfo* dll);
extern "C" void Rx_igraph_init_handlers(DllInfo* dll);
extern "C" void Rx_igraph_init_vector_class(DllInfo* dll);

[[cpp11::init]]
void igraph_init(DllInfo* dll)
{
R_igraph_init_handlers(dll);
R_igraph_init_vector_class(dll);
Rx_igraph_init_handlers(dll);
Rx_igraph_init_vector_class(dll);
}
Loading
Loading