From: Andreas E. <ar...@us...> - 2007-03-01 23:04:08
|
Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14143 Modified Files: clmacs.lisp numth.lisp pois3.lisp float.lisp ratout.lisp Log Message: replaced lsh by ash. Index: clmacs.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/clmacs.lisp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- clmacs.lisp 21 Feb 2007 15:47:24 -0000 1.23 +++ clmacs.lisp 1 Mar 2007 23:04:01 -0000 1.24 @@ -91,7 +91,6 @@ (def-op lessp t < t) (def-op remainder t rem) #-mcl - (def-op lsh fixnum ash) (def-op fixnum-remainder fixnum rem) (def-op minus t -) ;;(def-op \\ fixnum rem) ;no calls any more @@ -240,8 +239,6 @@ (defun zl-delete (x lis &optional count) (delete x lis :test #'equal :count count)) -(setf (symbol-function 'lsh) #'ash) - (defun haulong (x) (integer-length x)) Index: numth.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/numth.lisp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- numth.lisp 15 Feb 2007 16:18:21 -0000 1.9 +++ numth.lisp 1 Mar 2007 23:04:01 -0000 1.10 @@ -109,8 +109,8 @@ ((zerop r1) 0) (cond ((evenp r1) (setq r1 (quotient r1 2)) - (setq odd (boole boole-xor odd (lsh (^ (haipart r2 -4) 2) -2))))) - (and (equal r1 1) (return (expt -1 (boole boole-and 1 (lsh odd -1))))))) + (setq odd (boole boole-xor odd (ash (^ (haipart r2 -4) 2) -2))))) + (and (equal r1 1) (return (expt -1 (boole boole-and 1 (ash odd -1))))))) (defun psumsq (p) ((lambda (x) Index: pois3.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/pois3.lisp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- pois3.lisp 7 Nov 2005 17:37:12 -0000 1.4 +++ pois3.lisp 1 Mar 2007 23:04:01 -0000 1.5 @@ -9,14 +9,13 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (in-package :maxima) + (macsyma-module pois3) ;; GENERAL POISSON SERIES (declare-top (special *argc *coef poisvals poisco1 poiscom1 b* a* *a ss cc h* poishift - poistsm poissiz poists $wtlvl $poisz $pois1) - (*lexpr $print $coeff) - (genprefix \P)) + poistsm poissiz poists $wtlvl $poisz $pois1)) (defvar trim nil) @@ -51,7 +50,6 @@ ;;;******** -(declare-top(fixnum ae poishift poistsm poissiz poists)) ;; ABOVE ASSUMES POISLIM(5) OR LESS ALSO REDEFINE ORDER< AND ORDER= TO BE < AND = ;;; THIS TELLS THE EVALUATOR TO KEEP OUT OF POISSON $SERIES. @@ -62,9 +60,8 @@ (setq a (intopois a) b (intopois b)) (list '(mpois simp) (poismerge22 (cadr a) (cadr b)) (poismerge22 (caddr a) (caddr b)))) - - (declare-top (special *b *fn)) + (defmfun $poismap (p sinfn cosfn) (prog (*b *fn) (setq p (intopois p)) @@ -554,7 +551,7 @@ (defmfun $poisexpt (p n) (prog (u h) (cond ((oddp n) (setq u p)) (t (setq u (setq h (intopois 1.))))) - a (setq n (lsh n -1.)) + a (setq n (ash n -1)) (cond ((zerop n) (return u))) (setq p ($poistimes p p)) (cond ((oddp n) (setq u (cond ((equal u h) p) (t ($poistimes u p)))))) Index: float.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/float.lisp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- float.lisp 11 Feb 2007 18:02:20 -0000 1.29 +++ float.lisp 1 Mar 2007 23:04:01 -0000 1.30 @@ -539,7 +539,7 @@ ;; The form which follows is nearly identical to (ASH X N), however ;; (ASH -100 -20) = -1, whereas (BIGLSH -100 -20) = 0. (if (>= x 0) - (lsh x n) + (ash x n) (- (biglsh (- x) n)))) ;(- x) may be a bignum even is x is a fixnum. ;; If we get here, then either X is a bignum or our answer is ;; going to be a bignum. @@ -551,7 +551,7 @@ ((= n 0) x) ;; Isn't this the kind of optimization that compilers are ;; supposed to make? - ((< n #.(1- +machine-fixnum-precision+)) (* x (lsh 1 n))) + ((< n #.(1- +machine-fixnum-precision+)) (* x (ash 1 n))) (t (* x (expt 2 n))))) Index: ratout.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/ratout.lisp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ratout.lisp 20 Feb 2007 21:37:16 -0000 1.9 +++ ratout.lisp 1 Mar 2007 23:04:01 -0000 1.10 @@ -155,7 +155,7 @@ (setq e (pdegreer bigf2)) (setq degree (pdegreer bigf1)) (cond ((vgreat e degree) (setq e degree))) - (setq b (lsh modulus -1)) + (setq b (ash modulus -1)) (setq gbar (pgcdu (setq f1 (pgathercoef bigf1 xv 0)) (setq f1f2 @@ -460,14 +460,14 @@ (return (lsft (pctimes1 (cadr f) g) (car f)))) ((null (cddr g)) (return (lsft (pctimes1 (cadr g) f) (car g))))) - (setq d (lsh (add1 (max (car f) (car g))) -1)) + (setq d (ash (add1 (max (car f) (car g))) -1)) (setq f (halfsplit f d) g (halfsplit g d)) (setq a (fptimes1 (car f) (car g))) (setq b (fptimes1 (pplus1 (car f) (cdr f)) (pplus1 (car g) (cdr g)))) (setq c (fptimes1 (cdr f) (cdr g))) (setq b (pdiffer1 (pdiffer1 b a) c)) - (return (pplus1 (lsft a (lsh d 1)) (pplus1 (lsft b d) c))))) + (return (pplus1 (lsft a (ash d 1)) (pplus1 (lsft b d) c))))) (defun halfsplit (p d) (do ((a) (p p (cddr p))) |