Rewrite cond-thunk to be in terms of cond, and rename tests for

chicken

3 files changed, 8 insertions, 9 deletions

diff --git a/mcgoron.cond-thunk.scm b/mcgoron.cond-thunk.scm
index ff7171e..ebd8bfd 100644
--- a/mcgoron.cond-thunk.scm
+++ b/mcgoron.cond-thunk.scm
@@ -16,14 +16,13 @@
 
 (define-syntax cond-thunk
   (syntax-rules (else)
-    ((cond-thunk (else body ...))
-     (begin body ...))
-    ((cond-thunk expr rest ...)
-     (let ((value expr))
-       (if value
-           (value)
-           (cond-thunk rest ...))))
-    ((cond-thunk) #f)))
+    ((cond-thunk expr ... (else body ...))
+     (cond
+       (expr => (lambda (x) (x)))
+       ...
+       (else body ...)))
+    ((cond-thunk expr ...)
+     (cond-thunk expr ... (else #f)))))
 
 (define any-thunk
   (letrec ((loop
diff --git a/test/cas.scm b/tests/cas.scm
index 5d87632..5d87632 100644
--- a/test/cas.scm
+++ b/tests/cas.scm
diff --git a/test/cond-thunk-test.scm b/tests/run.scm
index df620d0..c98e76f 100644
--- a/test/cond-thunk-test.scm
+++ b/tests/run.scm
@@ -71,4 +71,4 @@
      (on-pair #f)
      (on-boolean #f)
      (else #f))))
-
+(test-exit)