convert to chicken

4 files changed, 63 insertions, 65 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..11b2daf
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+.POSIX:
+
+clean:
+	$(RM) -f *.build.sh *.install.sh *.import.scm *.so *.link *.o
diff --git a/container-iterator.egg b/container-iterator.egg
index e670735..149d2c2 100644
--- a/container-iterator.egg
+++ b/container-iterator.egg
@@ -4,7 +4,7 @@
  (category "data")
  (license "Apache-2.0")
  (dependencies "r7rs" "srfi-130" "srfi-128")
- (test-dependencies "srfi-64")
+ (test-dependencies "test")
  (components (extension mcgoron.iterator.exceptions
                (source "mcgoron.iterator.exceptions.sld")
                (csc-options "-R" "r7rs" "-X" "r7rs"))
diff --git a/test-string-iterator.scm b/test-string-iterator.scm
deleted file mode 100644
index b13f5b8..0000000
--- a/test-string-iterator.scm
+++ /dev/null
@@ -1,64 +0,0 @@
-#| Copyright 2024 Peter McGoron
- |
- | Licensed under the Apache License, Version 2.0 (the "License");
- | you may not use this file except in compliance with the License.
- | You may obtain a copy of the License at
- |
- |     http://www.apache.org/licenses/LICENSE-2.0
- |
- | Unless required by applicable law or agreed to in writing, software
- | distributed under the License is distributed on an "AS IS" BASIS,
- | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- | See the License for the specific language governing permissions and
- | limitations under the License.
- |#
-
-(cond-expand
- (chicken (import r7rs))
- (else))
-
-(load "mcgoron.iterator.exceptions.sld")
-(load "mcgoron.iterator.base.sld")
-(load "mcgoron.iterator.string.sld")
-
-(import (srfi 64) (mcgoron iterator string)
-        (mcgoron iterator base))
-
-(let* ((str "")
-       (itr (string-iterator-start str)))
-  (test-begin "empty string")
-  (test-assert "iterator-at-start?" (iterator-at-start? itr))
-  (test-assert "iterator-at-end?" (iterator-at-end? itr))
-  (test-assert "iterator-advance 1" (not (iterator-advance itr 1)))
-  (test-assert "iterator-advance -1" (not (iterator-advance itr -1)))
-  (test-eqv "iterator->index" 0 (iterator->index itr))
-  (test-assert "iterator=?" (iterator=? itr (string-iterator-end str)))
-  (test-error "iterator-ref" #t (iterator-ref itr))
-  (test-end "empty string"))
-
-(let* ((str "a")
-       (itr (string-iterator-start str))
-       (itr-from-itr (string-iterator-start itr)))
-  (test-begin "single character string")
-  (test-assert "iterator-at-start?" (iterator-at-start? itr))
-  (test-assert "iterator-at-end?" (not (iterator-at-end? itr)))
-  (test-assert (iterator=? itr itr-from-itr))
-  (test-eqv "iterator-ref 0" #\a (iterator-ref itr))
-  (test-assert "iterator-advance start -1" (not (iterator-advance itr -1)))
-  (let ((next-itr (iterator-advance itr 1)))
-    (test-assert "iterator? advanced" (iterator? next-itr))
-    (test-assert "iterator-at-end? advanced" (iterator-at-end? next-itr))
-    (test-assert "iterator=? end advanced"
-                 (iterator=? next-itr (string-iterator-end str)))
-    (test-assert "iterator=? itr next-itr"
-                 (not (iterator=? itr next-itr)))
-    (test-assert "iterator<? itr next-itr"
-                 (iterator<? itr next-itr))
-    (test-assert "iterator=? itr previous"
-                 (iterator=? itr (iterator-advance next-itr -1)))
-    (test-eqv "iterator->index next-itr" 1
-              (iterator->index next-itr))
-    (test-error "iterator-ref next-itr"
-                #t (iterator-ref next-itr)))
-  (test-end "single character string"))
-
diff --git a/tests/run.scm b/tests/run.scm
new file mode 100644
index 0000000..6d7abfe
--- /dev/null
+++ b/tests/run.scm
@@ -0,0 +1,58 @@
+#| Copyright 2024 Peter McGoron
+ |
+ | Licensed under the Apache License, Version 2.0 (the "License");
+ | you may not use this file except in compliance with the License.
+ | You may obtain a copy of the License at
+ |
+ |     http://www.apache.org/licenses/LICENSE-2.0
+ |
+ | Unless required by applicable law or agreed to in writing, software
+ | distributed under the License is distributed on an "AS IS" BASIS,
+ | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ | See the License for the specific language governing permissions and
+ | limitations under the License.
+ |#
+
+(cond-expand
+ (chicken (import r7rs test))
+ (else (import (srfi 64))))
+
+;;; TODO: Make a custom SRFI-64 test runner that emulates CHICKEN test.
+
+(import (mcgoron iterator string) (mcgoron iterator base))
+
+(let* ((str "")
+       (itr (string-iterator-start str)))
+  (test-group "empty-string"
+    (test-assert "iterator-at-start?" (iterator-at-start? itr))
+    (test-assert "iterator-at-end?" (iterator-at-end? itr))
+    (test-assert "iterator-advance 1" (not (iterator-advance itr 1)))
+    (test-assert "iterator-advance -1" (not (iterator-advance itr -1)))
+    (test "iterator->index" 0 (iterator->index itr))
+    (test-assert "iterator=?" (iterator=? itr (string-iterator-end str)))
+    (test-error "iterator-ref" (iterator-ref itr))))
+
+(let* ((str "a")
+       (itr (string-iterator-start str))
+       (itr-from-itr (string-iterator-start itr)))
+  (test-group "non empty string"
+    (test-assert "iterator-at-start?" (iterator-at-start? itr))
+    (test-assert "iterator-at-end?" (not (iterator-at-end? itr)))
+    (test-assert (iterator=? itr itr-from-itr))
+    (test "iterator-ref 0" #\a (iterator-ref itr))
+    (test-assert "iterator-advance start -1" (not (iterator-advance itr -1)))
+    (let ((next-itr (iterator-advance itr 1)))
+      (test-assert "iterator? advanced" (iterator? next-itr))
+      (test-assert "iterator-at-end? advanced" (iterator-at-end? next-itr))
+      (test-assert "iterator=? end advanced"
+                   (iterator=? next-itr (string-iterator-end str)))
+      (test-assert "iterator=? itr next-itr"
+                   (not (iterator=? itr next-itr)))
+      (test-assert "iterator<? itr next-itr"
+                   (iterator<? itr next-itr))
+      (test-assert "iterator=? itr previous"
+                   (iterator=? itr (iterator-advance next-itr -1)))
+      (test "iterator->index next-itr" 1
+            (iterator->index next-itr))
+      (test-error "iterator-ref next-itr" (iterator-ref next-itr)))))
+(test-exit)