[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el
|
From: |
Jay Belanger |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el |
|
Date: |
Tue, 09 Nov 2004 16:08:16 -0500 |
Index: emacs/lisp/calc/calc-aent.el
diff -c emacs/lisp/calc/calc-aent.el:1.12 emacs/lisp/calc/calc-aent.el:1.13
*** emacs/lisp/calc/calc-aent.el:1.12 Thu Oct 21 19:20:11 2004
--- emacs/lisp/calc/calc-aent.el Tue Nov 9 20:32:37 2004
***************
*** 464,470 ****
(let ((exp-pos 0)
(exp-old-pos 0)
(exp-keep-spaces nil)
! exp-token exp-data)
(if calc-language-input-filter
(setq exp-str (funcall calc-language-input-filter exp-str)))
(while (setq exp-token (string-match "\\.\\.\\([^.]\\|.[^.]\\)" exp-str))
--- 464,470 ----
(let ((exp-pos 0)
(exp-old-pos 0)
(exp-keep-spaces nil)
! exp-token math-expr-data)
(if calc-language-input-filter
(setq exp-str (funcall calc-language-input-filter exp-str)))
(while (setq exp-token (string-match "\\.\\.\\([^.]\\|.[^.]\\)" exp-str))
***************
*** 483,489 ****
(let* ((exp-keep-spaces nil)
(val (list (math-read-expr-level 0)))
(last val))
! (while (equal exp-data ",")
(math-read-token)
(let ((rest (list (math-read-expr-level 0))))
(setcdr last rest)
--- 483,489 ----
(let* ((exp-keep-spaces nil)
(val (list (math-read-expr-level 0)))
(last val))
! (while (equal math-expr-data ",")
(math-read-token)
(let ((rest (list (math-read-expr-level 0))))
(setcdr last rest)
***************
*** 545,565 ****
(if (>= exp-pos (length exp-str))
(setq exp-old-pos exp-pos
exp-token 'end
! exp-data "\000")
(let ((ch (aref exp-str exp-pos)))
(setq exp-old-pos exp-pos)
(cond ((memq ch '(32 10 9))
(setq exp-pos (1+ exp-pos))
(if exp-keep-spaces
(setq exp-token 'space
! exp-data " ")
(math-read-token)))
((and (memq ch calc-user-token-chars)
(let ((case-fold-search nil))
(eq (string-match calc-user-tokens exp-str exp-pos)
exp-pos)))
(setq exp-token 'punc
! exp-data (math-match-substring exp-str 0)
exp-pos (match-end 0)))
((or (and (>= ch ?a) (<= ch ?z))
(and (>= ch ?A) (<= ch ?Z)))
--- 545,565 ----
(if (>= exp-pos (length exp-str))
(setq exp-old-pos exp-pos
exp-token 'end
! math-expr-data "\000")
(let ((ch (aref exp-str exp-pos)))
(setq exp-old-pos exp-pos)
(cond ((memq ch '(32 10 9))
(setq exp-pos (1+ exp-pos))
(if exp-keep-spaces
(setq exp-token 'space
! math-expr-data " ")
(math-read-token)))
((and (memq ch calc-user-token-chars)
(let ((case-fold-search nil))
(eq (string-match calc-user-tokens exp-str exp-pos)
exp-pos)))
(setq exp-token 'punc
! math-expr-data (math-match-substring exp-str 0)
exp-pos (match-end 0)))
((or (and (>= ch ?a) (<= ch ?z))
(and (>= ch ?A) (<= ch ?Z)))
***************
*** 569,589 ****
exp-str exp-pos)
(setq exp-token 'symbol
exp-pos (match-end 0)
! exp-data (math-restore-dashes
(math-match-substring exp-str 0)))
(if (eq calc-language 'eqn)
! (let ((code (assoc exp-data math-eqn-ignore-words)))
(cond ((null code))
((null (cdr code))
(math-read-token))
((consp (nth 1 code))
(math-read-token)
! (if (assoc exp-data (cdr code))
! (setq exp-data (format "%s %s"
! (car code) exp-data))))
((eq (nth 1 code) 'punc)
(setq exp-token 'punc
! exp-data (nth 2 code)))
(t
(math-read-token)
(math-read-token))))))
--- 569,589 ----
exp-str exp-pos)
(setq exp-token 'symbol
exp-pos (match-end 0)
! math-expr-data (math-restore-dashes
(math-match-substring exp-str 0)))
(if (eq calc-language 'eqn)
! (let ((code (assoc math-expr-data math-eqn-ignore-words)))
(cond ((null code))
((null (cdr code))
(math-read-token))
((consp (nth 1 code))
(math-read-token)
! (if (assoc math-expr-data (cdr code))
! (setq math-expr-data (format "%s %s"
! (car code)
math-expr-data))))
((eq (nth 1 code) 'punc)
(setq exp-token 'punc
! math-expr-data (nth 2 code)))
(t
(math-read-token)
(math-read-token))))))
***************
*** 602,608 ****
(string-match "0[xX][0-9a-fA-F]+" exp-str exp-pos))
(string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*'
*\\)?\\(0*\\([2-9]\\|1[0-4]\\)\\(#\\|\\^\\^\\)[0-9a-dA-D.]+[eE][-+_]?[0-9]+\\|0*\\([2-9]\\|[0-2][0-9]\\|3[0-6]\\)\\(#\\|\\^\\^\\)[0-9a-zA-Z:.]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?"
exp-str exp-pos))
(setq exp-token 'number
! exp-data (math-match-substring exp-str 0)
exp-pos (match-end 0)))
((eq ch ?\$)
(if (and (eq calc-language 'pascal)
--- 602,608 ----
(string-match "0[xX][0-9a-fA-F]+" exp-str exp-pos))
(string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*'
*\\)?\\(0*\\([2-9]\\|1[0-4]\\)\\(#\\|\\^\\^\\)[0-9a-dA-D.]+[eE][-+_]?[0-9]+\\|0*\\([2-9]\\|[0-2][0-9]\\|3[0-6]\\)\\(#\\|\\^\\^\\)[0-9a-zA-Z:.]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?"
exp-str exp-pos))
(setq exp-token 'number
! math-expr-data (math-match-substring exp-str 0)
exp-pos (match-end 0)))
((eq ch ?\$)
(if (and (eq calc-language 'pascal)
***************
*** 611,640 ****
exp-str exp-pos)
exp-pos))
(setq exp-token 'number
! exp-data (math-match-substring exp-str 1)
exp-pos (match-end 1))
(if (eq (string-match "\\$\\([1-9][0-9]*\\)" exp-str exp-pos)
exp-pos)
! (setq exp-data (- (string-to-int (math-match-substring
exp-str 1))))
(string-match "\\$+" exp-str exp-pos)
! (setq exp-data (- (match-end 0) (match-beginning 0))))
(setq exp-token 'dollar
exp-pos (match-end 0))))
((eq ch ?\#)
(if (eq (string-match "#\\([1-9][0-9]*\\)" exp-str exp-pos)
exp-pos)
! (setq exp-data (string-to-int
(math-match-substring exp-str 1))
exp-pos (match-end 0))
! (setq exp-data 1
exp-pos (1+ exp-pos)))
(setq exp-token 'hash))
((eq (string-match
"~=\\|<=\\|>=\\|<>\\|/=\\|\\+/-\\|\\\\dots\\|\\\\ldots\\|\\*\\*\\|<<\\|>>\\|==\\|!=\\|&&&\\||||\\|!!!\\|&&\\|||\\|!!\\|:=\\|::\\|=>"
exp-str exp-pos)
exp-pos)
(setq exp-token 'punc
! exp-data (math-match-substring exp-str 0)
exp-pos (match-end 0)))
((and (eq ch ?\")
(string-match "\\(\"\\([^\"\\]\\|\\\\.\\)*\\)\\(\"\\|\\'\\)"
exp-str exp-pos))
--- 611,640 ----
exp-str exp-pos)
exp-pos))
(setq exp-token 'number
! math-expr-data (math-match-substring exp-str 1)
exp-pos (match-end 1))
(if (eq (string-match "\\$\\([1-9][0-9]*\\)" exp-str exp-pos)
exp-pos)
! (setq math-expr-data (- (string-to-int (math-match-substring
exp-str 1))))
(string-match "\\$+" exp-str exp-pos)
! (setq math-expr-data (- (match-end 0) (match-beginning 0))))
(setq exp-token 'dollar
exp-pos (match-end 0))))
((eq ch ?\#)
(if (eq (string-match "#\\([1-9][0-9]*\\)" exp-str exp-pos)
exp-pos)
! (setq math-expr-data (string-to-int
(math-match-substring exp-str 1))
exp-pos (match-end 0))
! (setq math-expr-data 1
exp-pos (1+ exp-pos)))
(setq exp-token 'hash))
((eq (string-match
"~=\\|<=\\|>=\\|<>\\|/=\\|\\+/-\\|\\\\dots\\|\\\\ldots\\|\\*\\*\\|<<\\|>>\\|==\\|!=\\|&&&\\||||\\|!!!\\|&&\\|||\\|!!\\|:=\\|::\\|=>"
exp-str exp-pos)
exp-pos)
(setq exp-token 'punc
! math-expr-data (math-match-substring exp-str 0)
exp-pos (match-end 0)))
((and (eq ch ?\")
(string-match "\\(\"\\([^\"\\]\\|\\\\.\\)*\\)\\(\"\\|\\'\\)"
exp-str exp-pos))
***************
*** 646,652 ****
(aset exp-str (match-end 1) ?\}))
(math-read-token))
(setq exp-token 'string
! exp-data (math-match-substring exp-str 1)
exp-pos (match-end 0))))
((and (= ch ?\\) (eq calc-language 'tex)
(< exp-pos (1- (length exp-str))))
--- 646,652 ----
(aset exp-str (match-end 1) ?\}))
(math-read-token))
(setq exp-token 'string
! math-expr-data (math-match-substring exp-str 1)
exp-pos (match-end 0))))
((and (= ch ?\\) (eq calc-language 'tex)
(< exp-pos (1- (length exp-str))))
***************
*** 654,673 ****
(string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)" exp-str
exp-pos))
(setq exp-token 'symbol
exp-pos (match-end 0)
! exp-data (math-restore-dashes
(math-match-substring exp-str 1)))
! (let ((code (assoc exp-data math-tex-ignore-words)))
(cond ((null code))
((null (cdr code))
(math-read-token))
((eq (nth 1 code) 'punc)
(setq exp-token 'punc
! exp-data (nth 2 code)))
((and (eq (nth 1 code) 'mat)
(string-match " *{" exp-str exp-pos))
(setq exp-pos (match-end 0)
exp-token 'punc
! exp-data "[")
(let ((right (string-match "}" exp-str exp-pos)))
(and right
(setq exp-str (copy-sequence exp-str))
--- 654,673 ----
(string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)" exp-str
exp-pos))
(setq exp-token 'symbol
exp-pos (match-end 0)
! math-expr-data (math-restore-dashes
(math-match-substring exp-str 1)))
! (let ((code (assoc math-expr-data math-tex-ignore-words)))
(cond ((null code))
((null (cdr code))
(math-read-token))
((eq (nth 1 code) 'punc)
(setq exp-token 'punc
! math-expr-data (nth 2 code)))
((and (eq (nth 1 code) 'mat)
(string-match " *{" exp-str exp-pos))
(setq exp-pos (match-end 0)
exp-token 'punc
! math-expr-data "[")
(let ((right (string-match "}" exp-str exp-pos)))
(and right
(setq exp-str (copy-sequence exp-str))
***************
*** 676,699 ****
(eq (string-match "\\.[a-zA-Z][a-zA-Z][a-zA-Z]?\\."
exp-str exp-pos) exp-pos))
(setq exp-token 'punc
! exp-data (upcase (math-match-substring exp-str 0))
exp-pos (match-end 0)))
((and (eq calc-language 'math)
(eq (string-match "\\[\\[\\|->\\|:>" exp-str exp-pos)
exp-pos))
(setq exp-token 'punc
! exp-data (math-match-substring exp-str 0)
exp-pos (match-end 0)))
((and (eq calc-language 'eqn)
(eq (string-match "->\\|<-\\|+-\\|\\\\dots\\|~\\|\\^"
exp-str exp-pos)
exp-pos))
(setq exp-token 'punc
! exp-data (math-match-substring exp-str 0)
exp-pos (match-end 0))
(and (eq (string-match "\\\\dots\\." exp-str exp-pos) exp-pos)
(setq exp-pos (match-end 0)))
! (if (memq (aref exp-data 0) '(?~ ?^))
(math-read-token)))
((eq (string-match "%%.*$" exp-str exp-pos) exp-pos)
(setq exp-pos (match-end 0))
--- 676,699 ----
(eq (string-match "\\.[a-zA-Z][a-zA-Z][a-zA-Z]?\\."
exp-str exp-pos) exp-pos))
(setq exp-token 'punc
! math-expr-data (upcase (math-match-substring exp-str 0))
exp-pos (match-end 0)))
((and (eq calc-language 'math)
(eq (string-match "\\[\\[\\|->\\|:>" exp-str exp-pos)
exp-pos))
(setq exp-token 'punc
! math-expr-data (math-match-substring exp-str 0)
exp-pos (match-end 0)))
((and (eq calc-language 'eqn)
(eq (string-match "->\\|<-\\|+-\\|\\\\dots\\|~\\|\\^"
exp-str exp-pos)
exp-pos))
(setq exp-token 'punc
! math-expr-data (math-match-substring exp-str 0)
exp-pos (match-end 0))
(and (eq (string-match "\\\\dots\\." exp-str exp-pos) exp-pos)
(setq exp-pos (match-end 0)))
! (if (memq (aref math-expr-data 0) '(?~ ?^))
(math-read-token)))
((eq (string-match "%%.*$" exp-str exp-pos) exp-pos)
(setq exp-pos (match-end 0))
***************
*** 706,712 ****
(if (and (eq ch ?\&) (eq calc-language 'tex))
(setq ch ?\,))
(setq exp-token 'punc
! exp-data (char-to-string ch)
exp-pos (1+ exp-pos)))))))
--- 706,712 ----
(if (and (eq ch ?\&) (eq calc-language 'tex))
(setq ch ?\,))
(setq exp-token 'punc
! math-expr-data (char-to-string ch)
exp-pos (1+ exp-pos)))))))
***************
*** 716,725 ****
(setq op (calc-check-user-syntax x exp-prec))
(setq x op
op '("2x" ident 999999 -1)))
! (and (setq op (assoc exp-data math-expr-opers))
(/= (nth 2 op) -1)
(or (and (setq op2 (assoc
! exp-data
(cdr (memq op math-expr-opers))))
(eq (= (nth 3 op) -1)
(/= (nth 3 op2) -1))
--- 716,725 ----
(setq op (calc-check-user-syntax x exp-prec))
(setq x op
op '("2x" ident 999999 -1)))
! (and (setq op (assoc math-expr-data math-expr-opers))
(/= (nth 2 op) -1)
(or (and (setq op2 (assoc
! math-expr-data
(cdr (memq op math-expr-opers))))
(eq (= (nth 3 op) -1)
(/= (nth 3 op2) -1))
***************
*** 729,740 ****
t))
(and (or (eq (nth 2 op) -1)
(memq exp-token '(symbol number dollar hash))
! (equal exp-data "(")
! (and (equal exp-data "[")
(not (eq calc-language 'math))
(not (and exp-keep-spaces
(eq (car-safe x) 'vec)))))
! (or (not (setq op (assoc exp-data math-expr-opers)))
(/= (nth 2 op) -1))
(or (not calc-user-parse-table)
(not (eq exp-token 'symbol))
--- 729,740 ----
t))
(and (or (eq (nth 2 op) -1)
(memq exp-token '(symbol number dollar hash))
! (equal math-expr-data "(")
! (and (equal math-expr-data "[")
(not (eq calc-language 'math))
(not (and exp-keep-spaces
(eq (car-safe x) 'vec)))))
! (or (not (setq op (assoc math-expr-data
math-expr-opers)))
(/= (nth 2 op) -1))
(or (not calc-user-parse-table)
(not (eq exp-token 'symbol))
***************
*** 744,754 ****
(car (car (car p)))))
(not (equal
(nth 1 (car (car p)))
! exp-data))))
(setq p (cdr p)))
(not p)))
(setq op (assoc "2x" math-expr-opers))))
! (not (and exp-term (equal exp-data exp-term)))
(>= (nth 2 op) exp-prec))
(if (not (equal (car op) "2x"))
(math-read-token))
--- 744,754 ----
(car (car (car p)))))
(not (equal
(nth 1 (car (car p)))
! math-expr-data))))
(setq p (cdr p)))
(not p)))
(setq op (assoc "2x" math-expr-opers))))
! (not (and exp-term (equal math-expr-data exp-term)))
(>= (nth 2 op) exp-prec))
(if (not (equal (car op) "2x"))
(math-read-token))
***************
*** 787,799 ****
(if x
(and (integerp (car rule))
(>= (car rule) prec)
! (equal exp-data
(car (setq rule (cdr rule)))))
! (equal exp-data (car rule)))))
(let ((save-exp-pos exp-pos)
(save-exp-old-pos exp-old-pos)
(save-exp-token exp-token)
! (save-exp-data exp-data))
(or (not (listp
(setq matches (calc-match-user-syntax rule))))
(let ((args (progn
--- 787,799 ----
(if x
(and (integerp (car rule))
(>= (car rule) prec)
! (equal math-expr-data
(car (setq rule (cdr rule)))))
! (equal math-expr-data (car rule)))))
(let ((save-exp-pos exp-pos)
(save-exp-old-pos exp-old-pos)
(save-exp-token exp-token)
! (save-exp-data math-expr-data))
(or (not (listp
(setq matches (calc-match-user-syntax rule))))
(let ((args (progn
***************
*** 858,864 ****
match args matches)))
(setq exp-old-pos save-exp-old-pos
exp-token save-exp-token
! exp-data save-exp-data
exp-pos save-exp-pos)))))))
(setq p (cdr p)))
(and p match)))
--- 858,864 ----
match args matches)))
(setq exp-old-pos save-exp-old-pos
exp-token save-exp-token
! math-expr-data save-exp-data
exp-pos save-exp-pos)))))))
(setq p (cdr p)))
(and p match)))
***************
*** 868,877 ****
(save-exp-pos exp-pos)
(save-exp-old-pos exp-old-pos)
(save-exp-token exp-token)
! (save-exp-data exp-data))
(while (and p
(cond ((stringp (car p))
! (and (equal exp-data (car p))
(progn
(math-read-token)
t)))
--- 868,877 ----
(save-exp-pos exp-pos)
(save-exp-old-pos exp-old-pos)
(save-exp-token exp-token)
! (save-exp-data math-expr-data))
(while (and p
(cond ((stringp (car p))
! (and (equal math-expr-data (car p))
(progn
(math-read-token)
t)))
***************
*** 918,924 ****
(setq exp-pos save-exp-pos
exp-old-pos save-exp-old-pos
exp-token save-exp-token
! exp-data save-exp-data
matches "Failed"))
matches))
--- 918,924 ----
(setq exp-pos save-exp-pos
exp-old-pos save-exp-old-pos
exp-token save-exp-token
! math-expr-data save-exp-data
matches "Failed"))
matches))
***************
*** 940,964 ****
(defun math-read-if (cond op)
(let ((then (math-read-expr-level 0)))
! (or (equal exp-data ":")
(throw 'syntax "Expected ':'"))
(math-read-token)
(list 'calcFunc-if cond then (math-read-expr-level (nth 3 op)))))
(defun math-factor-after ()
(let ((exp-pos exp-pos)
! exp-old-pos exp-token exp-data)
(math-read-token)
(or (memq exp-token '(number symbol dollar hash string))
! (and (assoc exp-data '(("-") ("+") ("!") ("|") ("/")))
! (assoc (concat "u" exp-data) math-expr-opers))
! (eq (nth 2 (assoc exp-data math-expr-opers)) -1)
! (assoc exp-data '(("(") ("[") ("{"))))))
(defun math-read-factor ()
(let (op)
(cond ((eq exp-token 'number)
! (let ((num (math-read-number exp-data)))
(if (not num)
(progn
(setq exp-old-pos exp-pos)
--- 940,964 ----
(defun math-read-if (cond op)
(let ((then (math-read-expr-level 0)))
! (or (equal math-expr-data ":")
(throw 'syntax "Expected ':'"))
(math-read-token)
(list 'calcFunc-if cond then (math-read-expr-level (nth 3 op)))))
(defun math-factor-after ()
(let ((exp-pos exp-pos)
! exp-old-pos exp-token math-expr-data)
(math-read-token)
(or (memq exp-token '(number symbol dollar hash string))
! (and (assoc math-expr-data '(("-") ("+") ("!") ("|") ("/")))
! (assoc (concat "u" math-expr-data) math-expr-opers))
! (eq (nth 2 (assoc math-expr-data math-expr-opers)) -1)
! (assoc math-expr-data '(("(") ("[") ("{"))))))
(defun math-read-factor ()
(let (op)
(cond ((eq exp-token 'number)
! (let ((num (math-read-number math-expr-data)))
(if (not num)
(progn
(setq exp-old-pos exp-pos)
***************
*** 971,984 ****
((and calc-user-parse-table
(setq op (calc-check-user-syntax)))
op)
! ((or (equal exp-data "-")
! (equal exp-data "+")
! (equal exp-data "!")
! (equal exp-data "|")
! (equal exp-data "/"))
! (setq exp-data (concat "u" exp-data))
(math-read-factor))
! ((and (setq op (assoc exp-data math-expr-opers))
(eq (nth 2 op) -1))
(if (consp (nth 1 op))
(funcall (car (nth 1 op)) op)
--- 971,984 ----
((and calc-user-parse-table
(setq op (calc-check-user-syntax)))
op)
! ((or (equal math-expr-data "-")
! (equal math-expr-data "+")
! (equal math-expr-data "!")
! (equal math-expr-data "|")
! (equal math-expr-data "/"))
! (setq math-expr-data (concat "u" math-expr-data))
(math-read-factor))
! ((and (setq op (assoc math-expr-data math-expr-opers))
(eq (nth 2 op) -1))
(if (consp (nth 1 op))
(funcall (car (nth 1 op)) op)
***************
*** 991,1008 ****
(math-neg val))
(t (list (nth 1 op) val))))))
((eq exp-token 'symbol)
! (let ((sym (intern exp-data)))
(math-read-token)
! (if (equal exp-data calc-function-open)
(let ((f (assq sym math-expr-function-mapping)))
(math-read-token)
(if (consp (cdr f))
(funcall (car (cdr f)) f sym)
! (let ((args (if (or (equal exp-data calc-function-close)
(eq exp-token 'end))
nil
(math-read-expr-list))))
! (if (not (or (equal exp-data calc-function-close)
(eq exp-token 'end)))
(throw 'syntax "Expected `)'"))
(math-read-token)
--- 991,1008 ----
(math-neg val))
(t (list (nth 1 op) val))))))
((eq exp-token 'symbol)
! (let ((sym (intern math-expr-data)))
(math-read-token)
! (if (equal math-expr-data calc-function-open)
(let ((f (assq sym math-expr-function-mapping)))
(math-read-token)
(if (consp (cdr f))
(funcall (car (cdr f)) f sym)
! (let ((args (if (or (equal math-expr-data
calc-function-close)
(eq exp-token 'end))
nil
(math-read-expr-list))))
! (if (not (or (equal math-expr-data calc-function-close)
(eq exp-token 'end)))
(throw 'syntax "Expected `)'"))
(math-read-token)
***************
*** 1045,1062 ****
4))
(cdr v))))))
(while (and (memq calc-language '(c pascal maple))
! (equal exp-data "["))
(math-read-token)
(setq val (append (list 'calcFunc-subscr val)
(math-read-expr-list)))
! (if (equal exp-data "]")
(math-read-token)
(throw 'syntax "Expected ']'")))
val)))))
((eq exp-token 'dollar)
! (let ((abs (if (> exp-data 0) exp-data (- exp-data))))
(if (>= (length calc-dollar-values) abs)
! (let ((num exp-data))
(math-read-token)
(setq calc-dollar-used (max calc-dollar-used num))
(math-check-complete (nth (1- abs) calc-dollar-values)))
--- 1045,1062 ----
4))
(cdr v))))))
(while (and (memq calc-language '(c pascal maple))
! (equal math-expr-data "["))
(math-read-token)
(setq val (append (list 'calcFunc-subscr val)
(math-read-expr-list)))
! (if (equal math-expr-data "]")
(math-read-token)
(throw 'syntax "Expected ']'")))
val)))))
((eq exp-token 'dollar)
! (let ((abs (if (> math-expr-data 0) math-expr-data (-
math-expr-data))))
(if (>= (length calc-dollar-values) abs)
! (let ((num math-expr-data))
(math-read-token)
(setq calc-dollar-used (max calc-dollar-used num))
(math-check-complete (nth (1- abs) calc-dollar-values)))
***************
*** 1067,1088 ****
(or calc-hashes-used
(throw 'syntax "#'s not allowed in this context"))
(calc-extensions)
! (if (<= exp-data (length calc-arg-values))
! (let ((num exp-data))
(math-read-token)
(setq calc-hashes-used (max calc-hashes-used num))
(nth (1- num) calc-arg-values))
(throw 'syntax "Too many # arguments")))
! ((equal exp-data "(")
(let* ((exp (let ((exp-keep-spaces nil))
(math-read-token)
! (if (or (equal exp-data "\\dots")
! (equal exp-data "\\ldots"))
'(neg (var inf var-inf))
(math-read-expr-level 0)))))
(let ((exp-keep-spaces nil))
(cond
! ((equal exp-data ",")
(progn
(math-read-token)
(let ((exp2 (math-read-expr-level 0)))
--- 1067,1088 ----
(or calc-hashes-used
(throw 'syntax "#'s not allowed in this context"))
(calc-extensions)
! (if (<= math-expr-data (length calc-arg-values))
! (let ((num math-expr-data))
(math-read-token)
(setq calc-hashes-used (max calc-hashes-used num))
(nth (1- num) calc-arg-values))
(throw 'syntax "Too many # arguments")))
! ((equal math-expr-data "(")
(let* ((exp (let ((exp-keep-spaces nil))
(math-read-token)
! (if (or (equal math-expr-data "\\dots")
! (equal math-expr-data "\\ldots"))
'(neg (var inf var-inf))
(math-read-expr-level 0)))))
(let ((exp-keep-spaces nil))
(cond
! ((equal math-expr-data ",")
(progn
(math-read-token)
(let ((exp2 (math-read-expr-level 0)))
***************
*** 1090,1096 ****
(if (and exp2 (Math-realp exp) (Math-realp exp2))
(math-normalize (list 'cplx exp exp2))
(list '+ exp (list '* exp2 '(var i var-i))))))))
! ((equal exp-data ";")
(progn
(math-read-token)
(let ((exp2 (math-read-expr-level 0)))
--- 1090,1096 ----
(if (and exp2 (Math-realp exp) (Math-realp exp2))
(math-normalize (list 'cplx exp exp2))
(list '+ exp (list '* exp2 '(var i var-i))))))))
! ((equal math-expr-data ";")
(progn
(math-read-token)
(let ((exp2 (math-read-expr-level 0)))
***************
*** 1103,1124 ****
(list '*
(math-to-radians-2 exp2)
'(var i var-i)))))))))
! ((or (equal exp-data "\\dots")
! (equal exp-data "\\ldots"))
(progn
(math-read-token)
! (let ((exp2 (if (or (equal exp-data ")")
! (equal exp-data "]")
(eq exp-token 'end))
'(var inf var-inf)
(math-read-expr-level 0))))
(setq exp
(list 'intv
! (if (equal exp-data ")") 0 1)
exp
exp2)))))))
! (if (not (or (equal exp-data ")")
! (and (equal exp-data "]") (eq (car-safe exp) 'intv))
(eq exp-token 'end)))
(throw 'syntax "Expected `)'"))
(math-read-token)
--- 1103,1124 ----
(list '*
(math-to-radians-2 exp2)
'(var i var-i)))))))))
! ((or (equal math-expr-data "\\dots")
! (equal math-expr-data "\\ldots"))
(progn
(math-read-token)
! (let ((exp2 (if (or (equal math-expr-data ")")
! (equal math-expr-data "]")
(eq exp-token 'end))
'(var inf var-inf)
(math-read-expr-level 0))))
(setq exp
(list 'intv
! (if (equal math-expr-data ")") 0 1)
exp
exp2)))))))
! (if (not (or (equal math-expr-data ")")
! (and (equal math-expr-data "]") (eq (car-safe exp)
'intv))
(eq exp-token 'end)))
(throw 'syntax "Expected `)'"))
(math-read-token)
***************
*** 1126,1138 ****
((eq exp-token 'string)
(calc-extensions)
(math-read-string))
! ((equal exp-data "[")
(calc-extensions)
(math-read-brackets t "]"))
! ((equal exp-data "{")
(calc-extensions)
(math-read-brackets nil "}"))
! ((equal exp-data "<")
(calc-extensions)
(math-read-angle-brackets))
(t (throw 'syntax "Expected a number")))))
--- 1126,1138 ----
((eq exp-token 'string)
(calc-extensions)
(math-read-string))
! ((equal math-expr-data "[")
(calc-extensions)
(math-read-brackets t "]"))
! ((equal math-expr-data "{")
(calc-extensions)
(math-read-brackets nil "}"))
! ((equal math-expr-data "<")
(calc-extensions)
(math-read-angle-brackets))
(t (throw 'syntax "Expected a number")))))
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el,
Jay Belanger <=
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el, Jay Belanger, 2004/11/11
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el, Jay Belanger, 2004/11/23
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el, Jay Belanger, 2004/11/26
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el, Jay Belanger, 2004/11/29
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el, Jay Belanger, 2004/11/30