* lisplib.c (ifa_set_entries): Add conda.

* share/txr/stdlib/ifa.tl (conda): New macro.

* tests/012/ifa.tl: Adding test for conda.

* txr.1: Documenting conda.

1 files changed, 15 insertions, 10 deletions

diff --git a/tests/012/ifa.tl b/tests/012/ifa.tl
index d659399e..ae283abc 100644
--- a/tests/012/ifa.tl
+++ b/tests/012/ifa.tl
@@ -14,34 +14,39 @@
             (error "test case ~s failed to expand: expected is ~s" expr expected)))))
 
 ;; "it" is (+ 2 2)
-(ifa (> (+ 2 2) 0) (* it 2))
-
 (test (ifa (> (+ 2 2) 0) (* it 2))
-  8)
+      8)
 
 ;; "it" is (* x x)
 (test (let ((x 7))
-    (ifa (>= (* x x) 49)
-      (isqrt it)))
-  7)
+        (ifa (>= (* x x) 49)
+             (isqrt it)))
+      7)
 
 ;; ambiguous: is "it" x or is "it" y?
 (test (ifa (> x y) (print it)) :error)
 
 ;; "it" is (+ 3 (* 2 x))
 (test (let ((x 5))
-    (ifa (< 0 (+ 3 (* 2 x)) 20) (* 100 it)))
-  1300)
+        (ifa (< 0 (+ 3 (* 2 x)) 20) (* 100 it)))
+      1300)
 
 ;; "it" is (length '(a b c d))
 ;; Intuition: it" could also be '(a b c d)
 ;; TODO: deal specially with chains of unary functions.
 ;; How about it = (length ...), itt = '(a b c d)
 (test (ifa (not (oddp (length '(a b c d)))) it)
-  4)
+      4)
 
 ;; "it" is y because %x% is constantp
 (test (symacrolet ((%x% 42))
       (let ((y 41))
         (ifa (> %x% y) it)))
-    42)
+      42)
+
+(test (let ((x 5))
+        (conda
+          ((not (integerp x)) (list it))
+          ((oddp (+ 2 x)) (list it))))
+      (7))
+