# HG changeset patch # User Jay Belanger # Date 1191208501 0 # Node ID 39018b7044de9610b93f0bc48461db30e73b2e1e # Parent 3788dd19e020b833d8224310244cfa998673c239 calc-math.el (math-largest-emacs-expt): Handle the cases when expt doesn't give range errors. diff -r 3788dd19e020 -r 39018b7044de lisp/calc/calc-math.el --- a/lisp/calc/calc-math.el Mon Oct 01 02:53:29 2007 +0000 +++ b/lisp/calc/calc-math.el Mon Oct 01 03:15:01 2007 +0000 @@ -53,17 +53,33 @@ ;;; is an Emacs float, for acceptable d.dddd.... (defvar math-largest-emacs-expt - (let ((x 1)) - (while (condition-case nil - (expt 10.0 x) - (error nil)) - (setq x (* 2 x))) - (setq x (/ x 2)) - (while (condition-case nil - (expt 10.0 x) - (error nil)) - (setq x (1+ x))) - (- x 2)) + (let ((x 1) + (pow 1e2)) + ;; The following loop is for efficiency; it should stop when + ;; 10^(2x) is too large. This could be indicated by a range + ;; error when computing 10^(2x), an infinite value for 10^(2x), + ;; or (!) a zero value for 10^(2x). + (while (and + pow + (< pow 1.0e+INF) + (> pow 0.0)) + (setq x (* 2 x)) + (setq pow (condition-case nil + (expt 10.0 (* 2 x)) + (error nil)))) + ;; The following loop should stop when 10^(x+1) is too large. + (setq pow (condition-case nil + (expt 10.0 (1+ x)) + (error nil))) + (while (and + pow + (< pow 1.0e+INF) + (> pow 0.0)) + (setq x (1+ x)) + (setq pow (condition-case nil + (expt 10.0 (1+ x)) + (error nil)))) + (1- x)) "The largest exponent which Calc will convert to an Emacs float.") (defvar math-smallest-emacs-expt