[Emacs-diffs] Changes to emacs/lisp/calc/calc-ext.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-ext.el
diff -c emacs/lisp/calc/calc-ext.el:1.39 emacs/lisp/calc/calc-ext.el:1.40
*** emacs/lisp/calc/calc-ext.el:1.39    Tue Feb 15 19:24:49 2005
--- emacs/lisp/calc/calc-ext.el Mon May  2 19:41:55 2005
***************
*** 1,6 ****
  ;;; calc-ext.el --- various extension functions for Calc
  
! ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2004 Free Software 
Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
  ;; Maintainer: Jay Belanger <address@hidden>
--- 1,6 ----
  ;;; calc-ext.el --- various extension functions for Calc
  
! ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2004, 2005 Free Software 
Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
  ;; Maintainer: Jay Belanger <address@hidden>
***************
*** 2815,2821 ****
  
     ;; 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)))
          (int (math-match-substring s 3))
          (num (math-match-substring s 4))
          (den (math-match-substring s 5)))
--- 2815,2821 ----
  
     ;; 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-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,2835 ****
  
     ;; 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)))
          (num (math-match-substring s 3))
          (den (math-match-substring s 4)))
        (let ((num (if (> (length num) 0) (math-read-radix num radix) 1))
--- 2829,2835 ----
  
     ;; Fraction with explicit radix
     ((string-match 
"^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]*\\)[:/]\\([0-9a-zA-Z]*\\)$" s)
!     (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,2845 ****
     ;; 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)))
          (mant (math-match-substring s 1))
          (exp (math-match-substring s 4)))
        (let ((mant (math-read-number mant))
--- 2839,2845 ----
     ;; 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-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,2855 ****
  
     ;; 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)))
          (int (math-match-substring s 3))
          (fracs (math-match-substring s 4)))
        (let ((int (if (> (length int) 0) (math-read-radix int radix) 0))
--- 2849,2855 ----
  
     ;; Float with explicit radix, no exponent
     ((string-match 
"^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]*\\)\\.\\([0-9a-zA-Z]*\\)$" s)
!     (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,2867 ****
     ;; 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))))
  
     ;; C language hexadecimal notation
     ((and (eq calc-language 'c)
--- 2861,2867 ----
     ;; Integer with explicit radix
     ((string-match "^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]+\\)$" s)
      (math-read-radix (math-match-substring s 3)
!                    (string-to-number (math-match-substring s 1))))
  
     ;; C language hexadecimal notation
     ((and (eq calc-language 'c)