From: Wolfgang J. <wje...@us...> - 2002-09-01 12:22:02
|
Update of /cvsroot/maxima/maxima/src In directory usw-pr-cvs1:/tmp/cvs-serv30076 Modified Files: hyp.lisp Log Message: Patch from Thomas Fischbacher: Rename INTERSECTION since it is also in the CL package. Index: hyp.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/hyp.lisp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- hyp.lisp 27 Mar 2002 18:52:35 -0000 1.4 +++ hyp.lisp 1 Sep 2002 12:21:58 -0000 1.5 @@ -123,7 +123,7 @@ (DEFUN SIMPG (L1 L2) (PROG(IL) - (COND ((NULL (SETQ IL (INTERSECTION L1 L2))) + (COND ((NULL (SETQ IL (zl-INTERSECTION L1 L2))) (RETURN (SIMPG-EXEC L1 L2)))) (RETURN (SIMPG-EXEC (DEL IL L1)(DEL IL L2))))) @@ -468,14 +468,14 @@ (T (hyp-NEGP-IN-L (CDR L))))) -(DEFUN INTERSECTION +(DEFUN zl-INTERSECTION (L1 L2) (cond ((null l1) nil) ((zl-member (car l1) l2) (cons (car l1) - (intersection (cdr l1) + (zl-intersection (cdr l1) (zl-delete (car l1) l2 1)))) - (t (intersection (cdr l1) l2)))) + (t (zl-intersection (cdr l1) l2)))) (DEFUN 2INP (L) |