[Maxima-commits] CVS: maxima/src intpol.lisp,1.15,1.16

[Robert D. <rob...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18517/src

Modified Files:
	intpol.lisp 
Log Message:
Align code and documentation for find_root_error.
Resolves SF bug # 2937837 "find_root_error documentation incorrect".

Index: intpol.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/intpol.lisp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- intpol.lisp	21 Sep 2009 16:57:15 -0000	1.15
+++ intpol.lisp	25 Jan 2010 05:11:15 -0000	1.16
@@ -48,7 +48,7 @@
 	  (merror (intl:gettext "find_root: function has same sign at endpoints: ~M, ~M")
 		  `((mequal) ((f) ,a) ,fa)
 		  `((mequal) ((f) ,b) ,fb))
-	  (return-from find-root-subr $find_root_error)))
+	  (return-from find-root-subr '$find_root_error)))
     (when (plusp fa)
       (psetq fa fb
 	     fb fa
@@ -94,17 +94,21 @@
 	 (find-root-subr (coerce-float-fun fun-or-expr)
 			 (first args)
 			 (second args))
-       (if (numberp result)
-	   result
-	   `(($find_root) ,fun-or-expr ,left ,right))))
+     (if (numberp result)
+       result
+       (if (eq result '$find_root_error)
+         $find_root_error
+         `(($find_root) ,fun-or-expr ,left ,right)))))
     (3					;expr case: expr, var, lo, hi
      (multiple-value-bind (result left right)
 	 (find-root-subr (coerce-float-fun (sub ($lhs fun-or-expr) ($rhs fun-or-expr))
 					   `((mlist) ,(first args)))
 			 (second args)
 			 (third args))
-       (if (numberp result)
-	   result
-	   `(($find_root) ,fun-or-expr ,(first args) ,left ,right))))
+     (if (numberp result)
+       result
+       (if (eq result '$find_root_error)
+         $find_root_error
+         `(($find_root) ,fun-or-expr ,(first args) ,left ,right)))))
     (t					;wrong number of args
      (wna-err '$find_root))))