From: Andreas E. <ar...@us...> - 2007-02-18 11:58:10
|
Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21795 Modified Files: asum.lisp combin.lisp grind.lisp hayat.lisp limit.lisp mstuff.lisp outmis.lisp rat3e.lisp schatc.lisp simp.lisp solve.lisp transs.lisp ufact.lisp maxmac.lisp Log Message: replaced copy-top-level by copy-list. It was just a trivial macro. Index: asum.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/asum.lisp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- asum.lisp 7 Jan 2007 04:22:36 -0000 1.16 +++ asum.lisp 18 Feb 2007 11:57:54 -0000 1.17 @@ -868,7 +868,7 @@ (defun additive (e z) (cond ((get (caar e) '$outative) ;Really a linearize! - (setq opers-list (copy-top-level opers-list )) + (setq opers-list (copy-list opers-list )) (rem-opers-p '$outative) (linearize1 e z)) ((mplusp (cadr e)) @@ -897,7 +897,7 @@ (defun outative (e z) (setq e (cons (car e) (mapcar #'(lambda (q) (simpcheck q z)) (cdr e)))) (cond ((get (caar e) '$additive) - (setq opers-list (copy-top-level opers-list )) + (setq opers-list (copy-list opers-list )) (rem-opers-p '$additive) (linearize1 e t)) ((linearconst e)) Index: combin.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/combin.lisp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- combin.lisp 6 Feb 2007 15:33:47 -0000 1.15 +++ combin.lisp 18 Feb 2007 11:57:54 -0000 1.16 @@ -1351,7 +1351,7 @@ (t (pdecomp1 (ptimes (car l) prod) (cdr l))))) (defun pdecgdfrm (l) ;Get list of divisors - (do ((l (copy-top-level l )) + (do ((l (copy-list l )) (ll (list (car l)) (cons (car l) ll))) (nil) Index: grind.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/grind.lisp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- grind.lisp 6 Jan 2007 16:21:38 -0000 1.21 +++ grind.lisp 18 Feb 2007 11:57:54 -0000 1.22 @@ -354,7 +354,7 @@ (defprop mdefmacro 20. rbp) (defun msz-mdef (x l r) - (setq l (msize (cadr x) l (copy-top-level (strsym (caar x))) lop (caar x)) + (setq l (msize (cadr x) l (copy-list (strsym (caar x))) lop (caar x)) r (msize (caddr x) nil r (caar x) rop)) (setq x (cons (f- (car l) (caadr l)) (cddr l))) (if (and (not (atom (cadr r))) (not (atom (caddr r))) Index: hayat.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/hayat.lisp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- hayat.lisp 18 Feb 2007 10:40:53 -0000 1.14 +++ hayat.lisp 18 Feb 2007 11:57:54 -0000 1.15 @@ -1272,7 +1272,7 @@ (setq datum (list* kernel ;(mapcar #'(lambda (e) (emax e (rczero))) ; (trunc-stack (car tlist))) - (copy-top-level (trunc-stack (car tlist))) + (copy-list (trunc-stack (car tlist))) lim () g no)) ;(setq tlist (nconc tlist (ncons datum))) (adjoin-datum datum) @@ -1965,7 +1965,7 @@ (let ((label (gensym)) (vs (cdar l)) (pts (make-long-list (if ($listp (cadr l)) - (copy-top-level (cdadr l)) + (copy-list (cdadr l)) (ncons (ratdisrep (cadr l)))))) (ord (caddr l)) (switches (make-switch-list (cdddr l))) Index: limit.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/limit.lisp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- limit.lisp 22 Dec 2006 19:45:50 -0000 1.27 +++ limit.lisp 18 Feb 2007 11:57:54 -0000 1.28 @@ -426,7 +426,7 @@ (t (setq infc (inf-typep nexp)) (cond ((amongl (zl-delete infc - (copy-top-level '($infinity $minf inf))) + (copy-list '($infinity $minf inf))) nexp) '$und) (t infc))))) @@ -1436,9 +1436,9 @@ (setq denom-vars (list denom-vars)) (setq denom-vars (cdr denom-vars))) (do ((nl num-vars (cdr nl)) - (num-list (copy-top-level num-vars )) + (num-list (copy-list num-vars )) (den-list denom-vars den-list-temp) - (den-list-temp (copy-top-level denom-vars ))) + (den-list-temp (copy-list denom-vars ))) ((null nl) (cons (m* const (m// num-consts denom-consts)) (cons (m*l num-list) (m*l den-list-temp)))) (do ((dl den-list (cdr dl))) Index: mstuff.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/mstuff.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- mstuff.lisp 7 Nov 2005 17:37:11 -0000 1.7 +++ mstuff.lisp 18 Feb 2007 11:57:54 -0000 1.8 @@ -18,7 +18,7 @@ (let ((llist (arg 1)) comparfun bfun) (if (not ($listp llist)) (merror "The first argument to `sort' must be a list:~%~M" llist)) - (setq llist (copy-top-level (cdr llist) ) + (setq llist (copy-list (cdr llist) ) comparfun (mfunction1 (setq bfun (if (= n 2) (getopr (arg 2)) 'lessthan)))) (if (memq bfun '(lessthan great)) Index: outmis.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/outmis.lisp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- outmis.lisp 1 Feb 2007 22:58:18 -0000 1.12 +++ outmis.lisp 18 Feb 2007 11:57:54 -0000 1.13 @@ -245,7 +245,7 @@ ;;(declare-top (FIXNUM N)) (defun atdecode (fun dl vl) - (setq vl (copy-top-level vl)) + (setq vl (copy-list vl)) (atvarschk vl) ((lambda (eqs nvarl) (cond ((not (member nil (mapcar #'(lambda (x) (signp e x)) dl) :test #'eq)) Index: rat3e.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/rat3e.lisp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- rat3e.lisp 15 Feb 2007 09:40:55 -0000 1.13 +++ rat3e.lisp 18 Feb 2007 11:57:54 -0000 1.14 @@ -977,7 +977,7 @@ (t (setq x (ratdisrepd x)) (if (and (not (atom x)) (member 'trunc (cdar x) :test #'eq)) - (cons (delete 'trunc (copy-top-level (car x)) :count 1 :test #'eq) (cdr x)) + (cons (delete 'trunc (copy-list (car x)) :count 1 :test #'eq) (cdr x)) x)))) ;; RATDISREPD is needed by DISPLA. - JPG Index: schatc.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/schatc.lisp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- schatc.lisp 15 Feb 2007 14:52:46 -0000 1.8 +++ schatc.lisp 18 Feb 2007 11:57:54 -0000 1.9 @@ -343,7 +343,7 @@ (cond (ind (restore1)) ((restore2)))) ((restore)))) - ((testa p (cond ((cddr e) (copy-top-level e )) + ((testa p (cond ((cddr e) (copy-list e )) ((cadr e))) nil) (cond (ind (restore1)) Index: simp.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/simp.lisp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- simp.lisp 14 Feb 2007 21:30:43 -0000 1.27 +++ simp.lisp 18 Feb 2007 11:57:54 -0000 1.28 @@ -881,9 +881,9 @@ (cons '(mplus) (cond ((mnump x) (ncons x)) ((not (mplusp x)) - (list 0 (cond ((atom x) x) (t (copy-top-level x))))) - ((mnump (cadr x)) (copy-top-level (cdr x) )) - (t (cons 0 (copy-top-level (cdr x) ))))))) + (list 0 (cond ((atom x) x) (t (copy-list x))))) + ((mnump (cadr x)) (copy-list (cdr x) )) + (t (cons 0 (copy-list (cdr x) ))))))) ((mnump x) (return (cons '(mplus) (if (mnump (cadr out)) @@ -1101,7 +1101,7 @@ (and (setq product (list '(mtimes) 1)) nil))) (setq tem (append '((mtimes)) (cond ((mnump (cadr factor)) nil) (t '(1))) (cdr factor) nil)) - (cond ((eql (length tem) 1)(setq tem (copy-top-level tem))) + (cond ((eql (length tem) 1)(setq tem (copy-list tem))) (t tem)) ) ((mnump factor) Index: solve.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/solve.lisp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- solve.lisp 16 Feb 2007 17:11:38 -0000 1.9 +++ solve.lisp 18 Feb 2007 11:57:54 -0000 1.10 @@ -570,10 +570,8 @@ ((null l)) (setq chain-sol (decomp-chain (car l) (cdr decomp) var *$var (cadr l))) - (setq wins (nconc wins - (copy-top-level (solution-wins chain-sol)))) - (setq losses (nconc losses - (copy-top-level (solution-losses chain-sol))))) + (setq wins (nconc wins (copy-list (solution-wins chain-sol)))) + (setq losses (nconc losses (copy-list (solution-losses chain-sol))))) (make-solution wins losses)))) ;; Decomp-chain is the function which formats the mess for the recursive call. @@ -776,7 +774,7 @@ (defun varsort (v) (let ((*u nil) - (*v (copy-top-level v))) + (*v (copy-list v))) (mapc #'(lambda (z) (cond ((broken-freeof *var z) (setq *u (cons z *u)) Index: transs.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/transs.lisp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- transs.lisp 2 Feb 2007 12:43:34 -0000 1.25 +++ transs.lisp 18 Feb 2007 11:57:54 -0000 1.26 @@ -412,7 +412,7 @@ (new-comment-line) (print-module 'transl-autoload) (do ((j 0 (1+ j)) - (s (delete 'transl-autoload (copy-top-level transl-modules) :test #'equal) + (s (delete 'transl-autoload (copy-list transl-modules) :test #'equal) (cdr s))) ((null s)) (if (= 0 (rem j 3)) (new-comment-line)) Index: ufact.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/ufact.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ufact.lisp 18 Feb 2007 10:40:53 -0000 1.5 +++ ufact.lisp 18 Feb 2007 11:57:54 -0000 1.6 @@ -52,8 +52,8 @@ (defun dpgcd (p q) (if (< (car p) (car q)) (exch p q)) - (do ((p (copy-top-level p) q) - (q (copy-top-level q) (dpremquo p q nil))) + (do ((p (copy-list p) q) + (q (copy-list q) (dpremquo p q nil))) ((= (car q) 0) (if (= (cadr q) 0) p '(0 1))))) Index: maxmac.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/maxmac.lisp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- maxmac.lisp 18 Feb 2007 10:40:53 -0000 1.12 +++ maxmac.lisp 18 Feb 2007 11:57:57 -0000 1.13 @@ -58,9 +58,6 @@ (defmacro tuchus (list object) `(setf ,list (nconc ,list (ncons ,object)))) -(defmacro copy-top-level (list) - `(copy-list ,list)) - ;; Old names kept around for compatibility. (defmacro copy (list) |