From 1f26c38058f08b2af4188ca41ada1363e61f3be6 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Fri, 22 Jun 2007 01:05:10 +0000 Subject: [PATCH] (math-read-number-simple): New function. --- lisp/ChangeLog | 4 ++++ lisp/calc/calc.el | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 148374e0652..0725b9d3451 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-06-21 Jay Belanger + + * calc/calc.el (math-read-number-simple): New function. + 2007-06-21 Reto Zimmermann * vera-mode.el (vera-mode): Fix `commend-end-skip' setting. diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 6f37568ece4..96f93e0467b 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -3423,6 +3423,24 @@ See calc-keypad for details." ;; Syntax error! (t nil)))) +;;; Parse a very simple number, keeping all digits. +(defun math-read-number-simple (s) + (cond + ;; Integer + ((string-match "^[0-9]+$" s) + (cons 'bigpos (math-read-bignum s))) + ;; Minus sign + ((string-match "^-[0-9]+$" 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) (substring s (match-beginning n) (match-end n)) -- 2.39.2