[Maxima-commits] CVS: maxima/src rat3b.lisp, 1.8, 1.9 simp.lisp, 1.36, 1.37 lmdcls.lisp, 1.17, 1.18

[Andreas E. <ar...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs16:/tmp/cvs-serv20639

Modified Files:
	rat3b.lisp simp.lisp lmdcls.lisp 
Log Message:
removed object declarations.


Index: rat3b.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/rat3b.lisp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rat3b.lisp	25 Mar 2007 23:36:36 -0000	1.8
+++ rat3b.lisp	23 Apr 2007 20:44:22 -0000	1.9
@@ -130,7 +130,6 @@
   (ratplus x (ratminus y))) 
 
 (defmfun ratfact (x fn)
-  (declare (object fn))
   (cond ((and $keepfloat (or (pfloatp (car x)) (pfloatp (cdr x)))
 	      (setq fn 'floatfact) nil))
 	((not (equal (cdr x) 1))

Index: simp.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/simp.lisp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- simp.lisp	20 Apr 2007 20:48:03 -0000	1.36
+++ simp.lisp	23 Apr 2007 20:44:22 -0000	1.37
@@ -196,8 +196,9 @@
 (defmfun $bfloatp (x) (and (not (atom x)) (eq (caar x) 'bigfloat)))
 
 (defmfun mnump (x)
-  (or (numberp x) (and (not (atom x))(not (atom (car x)))
-		       (memq (caar x) '(rat bigfloat)))))
+  (or (numberp x)
+      (and (not (atom x)) (not (atom (car x)))
+	   (member (caar x) '(rat bigfloat)))))
 
 ;; EVEN works for any arbitrary lisp object since it does an integer
 ;; check first.  In other cases, you may want the Lisp EVENP function
@@ -410,7 +411,8 @@
   (declare (ignore ign)) ; Arg ignored.  Function used for mapping down lists.
   *const*)
 
-(defun constmx (*const* x) (simplifya (fmapl1 'constfun x) t))
+(defun constmx (*const* x)
+  (simplifya (fmapl1 'constfun x) t))
 
 (defmfun isinop (exp var)		; VAR is assumed to be an atom
   (cond ((atom exp) nil)
@@ -553,7 +555,8 @@
 			    (t g)))))))
 
 (defun *red1 (x)
-  (cond ((memq 'simp (cdar x)) (cond ($float (fpcofrat x)) (t x)))
+  (cond ((memq 'simp (cdar x))
+	 (if $float (fpcofrat x) x))
 	(t (*red (cadr x) (caddr x)))))
 
 (defun *red (n d)
@@ -1315,7 +1318,6 @@
      (go again)))
 
 (defmfun signum1 (x)
-  (declare (object x))
   (cond ((mnump x)
 	 (setq x (num1 x)) (cond ((plusp x) 1) ((minusp x) -1) (t 0))) 
 	((atom x) 1)
@@ -1929,7 +1931,6 @@
   (and (symbolp e) (kindp e '$real)))
 
 (defmfun great (x y)
-  (declare (object y))
   (cond ((atom x)
 	 (cond ((atom y)
 		(cond ((numberp x)
@@ -2427,7 +2428,8 @@
 
 (defvar *afterflag nil)
 
-(defmfun matcherr nil (throw 'match nil))
+(defmfun matcherr ()
+  (throw 'match nil))
 
 (defmfun kar (x) (if (atom x) (matcherr) (car x)))
 

Index: lmdcls.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/lmdcls.lisp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- lmdcls.lisp	23 Apr 2007 20:24:52 -0000	1.17
+++ lmdcls.lisp	23 Apr 2007 20:44:22 -0000	1.18
@@ -147,4 +147,4 @@
   $maxtaydiff $verbose $psexpand ps-bmt-disrep
   silent-taylor-flag $define_variable $infolists))
 
-(declaim (declaration unspecial flonum *lexpr *fexpr *expr macros array* object))
+(declaim (declaration unspecial flonum *lexpr *fexpr *expr macros array*))