From e8ca9eab6dee408a68683147e9df2f0c81c4354e Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 27 Feb 2011 00:57:26 +0000
Subject: 	* interp/g-opt.boot (optCond): Recognize conjunction and 
 disjunction forms.

---
 src/algebra/strap/ILIST.lsp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'src/algebra/strap/ILIST.lsp')

diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index 64b04a6d..6efd96a6 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -251,19 +251,17 @@
                                     (|shellEntry| $ 45)))))))))))) 
 
 (DEFUN |ILIST;=;2$B;22| (|x| |y| $)
-  (COND
-    ((EQ |x| |y|) T)
-    (T (SEQ (LOOP
-              (COND
-                ((NOT (COND ((NULL |x|) NIL) (T (NOT (NULL |y|)))))
-                 (RETURN NIL))
-                (T (COND
-                     ((SPADCALL (CAR |x|) (CAR |y|)
-                          (|shellEntry| $ 53))
-                      (RETURN-FROM |ILIST;=;2$B;22| NIL))
-                     (T (SEQ (SETQ |x| (CDR |x|))
-                             (EXIT (SETQ |y| (CDR |y|)))))))))
-            (EXIT (AND (NULL |x|) (NULL |y|))))))) 
+  (OR (EQ |x| |y|)
+      (SEQ (LOOP
+             (COND
+               ((NOT (AND (NOT (NULL |x|)) (NOT (NULL |y|))))
+                (RETURN NIL))
+               (T (COND
+                    ((SPADCALL (CAR |x|) (CAR |y|) (|shellEntry| $ 53))
+                     (RETURN-FROM |ILIST;=;2$B;22| NIL))
+                    (T (SEQ (SETQ |x| (CDR |x|))
+                            (EXIT (SETQ |y| (CDR |y|)))))))))
+           (EXIT (AND (NULL |x|) (NULL |y|)))))) 
 
 (DEFUN |ILIST;latex;$S;23| (|x| $)
   (LET ((|s| "\\left["))
@@ -353,7 +351,7 @@
                           (EXIT (SETQ |q| (CDR |q|))))))
                 (LOOP
                   (COND
-                    ((NOT (COND ((NULL |p|) NIL) (T (NOT (NULL |q|)))))
+                    ((NOT (AND (NOT (NULL |p|)) (NOT (NULL |q|))))
                      (RETURN NIL))
                     (T (COND
                          ((SPADCALL (CAR |p|) (CAR |q|) |f|)
-- 
cgit v1.2.3