[anaphora-cvs] CVS src

[jsquires]

Update of /project/anaphora/cvsroot/src
In directory common-lisp:/tmp/cvs-serv7206

Modified Files:
	anaphora.lisp 
Log Message:
Fixed acond/scond bug where cond forms weren't being executed.


--- /project/anaphora/cvsroot/src/anaphora.lisp	2004/03/18 10:52:19	1.1.1.1
+++ /project/anaphora/cvsroot/src/anaphora.lisp	2006/02/17 20:53:59	1.2
@@ -98,9 +98,9 @@
 (defmacro acond (&body clauses)
   (labels ((rec (clauses)
 	     (if clauses
-		 (destructuring-bind ((test &optional result) . rest)  clauses
-		   (if result
-		       `(anaphoric if ,test ,result ,(rec rest))
+		 (destructuring-bind ((test &body body) . rest)  clauses
+		   (if body
+		       `(anaphoric if ,test (progn , at body) ,(rec rest))
 		       `(anaphoric if ,test it ,(rec rest))))
 		 nil)))
     (rec clauses)))
@@ -108,9 +108,9 @@
 (defmacro scond (&body clauses)
   (labels ((rec (clauses)
 	     (if clauses
-		 (destructuring-bind ((test &optional result) . rest) clauses
-		   (if result
-		       `(symbolic if ,test ,result ,(rec rest))
+		 (destructuring-bind ((test &body body) . rest) clauses
+		   (if body
+		       `(symbolic if ,test (progn , at body) ,(rec rest))
 		       `(symbolic if ,test it ,(rec rest))))
 		 nil)))
     (rec clauses)))