From: Viktor T. <vt...@us...> - 2008-11-21 01:18:28
|
Update of /cvsroot/maxima/maxima/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30169 Modified Files: simp.lisp Log Message: Removed unnecessary function and superfluous comments. Index: simp.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/simp.lisp,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- simp.lisp 20 Nov 2008 22:54:59 -0000 1.61 +++ simp.lisp 21 Nov 2008 01:17:57 -0000 1.62 @@ -202,10 +202,6 @@ (and (not (atom x)) (not (atom (car x))) (member (caar x) '(rat bigfloat))))) -(defmfun mlistp (x) ;; VTT - (and (not (atom x)) ;; VTT - (eq (caar x) 'mlist))) ;; VTT - ;; EVEN works for any arbitrary lisp object since it does an integer ;; check first. In other cases, you may want the Lisp EVENP function ;; which only works for integers. @@ -791,14 +787,13 @@ del (cond ((not (mtimesp (cadr fm))) (go check)) ((onep1 (cadadr fm)) (rplacd (cadr fm) (cddadr fm)) (return (cdr fm))) - ((not (zerop1 (cadadr fm))) (return (cdr fm))) ;; VTT ) - ((and (not $listarith) ;; VTT - (zerop1 (cadadr fm)) ;; VTT - (mlistp (caddr (cadr fm))) ) ;; VTT -;; (eq 'mlist (caar (caddr (cadr fm)))) ) ;; VTT - (return ;; VTT - (rplacd fm ;; VTT - (list (constmx 0 (caddr (cadr fm)))) ))) ) ;; VTT + ((not (zerop1 (cadadr fm))) (return (cdr fm))) + ((and (not $listarith) + (zerop1 (cadadr fm)) + ($listp (caddr (cadr fm))) ) + (return + (rplacd fm + (list (constmx 0 (caddr (cadr fm)))) ))) ) (return (rplacd fm (cddr fm))) equt (setq x1 (testtneg (list* '(mtimes simp) @@ -1005,7 +1000,7 @@ (mul2 res (cadr eqnflag)) (mul2 res (caddr eqnflag))))) (t (dolist (u x) - (cond ( (mxorlistp u) ;;; VTT - (mxorlistp1 u) + (cond ( (mxorlistp u) (return (setq res (constmx res u)))) ((and (mexptp u) |