From: Andreas E. <ar...@us...> - 2007-03-22 22:44:57
|
Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2782 Modified Files: combin.lisp comm.lisp matrun.lisp mdebug.lisp mtrace.lisp transl.lisp Log Message: replaced delq with delete Index: combin.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/combin.lisp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- combin.lisp 13 Mar 2007 19:40:06 -0000 1.19 +++ combin.lisp 22 Mar 2007 22:44:48 -0000 1.20 @@ -156,7 +156,7 @@ (cond ((not (free ($gcd dn* (cdr l4)) 'mfactorial)) (numden (list '(mplus) (div* nn* dn*) (div* (car l4) (cdr l4)))) - (setq l2 (delq l4 l2 1)))))))) + (setq l2 (delete l4 l2 :count 1 :test #'eq)))))))) (defun factpluscomb (e) (prog (donel fact indl tt) Index: comm.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/comm.lisp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- comm.lisp 19 Mar 2007 22:14:26 -0000 1.17 +++ comm.lisp 22 Mar 2007 22:44:48 -0000 1.18 @@ -548,7 +548,7 @@ (car (nthcdr (1- n) e))) (defmfun delsimp (e) - (delq 'simp (copy-list e) 1)) + (delete 'simp (copy-list e) :count 1 :test #'eq)) (defmfun remsimp (e) (if (atom e) e (cons (delsimp (car e)) (mapcar #'remsimp (cdr e))))) Index: matrun.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/matrun.lisp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- matrun.lisp 19 Mar 2007 23:02:16 -0000 1.13 +++ matrun.lisp 22 Mar 2007 22:44:48 -0000 1.14 @@ -81,11 +81,11 @@ (mremprop rule '$ruletype) (mremprop rule 'ruleof) (remprop rule 'expr) - (delq rule $rules 1) + (setq $rules (delete rule $rules :count 1 :test #'eq)) (putprop rule othrulename 'expr) (if (eq (get op 'operators) rule) (putprop op othrulename 'operators)) - (return (mputprop op (delq rule (mget op 'oldrules)) 'oldrules)))))) + (return (mputprop op (delete rule (mget op 'oldrules) :test #'eq) 'oldrules)))))) (defmfun findbe (e) (cond ((equal e 1) '(1 . 0)) Index: mdebug.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/mdebug.lisp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- mdebug.lisp 8 Mar 2007 04:03:44 -0000 1.29 +++ mdebug.lisp 22 Mar 2007 22:44:48 -0000 1.30 @@ -780,7 +780,7 @@ (push var *diff-bindlist*) (push (symbol-value var) *diff-mspeclist*) (cond ((eq (car mspeclist) munbound) - (makunbound var) (delq var $values 1)) + (makunbound var) (setq $values (delete var $values :count 1 :test #'eq))) (t (let ((munbindp t)) (mset var (car mspeclist))))) (setq mspeclist (cdr mspeclist) bindlist (cdr bindlist)))) @@ -792,6 +792,5 @@ (remove-bindings bdlist) (when lineinfo (fresh-line *debug-io*) - (format *debug-io* "~a:~a::~%" (cadr lineinfo) - (+ 0 (car lineinfo)))) + (format *debug-io* "~a:~a::~%" (cadr lineinfo) (+ 0 (car lineinfo)))) (values))) Index: mtrace.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/mtrace.lisp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- mtrace.lisp 6 Mar 2007 22:35:11 -0000 1.20 +++ mtrace.lisp 22 Mar 2007 22:44:48 -0000 1.21 @@ -285,10 +285,9 @@ (or (member fun trace-handling-stack :test #'eq) (setf (trace-level fun) nil)) (setf (trace-type fun) nil) - (delq fun ilist) + (setq ilist (delete fun ilist :test #'eq)) (list fun)) - ;; Placing the TRACE functional hook. ;; Because the function properties in macsyma are used by the EDITOR, SAVE, ;; and GRIND commands it is not possible to simply replace the function Index: transl.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/transl.lisp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- transl.lisp 6 Mar 2007 15:40:31 -0000 1.25 +++ transl.lisp 22 Mar 2007 22:44:48 -0000 1.26 @@ -1598,7 +1598,7 @@ (prog1 (teval var) (cond (old - (setq tstack (delq old tstack)) ; POP should be all we need. + (setq tstack (delete old tstack :test #'eq)) ; POP should be all we need. (setq old (cdr old)) (putprop1 var (tstack-slot-mode old) 'mode) (putprop1 var (tstack-slot-tbind old) 'tbind) |