diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2005-05-02 19:41:55 +0000 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2005-05-02 19:41:55 +0000 |
| commit | 8f4a8efc4624ecfca5f073e6426088368091c040 (patch) | |
| tree | 8d6218b13e2687f46789f7cbd5733fd2c1f640ab /lisp | |
| parent | 14e39ad48dd871738ea75ecbecc34636054a9f9d (diff) | |
| download | emacs-8f4a8efc4624ecfca5f073e6426088368091c040.tar.gz | |
(calc-read-number-fancy): Replace string-to-int by string-to-number.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/calc/calc-ext.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index d4d50d64658..df9f9512aaa 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -1,6 +1,6 @@ ;;; calc-ext.el --- various extension functions for Calc -;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> ;; Maintainer: Jay Belanger <belanger@truman.edu> @@ -2815,7 +2815,7 @@ calc-kill calc-kill-region calc-yank)))) ;; Integer+fraction with explicit radix ((string-match "^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]*\\)[:/]\\([0-9a-zA-Z]*\\)[:/]\\([0-9a-zA-Z]\\)$" s) - (let ((radix (string-to-int (math-match-substring s 1))) + (let ((radix (string-to-number (math-match-substring s 1))) (int (math-match-substring s 3)) (num (math-match-substring s 4)) (den (math-match-substring s 5))) @@ -2829,7 +2829,7 @@ calc-kill calc-kill-region calc-yank)))) ;; Fraction with explicit radix ((string-match "^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]*\\)[:/]\\([0-9a-zA-Z]*\\)$" s) - (let ((radix (string-to-int (math-match-substring s 1))) + (let ((radix (string-to-number (math-match-substring s 1))) (num (math-match-substring s 3)) (den (math-match-substring s 4))) (let ((num (if (> (length num) 0) (math-read-radix num radix) 1)) @@ -2839,7 +2839,7 @@ calc-kill calc-kill-region calc-yank)))) ;; Float with explicit radix and exponent ((or (string-match "^0*\\(\\([2-9]\\|1[0-4]\\)\\(#\\|\\^\\^\\)[0-9a-dA-D.]+\\)[eE]\\([-+]?[0-9]+\\)$" s) (string-match "^\\(\\([0-9]+\\)\\(#\\|\\^\\^\\)[0-9a-zA-Z.]+\\) *\\* *\\2\\.? *\\^ *\\([-+]?[0-9]+\\)$" s)) - (let ((radix (string-to-int (math-match-substring s 2))) + (let ((radix (string-to-number (math-match-substring s 2))) (mant (math-match-substring s 1)) (exp (math-match-substring s 4))) (let ((mant (math-read-number mant)) @@ -2849,7 +2849,7 @@ calc-kill calc-kill-region calc-yank)))) ;; Float with explicit radix, no exponent ((string-match "^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]*\\)\\.\\([0-9a-zA-Z]*\\)$" s) - (let ((radix (string-to-int (math-match-substring s 1))) + (let ((radix (string-to-number (math-match-substring s 1))) (int (math-match-substring s 3)) (fracs (math-match-substring s 4))) (let ((int (if (> (length int) 0) (math-read-radix int radix) 0)) @@ -2861,7 +2861,7 @@ calc-kill calc-kill-region calc-yank)))) ;; Integer with explicit radix ((string-match "^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]+\\)$" s) (math-read-radix (math-match-substring s 3) - (string-to-int (math-match-substring s 1)))) + (string-to-number (math-match-substring s 1)))) ;; C language hexadecimal notation ((and (eq calc-language 'c) |