Thanks siiky for fixing this! Looks good to me. Here are two patches: your original one and one minimal test-suite from me. Perhaps someone can apply this upstream if this looks all right?
Thanks! Kris On Mon, Sep 21, 2026 at 10:47 AM siiky <[email protected]> wrote: > > diff --git a/library.scm b/library.scm > > index 0eaf542a..734ed0ed 100644 > > --- a/library.scm > > +++ b/library.scm > > @@ -7917,7 +7917,7 @@ static C_word C_curdir(C_word buf, C_word size) { > > (when new > > (##sys#check-list new 'include-path) > > (set! ##sys#include-pathnames new)) > > - ##include-pathnames) > > + ##sys#include-pathnames) > > > > (define path-list-separator > > (if ##sys#windows-platform #\; #\:)) > > @@ -7980,8 +7980,6 @@ static C_word C_curdir(C_word buf, C_word size) { > > (map chop-separator (##sys#split-path p)))) > > (else (list installation-home)))) > > > > -(define (include-path) ##sys#include-pathnames) > > - > > > > ;;; Feature identifiers: > > This appears to fix it (on cb895929). Tests pass, and: > > #;1> (import (chicken platform)) > #;2> include-path > #<procedure (chicken.platform#include-path . rest)> > #;3> (include-path) > ("/home/siiky/.local/share/chicken6") > #;4> (include-path '("foo")) > ("foo") > #;5> (include-path) > ("foo") > > siiky > > >
From 9ef2d927913a65fffcb8441e12d1e384f9c4e833 Mon Sep 17 00:00:00 2001 From: siiky <[email protected]> Date: Tue, 22 Sep 2026 10:10:53 +0200 Subject: [PATCH 1/2] fix: include-path now accepts 1 argument as reported here https://lists.nongnu.org/archive/html/chicken-users/2026-09/msg00131.html --- library.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/library.scm b/library.scm index 0eaf542a..734ed0ed 100644 --- a/library.scm +++ b/library.scm @@ -7917,7 +7917,7 @@ static C_word C_curdir(C_word buf, C_word size) { (when new (##sys#check-list new 'include-path) (set! ##sys#include-pathnames new)) - ##include-pathnames) + ##sys#include-pathnames) (define path-list-separator (if ##sys#windows-platform #\; #\:)) @@ -7980,8 +7980,6 @@ static C_word C_curdir(C_word buf, C_word size) { (map chop-separator (##sys#split-path p)))) (else (list installation-home)))) -(define (include-path) ##sys#include-pathnames) - ;;; Feature identifiers: -- 2.54.0
From c5c98793271ef34deff0f7523a13e221ff6f51d4 Mon Sep 17 00:00:00 2001 From: Kristian Lein-Mathisen <[email protected]> Date: Tue, 22 Sep 2026 10:29:06 +0200 Subject: [PATCH 2/2] tests: add tests for include-path --- tests/include-path.scm | 7 +++++++ tests/runtests.sh | 1 + 2 files changed, 8 insertions(+) create mode 100644 tests/include-path.scm diff --git a/tests/include-path.scm b/tests/include-path.scm new file mode 100644 index 00000000..af6cf438 --- /dev/null +++ b/tests/include-path.scm @@ -0,0 +1,7 @@ +(import (only (chicken platform) include-path)) + +(include "test.scm") + +(test-assert "(include-path) default" (list? (include-path))) +(include-path (list "./nowhere")) +(test-equal "(include-path) changed" '("./nowhere") (include-path)) diff --git a/tests/runtests.sh b/tests/runtests.sh index 5f879ef8..e3bceea7 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -495,6 +495,7 @@ echo "======================================== syntax-rules stress test ..." $time $interpret -bnq syntax-rule-stress-test.scm echo "======================================== include test ..." +$interpret -s include-path.scm mkdir -p a/b echo > a/b/ok.scm echo '(include "a/b/ok.scm")' > a/b/include.scm -- 2.54.0
