aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2004-11-11 05:50:09 +0000
committerJay Belanger2004-11-11 05:50:09 +0000
commite59b8655da9616b4966bb1d5ed6419f1bfe029db (patch)
tree98c31afd4a8d27dd66c7000e610526b0c94afa16
parent3cedbf72177e9126af44caa02be0ccd27a5cd6bc (diff)
downloademacs-e59b8655da9616b4966bb1d5ed6419f1bfe029db.tar.gz
emacs-e59b8655da9616b4966bb1d5ed6419f1bfe029db.zip
(math-read-expr): Use declared variables math-exp-pos,
math-exp-old-pos, math-exp-str, math-exp-token, math-exp-keep-spaces.
-rw-r--r--lisp/calc/calc-ext.el22
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 2c7662277d6..ae6e6001c5e 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -2887,22 +2887,22 @@ calc-kill calc-kill-region calc-yank))))
2887 2887
2888(defvar math-expr-data) 2888(defvar math-expr-data)
2889 2889
2890(defun math-read-expr (exp-str) 2890(defun math-read-expr (math-exp-str)
2891 (let ((exp-pos 0) 2891 (let ((math-exp-pos 0)
2892 (exp-old-pos 0) 2892 (math-exp-old-pos 0)
2893 (exp-keep-spaces nil) 2893 (math-exp-keep-spaces nil)
2894 exp-token math-expr-data) 2894 math-exp-token math-expr-data)
2895 (while (setq exp-token (string-match "\\.\\.\\([^.]\\|.[^.]\\)" exp-str)) 2895 (while (setq math-exp-token (string-match "\\.\\.\\([^.]\\|.[^.]\\)" math-exp-str))
2896 (setq exp-str (concat (substring exp-str 0 exp-token) "\\dots" 2896 (setq math-exp-str (concat (substring math-exp-str 0 math-exp-token) "\\dots"
2897 (substring exp-str (+ exp-token 2))))) 2897 (substring math-exp-str (+ math-exp-token 2)))))
2898 (math-build-parse-table) 2898 (math-build-parse-table)
2899 (math-read-token) 2899 (math-read-token)
2900 (let ((val (catch 'syntax (math-read-expr-level 0)))) 2900 (let ((val (catch 'syntax (math-read-expr-level 0))))
2901 (if (stringp val) 2901 (if (stringp val)
2902 (list 'error exp-old-pos val) 2902 (list 'error math-exp-old-pos val)
2903 (if (equal exp-token 'end) 2903 (if (equal math-exp-token 'end)
2904 val 2904 val
2905 (list 'error exp-old-pos "Syntax error")))))) 2905 (list 'error math-exp-old-pos "Syntax error"))))))
2906 2906
2907(defun math-read-plain-expr (exp-str &optional error-check) 2907(defun math-read-plain-expr (exp-str &optional error-check)
2908 (let* ((calc-language nil) 2908 (let* ((calc-language nil)