Mercurial > emacs
changeset 105713:4d7b61a743cb
(math-read-number, math-read-number-simple): Use `save-match-data'.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Fri, 23 Oct 2009 01:39:04 +0000 |
| parents | 3f36e4d4d40c |
| children | f7cff45183ee |
| files | lisp/calc/calc.el |
| diffstat | 1 files changed, 78 insertions(+), 76 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calc/calc.el Thu Oct 22 19:31:43 2009 +0000 +++ b/lisp/calc/calc.el Fri Oct 23 01:39:04 2009 +0000 @@ -3526,88 +3526,90 @@ (defun math-read-number (s &optional decimal) "Convert the string S into a Calc number." (math-normalize - (cond - - ;; Integers (most common case) - ((string-match "\\` *\\([0-9]+\\) *\\'" s) - (let ((digs (math-match-substring s 1))) - (if (and (memq calc-language calc-lang-c-type-hex) - (> (length digs) 1) - (eq (aref digs 0) ?0) - (null decimal)) - (math-read-number (concat "8#" digs)) - (if (<= (length digs) (* 2 math-bignum-digit-length)) - (string-to-number digs) - (cons 'bigpos (math-read-bignum digs)))))) - - ;; Clean up the string if necessary - ((string-match "\\`\\(.*\\)[ \t\n]+\\([^\001]*\\)\\'" s) - (math-read-number (concat (math-match-substring s 1) - (math-match-substring s 2)))) - - ;; Plus and minus signs - ((string-match "^[-_+]\\(.*\\)$" s) - (let ((val (math-read-number (math-match-substring s 1)))) - (and val (if (eq (aref s 0) ?+) val (math-neg val))))) - - ;; Forms that require extensions module - ((string-match "[^-+0-9eE.]" s) - (require 'calc-ext) - (math-read-number-fancy s)) - - ;; Decimal point - ((string-match "^\\([0-9]*\\)\\.\\([0-9]*\\)$" s) - (let ((int (math-match-substring s 1)) - (frac (math-match-substring s 2))) - (let ((ilen (length int)) - (flen (length frac))) - (let ((int (if (> ilen 0) (math-read-number int t) 0)) - (frac (if (> flen 0) (math-read-number frac t) 0))) - (and int frac (or (> ilen 0) (> flen 0)) - (list 'float - (math-add (math-scale-int int flen) frac) - (- flen))))))) - - ;; "e" notation - ((string-match "^\\(.*\\)[eE]\\([-+]?[0-9]+\\)$" s) - (let ((mant (math-match-substring s 1)) - (exp (math-match-substring s 2))) - (let ((mant (if (> (length mant) 0) (math-read-number mant t) 1)) - (exp (if (<= (length exp) (if (memq (aref exp 0) '(?+ ?-)) 8 7)) - (string-to-number exp)))) - (and mant exp (Math-realp mant) (> exp -4000000) (< exp 4000000) - (let ((mant (math-float mant))) - (list 'float (nth 1 mant) (+ (nth 2 mant) exp))))))) - - ;; Syntax error! - (t nil)))) + (save-match-data + (cond + + ;; Integers (most common case) + ((string-match "\\` *\\([0-9]+\\) *\\'" s) + (let ((digs (math-match-substring s 1))) + (if (and (memq calc-language calc-lang-c-type-hex) + (> (length digs) 1) + (eq (aref digs 0) ?0) + (null decimal)) + (math-read-number (concat "8#" digs)) + (if (<= (length digs) (* 2 math-bignum-digit-length)) + (string-to-number digs) + (cons 'bigpos (math-read-bignum digs)))))) + + ;; Clean up the string if necessary + ((string-match "\\`\\(.*\\)[ \t\n]+\\([^\001]*\\)\\'" s) + (math-read-number (concat (math-match-substring s 1) + (math-match-substring s 2)))) + + ;; Plus and minus signs + ((string-match "^[-_+]\\(.*\\)$" s) + (let ((val (math-read-number (math-match-substring s 1)))) + (and val (if (eq (aref s 0) ?+) val (math-neg val))))) + + ;; Forms that require extensions module + ((string-match "[^-+0-9eE.]" s) + (require 'calc-ext) + (math-read-number-fancy s)) + + ;; Decimal point + ((string-match "^\\([0-9]*\\)\\.\\([0-9]*\\)$" s) + (let ((int (math-match-substring s 1)) + (frac (math-match-substring s 2))) + (let ((ilen (length int)) + (flen (length frac))) + (let ((int (if (> ilen 0) (math-read-number int t) 0)) + (frac (if (> flen 0) (math-read-number frac t) 0))) + (and int frac (or (> ilen 0) (> flen 0)) + (list 'float + (math-add (math-scale-int int flen) frac) + (- flen))))))) + + ;; "e" notation + ((string-match "^\\(.*\\)[eE]\\([-+]?[0-9]+\\)$" s) + (let ((mant (math-match-substring s 1)) + (exp (math-match-substring s 2))) + (let ((mant (if (> (length mant) 0) (math-read-number mant t) 1)) + (exp (if (<= (length exp) (if (memq (aref exp 0) '(?+ ?-)) 8 7)) + (string-to-number exp)))) + (and mant exp (Math-realp mant) (> exp -4000000) (< exp 4000000) + (let ((mant (math-float mant))) + (list 'float (nth 1 mant) (+ (nth 2 mant) exp))))))) + + ;; Syntax error! + (t nil))))) ;;; Parse a very simple number, keeping all digits. (defun math-read-number-simple (s) "Convert the string S into a Calc number. S is assumed to be a simple number (integer or float without an exponent) and all digits are kept, regardless of Calc's current precision." - (cond - ;; Integer - ((string-match "^[0-9]+$" s) - (if (string-match "^\\(0+\\)" s) - (setq s (substring s (match-end 0)))) - (if (<= (length s) (* 2 math-bignum-digit-length)) - (string-to-number s) - (cons 'bigpos (math-read-bignum s)))) - ;; Minus sign - ((string-match "^-[0-9]+$" s) - (if (<= (length s) (1+ (* 2 math-bignum-digit-length))) - (string-to-number s) - (cons 'bigneg (math-read-bignum (substring s 1))))) - ;; Decimal point - ((string-match "^\\(-?[0-9]*\\)\\.\\([0-9]*\\)$" s) - (let ((int (math-match-substring s 1)) - (frac (math-match-substring s 2))) - (list 'float (math-read-number-simple (concat int frac)) - (- (length frac))))) - ;; Syntax error! - (t nil))) + (save-match-data + (cond + ;; Integer + ((string-match "^[0-9]+$" s) + (if (string-match "^\\(0+\\)" s) + (setq s (substring s (match-end 0)))) + (if (<= (length s) (* 2 math-bignum-digit-length)) + (string-to-number s) + (cons 'bigpos (math-read-bignum s)))) + ;; Minus sign + ((string-match "^-[0-9]+$" s) + (if (<= (length s) (1+ (* 2 math-bignum-digit-length))) + (string-to-number s) + (cons 'bigneg (math-read-bignum (substring s 1))))) + ;; Decimal point + ((string-match "^\\(-?[0-9]*\\)\\.\\([0-9]*\\)$" s) + (let ((int (math-match-substring s 1)) + (frac (math-match-substring s 2))) + (list 'float (math-read-number-simple (concat int frac)) + (- (length frac))))) + ;; Syntax error! + (t nil)))) (defun math-match-substring (s n) (if (match-beginning n)