[PATCH] Port clojurian to CHICKEN 6

Stanislav Kljuhhin via Chicken-users <[email protected]>
Newsgroups gmane.lisp.scheme.chicken
Message-ID <[email protected]>
Hello,

It’s a very simple change to make existing cond-expand statements
recognise CHICKEN 6 alongside CHICKEN 5 instead of falling through
into CHICKEN 4 branches.

I tried making a PR on BitBucket, but it seems it no longer allows
forking repositories, so I’m sending a patch instead.

--
Stan
0001-Port-to-CHICKEN-6.patch (application/octet-stream, 3.3 KB)
From 8189dd3427da0f2591c3b48399a0fb5c8ce93e57 Mon Sep 17 00:00:00 2001
From: Stanislav Kljuhhin <[email protected]>
Date: Sun, 16 Aug 2026 13:03:03 +0200
Subject: [PATCH] Port to CHICKEN 6

A few simple changes to cond-expand statements to prevent falling
through into CHICKEN 4 branches.
---
 clojurian-atom-impl.scm   | 4 ++--
 clojurian-atom.scm        | 2 +-
 clojurian-syntax-impl.scm | 2 +-
 clojurian-syntax.scm      | 2 +-
 tests/atom.scm            | 4 ++--
 tests/run.scm             | 2 +-
 tests/syntax.scm          | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/clojurian-atom-impl.scm b/clojurian-atom-impl.scm
index 03b9359..5fbdf98 100644
--- a/clojurian-atom-impl.scm
+++ b/clojurian-atom-impl.scm
@@ -1,13 +1,13 @@
 (import scheme)
 
 (cond-expand
-  (chicken-5 (import (chicken module)))
+  ((or chicken-5 chicken-6) (import (chicken module)))
   (else))
 
 (export atom atom-value atom? atom-compare-and-set! atom-swap! atom-reset!)
 
 (cond-expand
-  (chicken-5 (import (except (chicken base) atom?) (srfi 18)))
+  ((or chicken-5 chicken-6) (import (except (chicken base) atom?) (srfi 18)))
   (else (import chicken)
         (use srfi-18)))
 
diff --git a/clojurian-atom.scm b/clojurian-atom.scm
index 2442eda..886aa6a 100644
--- a/clojurian-atom.scm
+++ b/clojurian-atom.scm
@@ -1,5 +1,5 @@
 (cond-expand
-  (chicken-5
+  ((or chicken-5 chicken-6)
    (module (clojurian atom) ()
      "clojurian-atom-impl"))
   (else
diff --git a/clojurian-syntax-impl.scm b/clojurian-syntax-impl.scm
index 6db785a..8c12843 100644
--- a/clojurian-syntax-impl.scm
+++ b/clojurian-syntax-impl.scm
@@ -1,7 +1,7 @@
 (import scheme)
 
 (cond-expand
-  (chicken-5 (import (chicken module)))
+  ((or chicken-5 chicken-6) (import (chicken module)))
   (else))
 
 (export doto as-> and-> -> ->* ->> ->>* if-let if-let*)
diff --git a/clojurian-syntax.scm b/clojurian-syntax.scm
index 18c7226..57507b0 100644
--- a/clojurian-syntax.scm
+++ b/clojurian-syntax.scm
@@ -1,5 +1,5 @@
 (cond-expand
-  (chicken-5
+  ((or chicken-5 chicken-6)
    (module (clojurian syntax) ()
 "clojurian-syntax-impl"))
   (else
diff --git a/tests/atom.scm b/tests/atom.scm
index d158146..8de2302 100644
--- a/tests/atom.scm
+++ b/tests/atom.scm
@@ -1,5 +1,5 @@
 (cond-expand
-  (chicken-5
+  ((or chicken-5 chicken-6)
    (import (chicken random) (test) (srfi 1) (srfi 18))
    (import (clojurian atom)))
   (else
@@ -22,7 +22,7 @@
 
 (define random*
   (cond-expand
-    (chicken-5 pseudo-random-integer)
+    ((or chicken-5 chicken-6) pseudo-random-integer)
     (else random)))
 
 (for-each
diff --git a/tests/run.scm b/tests/run.scm
index 8293e4c..704d47d 100644
--- a/tests/run.scm
+++ b/tests/run.scm
@@ -1,5 +1,5 @@
 (cond-expand
-  (chicken-5
+  ((or chicken-5 chicken-6)
    (import (chicken load) (test)))
   (else
    (use test)))
diff --git a/tests/syntax.scm b/tests/syntax.scm
index af8829e..39e88a6 100644
--- a/tests/syntax.scm
+++ b/tests/syntax.scm
@@ -1,5 +1,5 @@
 (cond-expand
-  (chicken-5
+  ((or chicken-5 chicken-6)
    (import (chicken load) (test) (srfi 1)))
   (else
    (use test srfi-1)))
@@ -7,7 +7,7 @@
 (load-relative "../clojurian-syntax")
 
 (cond-expand
-  (chicken-5
+  ((or chicken-5 chicken-6)
    (import (clojurian syntax)))
   (else
    (import clojurian-syntax)))
-- 
2.55.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.