[Maxima-commits] CVS: maxima/src airy.lisp, 1.7, 1.8 ellipt.lisp, 1.26, 1.27

[Raymond T. <rt...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18125/src

Modified Files:
	airy.lisp ellipt.lisp 
Log Message:
Replace plain (flonum foo) with (type flonum foo) since cmucl and
clisp complain about abbreviated type declarations.  Warnings are
gone. 


Index: airy.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/airy.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- airy.lisp	14 Feb 2008 01:31:37 -0000	1.7
+++ airy.lisp	22 Apr 2008 13:28:40 -0000	1.8
@@ -187,7 +187,7 @@
         (declare (type flonum rz c))
         (multiple-value-bind (var-0 var-1 var-2 bi dbi)
 	    (slatec:dyairy z rz c 0.0 0.0)
-	  (declare (flonum bi dbi)
+	  (declare (type flonum bi dbi)
 		   (ignore var-0 var-1 var-2 bi))
 	  dbi))
       ;; Will overflow.  Return unevaluated.

Index: ellipt.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/ellipt.lisp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ellipt.lisp	14 Feb 2008 01:31:37 -0000	1.26
+++ ellipt.lisp	22 Apr 2008 13:28:41 -0000	1.27
@@ -987,7 +987,7 @@
       (c1 (float 1/24))
       (c2 (float 3/44))
       (c3 (float 1/14)))
-  (declare (flonum errtol c1 c2 c3))
+  (declare (type flonum errtol c1 c2 c3))
   (defun drf (x y z)
     "Compute Carlson's incomplete or complete elliptic integral of the
 first kind:
@@ -1003,7 +1003,7 @@
 
 where x >= 0, y >= 0, z >=0, and at most one of x, y, z is zero.
 "
-    (declare (flonum x y z))
+    (declare (type flonum x y z))
     ;; Check validity of input
     (assert (and (>= x 0) (>= y 0) (>= z 0)
 		 (plusp (+ x y)) (plusp (+ x z)) (plusp (+ y z))))
@@ -1039,7 +1039,7 @@
       (c1 (float 1/24))
       (c2 (float 3/44))
       (c3 (float 1/14)))
-  (declare (flonum errtol c1 c2 c3))
+  (declare (type flonum errtol c1 c2 c3))
   (defun crf (x y z)
     "Compute Carlson's incomplete or complete elliptic integral of the
 first kind:
@@ -1150,7 +1150,7 @@
 
 ;; Complete elliptic integral of the first kind
 (defun elliptic-k (m)
-  (declare (flonum m))
+  (declare (type flonum m))
   (cond ((> m 1)
 	 ;; A&S 17.4.15
 	 (/ (elliptic-f (cl:asin (sqrt m)) (/ m))))
@@ -1302,7 +1302,7 @@
       (c2 (float 1/6))
       (c3 (float 9/22))
       (c4 (float 3/26)))
-  (declare (flonum errtol c1 c2 c3 c4))
+  (declare (type flonum errtol c1 c2 c3 c4))
   (defun drd (x y z)
     ;; Check validity of input
 
@@ -1358,7 +1358,7 @@
 ;;      0
 
 (defun elliptic-e (phi m)
-  (declare (flonum phi m))
+  (declare (type flonum phi m))
   (cond ((= m 0)
 	 ;; A&S 17.4.23
 	 phi)
@@ -1379,7 +1379,7 @@
 
 ;; Complete version
 (defun elliptic-ec (m)
-  (declare (flonum m))
+  (declare (type flonum m))
   (cond ((= m 0)
 	 ;; A&S 17.4.23
 	 (float (/ pi 2)))
@@ -1864,7 +1864,7 @@
 (let ((errtol (expt (/ flonum-epsilon 3) 1/6))
       (c1 (float 1/7))
       (c2 (float 9/22)))
-  (declare (flonum errtol c1 c2))
+  (declare (type flonum errtol c1 c2))
   (defun drc (x y)
     (declare (type (flonum 0.0) x)
 	     (type (flonum (0.0)) y)