diff options
Diffstat (limited to 'lisp/calc/calcalg2.el')
| -rw-r--r-- | lisp/calc/calcalg2.el | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el index 4a2fb053983..25b51fc89f6 100644 --- a/lisp/calc/calcalg2.el +++ b/lisp/calc/calcalg2.el @@ -1,7 +1,6 @@ ;;; calcalg2.el --- more algebraic functions for Calc -;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2011 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com> @@ -1886,9 +1885,9 @@ ;; math-scan-for-limits. (defvar calc-low) (defvar calc-high) -(defvar var) +(defvar math-var) -(defun calcFunc-table (expr var &optional calc-low calc-high step) +(defun calcFunc-table (expr math-var &optional calc-low calc-high step) (or calc-low (setq calc-low '(neg (var inf var-inf)) calc-high '(var inf var-inf))) (or calc-high (setq calc-high calc-low calc-low 1)) @@ -1917,7 +1916,7 @@ (math-working-step-2 (1+ count)) (math-working-step 0)) (setq expr (math-evaluate-expr - (math-expr-subst expr var '(var DUMMY var-DUMMY)))) + (math-expr-subst expr math-var '(var DUMMY var-DUMMY)))) (while (>= count 0) (setq math-working-step (1+ math-working-step) var-DUMMY calc-low @@ -1940,7 +1939,7 @@ (calc-record-why 'integerp calc-high)) (calc-record-why 'integerp calc-low))) (append (list (or math-tabulate-function 'calcFunc-table) - expr var) + expr math-var) (and (not (and (equal calc-low '(neg (var inf var-inf))) (equal calc-high '(var inf var-inf)))) (list calc-low calc-high)) @@ -1950,11 +1949,11 @@ (cond ((Math-primp x)) ((and (eq (car x) 'calcFunc-subscr) (Math-vectorp (nth 1 x)) - (math-expr-contains (nth 2 x) var)) + (math-expr-contains (nth 2 x) math-var)) (let* ((calc-next-why nil) - (low-val (math-solve-for (nth 2 x) 1 var nil)) + (low-val (math-solve-for (nth 2 x) 1 math-var nil)) (high-val (math-solve-for (nth 2 x) (1- (length (nth 1 x))) - var nil)) + math-var nil)) temp) (and low-val (math-realp low-val) high-val (math-realp high-val)) @@ -3669,5 +3668,4 @@ (provide 'calcalg2) -;; arch-tag: f2932ec8-dd63-418b-a542-11a644b9d4c4 ;;; calcalg2.el ends here |