Skip to content

Commit

Permalink
chore: Fix Stimulus (#1737)
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr authored Mar 6, 2025
1 parent 5e83b4b commit f3f1b21
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Makefile-cigraph
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ version_number: force

PARSER := $(shell cd $(top_srcdir) ; git ls-files --full-name src | \
grep -E '\.(l|y)$$')
PARSER1 := $(patsubst src/%.l, src/%.c, $(PARSER))
PARSER2 := $(patsubst src/%.y, src/%.c, $(PARSER1))
PARSER1 := $(patsubst src/%.l, src/vendor/%.c, $(PARSER))
PARSER2 := $(patsubst src/%.y, src/vendor/%.c, $(PARSER1))

YACC=$(DOCKER) bison -b yy -d
LEX=$(DOCKER) flex
Expand All @@ -50,7 +50,7 @@ $(PYVENV)/stamp: tools/build-requirements.txt

# Apply possible patches

patches: $(CORESRC) $(VENDORSRC) $(CINC) $(PARSER2)
patches: $(PARSER2)
-rm -f src/*.orig
tools/fix-lexers.sh

Expand Down Expand Up @@ -142,7 +142,7 @@ R/aaa-auto.R: \
# Makevars.in, Makevars.win and Makevars.ucrt are only regenerated if
# the list of object files changes.

OBJECTS := $(shell echo $(CORESRC) $(VENDORSRC) $(ARPACK) $(RAY) $(UUID) | \
OBJECTS := $(shell echo $(ARPACK) $(RAY) $(UUID) | \
tr ' ' '\n' | \
grep -E '\.(c|cpp|cc|f|l|y)$$' | \
sed 's/\.[^\.][^\.]*$$/.o/' | \
Expand Down
8 changes: 4 additions & 4 deletions src/rinterface.c
Original file line number Diff line number Diff line change
Expand Up @@ -3697,11 +3697,11 @@ SEXP R_igraph_feedback_vertex_set(SEXP graph, SEXP weights, SEXP algo) {
SEXP r_result;
/* Convert input */
R_SEXP_to_igraph(graph, &c_graph);
if (0 != igraph_vector_int_init(&c_result, 0)) {
igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
}
IGRAPH_R_CHECK(igraph_vector_int_init(&c_result, 0));
IGRAPH_FINALLY(igraph_vector_int_destroy, &c_result);
if (!Rf_isNull(weights)) { R_SEXP_to_vector(weights, &c_weights); }
if (!Rf_isNull(weights)) {
R_SEXP_to_vector(weights, &c_weights);
}
c_algo = (igraph_fvs_algorithm_t) Rf_asInteger(algo);
/* Call igraph */
IGRAPH_R_CHECK(igraph_feedback_vertex_set(&c_graph, &c_result, (Rf_isNull(weights) ? 0 : &c_weights), c_algo));
Expand Down

0 comments on commit f3f1b21

Please sign in to comment.