[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 [emacs-unicode-2]
|
From: |
Miles Bader |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el [emacs-unicode-2] |
|
Date: |
Thu, 11 Nov 2004 22:02:36 -0500 |
Index: emacs/lisp/calc/calc-aent.el
diff -c emacs/lisp/calc/calc-aent.el:1.8.4.2
emacs/lisp/calc/calc-aent.el:1.8.4.3
*** emacs/lisp/calc/calc-aent.el:1.8.4.2 Fri Oct 22 10:13:34 2004
--- emacs/lisp/calc/calc-aent.el Fri Nov 12 02:53:01 2004
***************
*** 101,110 ****
(message "Result: %s" buf)))
(if (eq last-command-char 10)
(insert shortbuf)
! (setq kill-ring (cons shortbuf kill-ring))
! (when (> (length kill-ring) kill-ring-max)
! (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))
! (setq kill-ring-yank-pointer kill-ring)))))
(defun calc-do-calc-eval (str separator args)
(calc-check-defines)
--- 101,107 ----
(message "Result: %s" buf)))
(if (eq last-command-char 10)
(insert shortbuf)
! (kill-new shortbuf)))))
(defun calc-do-calc-eval (str separator args)
(calc-check-defines)
***************
*** 301,310 ****
(defvar calc-alg-ent-esc-map nil
"The keymap used for escapes in algebraic entry.")
(defun calc-do-alg-entry (&optional initial prompt no-normalize)
(let* ((calc-buffer (current-buffer))
(blink-paren-function 'calcAlg-blink-matching-open)
! (alg-exp 'error))
(unless calc-alg-ent-map
(setq calc-alg-ent-map (copy-keymap minibuffer-local-map))
(define-key calc-alg-ent-map "'" 'calcAlg-previous)
--- 298,309 ----
(defvar calc-alg-ent-esc-map nil
"The keymap used for escapes in algebraic entry.")
+ (defvar calc-alg-exp)
+
(defun calc-do-alg-entry (&optional initial prompt no-normalize)
(let* ((calc-buffer (current-buffer))
(blink-paren-function 'calcAlg-blink-matching-open)
! (calc-alg-exp 'error))
(unless calc-alg-ent-map
(setq calc-alg-ent-map (copy-keymap minibuffer-local-map))
(define-key calc-alg-ent-map "'" 'calcAlg-previous)
***************
*** 328,340 ****
(let ((buf (read-from-minibuffer (or prompt "Algebraic: ")
(or initial "")
calc-alg-ent-map nil)))
! (when (eq alg-exp 'error)
! (when (eq (car-safe (setq alg-exp (math-read-exprs buf))) 'error)
! (setq alg-exp nil)))
(setq calc-aborted-prefix "alg'")
(or no-normalize
! (and alg-exp (setq alg-exp (mapcar 'calc-normalize alg-exp))))
! alg-exp)))
(defun calcAlg-plus-minus ()
(interactive)
--- 327,339 ----
(let ((buf (read-from-minibuffer (or prompt "Algebraic: ")
(or initial "")
calc-alg-ent-map nil)))
! (when (eq calc-alg-exp 'error)
! (when (eq (car-safe (setq calc-alg-exp (math-read-exprs buf))) 'error)
! (setq calc-alg-exp nil)))
(setq calc-aborted-prefix "alg'")
(or no-normalize
! (and calc-alg-exp (setq calc-alg-exp (mapcar 'calc-normalize
calc-alg-exp))))
! calc-alg-exp)))
(defun calcAlg-plus-minus ()
(interactive)
***************
*** 364,371 ****
(interactive)
(unwind-protect
(calcAlg-enter)
! (if (consp alg-exp)
! (progn (setq prefix-arg (length alg-exp))
(calc-unread-command ?=)))))
(defun calcAlg-escape ()
--- 363,370 ----
(interactive)
(unwind-protect
(calcAlg-enter)
! (if (consp calc-alg-exp)
! (progn (setq prefix-arg (length calc-alg-exp))
(calc-unread-command ?=)))))
(defun calcAlg-escape ()
***************
*** 383,390 ****
(calc-minibuffer-contains
"\\`\\([^\"]*\"[^\"]*\"\\)*[^\"]*\"[^\"]*\\'"))
(insert "`")
! (setq alg-exp (minibuffer-contents))
! (and (> (length alg-exp) 0) (setq calc-previous-alg-entry alg-exp))
(exit-minibuffer)))
(defun calcAlg-enter ()
--- 382,389 ----
(calc-minibuffer-contains
"\\`\\([^\"]*\"[^\"]*\"\\)*[^\"]*\"[^\"]*\\'"))
(insert "`")
! (setq calc-alg-exp (minibuffer-contents))
! (and (> (length calc-alg-exp) 0) (setq calc-previous-alg-entry
calc-alg-exp))
(exit-minibuffer)))
(defun calcAlg-enter ()
***************
*** 402,408 ****
(calc-temp-minibuffer-message
(concat " [" (or (nth 2 exp) "Error") "]"))
(calc-clear-unread-commands))
! (setq alg-exp (if (calc-minibuffer-contains "\\` *\\[ *\\'")
'((incomplete vec))
exp))
(and (> (length str) 0) (setq calc-previous-alg-entry str))
--- 401,407 ----
(calc-temp-minibuffer-message
(concat " [" (or (nth 2 exp) "Error") "]"))
(calc-clear-unread-commands))
! (setq calc-alg-exp (if (calc-minibuffer-contains "\\` *\\[ *\\'")
'((incomplete vec))
exp))
(and (> (length str) 0) (setq calc-previous-alg-entry str))
***************
*** 460,489 ****
;;; Algebraic expression parsing. [Public]
! (defun math-read-exprs (exp-str)
! (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))
! (setq exp-str (concat (substring exp-str 0 exp-token) "\\dots"
! (substring exp-str (+ exp-token 2)))))
(math-build-parse-table)
(math-read-token)
(let ((val (catch 'syntax (math-read-expr-list))))
(if (stringp val)
! (list 'error exp-old-pos val)
! (if (equal exp-token 'end)
val
! (list 'error exp-old-pos "Syntax error"))))))
(defun math-read-expr-list ()
! (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)
--- 459,497 ----
;;; Algebraic expression parsing. [Public]
! ;;; The next few variables are local to math-read-exprs (and math-read-expr)
! ;;; but are set in functions they call.
!
! (defvar math-exp-pos)
! (defvar math-exp-str)
! (defvar math-exp-old-pos)
! (defvar math-exp-token)
! (defvar math-exp-keep-spaces)
!
! (defun math-read-exprs (math-exp-str)
! (let ((math-exp-pos 0)
! (math-exp-old-pos 0)
! (math-exp-keep-spaces nil)
! math-exp-token math-expr-data)
(if calc-language-input-filter
! (setq math-exp-str (funcall calc-language-input-filter math-exp-str)))
! (while (setq math-exp-token (string-match "\\.\\.\\([^.]\\|.[^.]\\)"
math-exp-str))
! (setq math-exp-str (concat (substring math-exp-str 0 math-exp-token)
"\\dots"
! (substring math-exp-str (+ math-exp-token 2)))))
(math-build-parse-table)
(math-read-token)
(let ((val (catch 'syntax (math-read-expr-list))))
(if (stringp val)
! (list 'error math-exp-old-pos val)
! (if (equal math-exp-token 'end)
val
! (list 'error math-exp-old-pos "Syntax error"))))))
(defun math-read-expr-list ()
! (let* ((math-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)
***************
*** 496,515 ****
(defvar calc-user-tokens nil)
(defvar calc-user-token-chars nil)
(defun math-build-parse-table ()
(let ((mtab (cdr (assq nil calc-user-parse-tables)))
(ltab (cdr (assq calc-language calc-user-parse-tables))))
(or (and (eq mtab calc-last-main-parse-table)
(eq ltab calc-last-lang-parse-table))
(let ((p (append mtab ltab))
! (toks nil))
(setq calc-user-parse-table p)
(setq calc-user-token-chars nil)
(while p
(math-find-user-tokens (car (car p)))
(setq p (cdr p)))
(setq calc-user-tokens (mapconcat 'identity
! (sort (mapcar 'car toks)
(function (lambda (x y)
(> (length x)
(length y)))))
--- 504,526 ----
(defvar calc-user-tokens nil)
(defvar calc-user-token-chars nil)
+ (defvar math-toks nil
+ "Tokens to pass between math-build-parse-table and math-find-user-tokens.")
+
(defun math-build-parse-table ()
(let ((mtab (cdr (assq nil calc-user-parse-tables)))
(ltab (cdr (assq calc-language calc-user-parse-tables))))
(or (and (eq mtab calc-last-main-parse-table)
(eq ltab calc-last-lang-parse-table))
(let ((p (append mtab ltab))
! (math-toks nil))
(setq calc-user-parse-table p)
(setq calc-user-token-chars nil)
(while p
(math-find-user-tokens (car (car p)))
(setq p (cdr p)))
(setq calc-user-tokens (mapconcat 'identity
! (sort (mapcar 'car math-toks)
(function (lambda (x y)
(> (length x)
(length y)))))
***************
*** 517,523 ****
calc-last-main-parse-table mtab
calc-last-lang-parse-table ltab)))))
! (defun math-find-user-tokens (p) ; uses "toks"
(while p
(cond ((and (stringp (car p))
(or (> (length (car p)) 1) (equal (car p) "$")
--- 528,534 ----
calc-last-main-parse-table mtab
calc-last-lang-parse-table ltab)))))
! (defun math-find-user-tokens (p)
(while p
(cond ((and (stringp (car p))
(or (> (length (car p)) 1) (equal (car p) "$")
***************
*** 528,536 ****
(setq s (concat "\\<" s)))
(if (string-match "[a-zA-Z0-9]\\'" s)
(setq s (concat s "\\>")))
! (or (assoc s toks)
(progn
! (setq toks (cons (list s) toks))
(or (memq (aref (car p) 0) calc-user-token-chars)
(setq calc-user-token-chars
(cons (aref (car p) 0)
--- 539,547 ----
(setq s (concat "\\<" s)))
(if (string-match "[a-zA-Z0-9]\\'" s)
(setq s (concat s "\\>")))
! (or (assoc s math-toks)
(progn
! (setq math-toks (cons (list s) math-toks))
(or (memq (aref (car p) 0) calc-user-token-chars)
(setq calc-user-token-chars
(cons (aref (car p) 0)
***************
*** 542,702 ****
(setq p (cdr p))))
(defun math-read-token ()
! (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)))
(string-match (if (memq calc-language '(c fortran pascal maple))
"[a-zA-Z0-9_#]*"
"[a-zA-Z0-9'#]*")
! 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))))))
((or (and (>= ch ?0) (<= ch ?9))
(and (eq ch '?\.)
! (eq (string-match "\\.[0-9]" exp-str exp-pos) exp-pos))
(and (eq ch '?_)
! (eq (string-match "_\\.?[0-9]" exp-str exp-pos) exp-pos)
! (or (eq exp-pos 0)
(and (memq calc-language '(nil flat big unform
tex eqn))
(eq (string-match "[^])}\"a-zA-Z0-9'$]_"
! exp-str (1- exp-pos))
! (1- exp-pos))))))
(or (and (eq calc-language 'c)
! (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)
(eq (string-match
"\\(\\$[0-9a-fA-F]+\\)\\($\\|[^0-9a-zA-Z]\\)"
! 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))
(if (eq calc-language 'eqn)
(progn
! (setq exp-str (copy-sequence exp-str))
! (aset exp-str (match-beginning 1) ?\{)
! (if (< (match-end 1) (length exp-str))
! (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))))
! (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" exp-str exp-pos)
! (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))
! (aset exp-str right ?\])))))))
((and (= ch ?\.) (eq calc-language 'fortran)
(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))
(math-read-token))
(t
(if (and (eq ch ?\{) (memq calc-language '(tex eqn)))
--- 553,720 ----
(setq p (cdr p))))
(defun math-read-token ()
! (if (>= math-exp-pos (length math-exp-str))
! (setq math-exp-old-pos math-exp-pos
! math-exp-token 'end
! math-expr-data "\000")
! (let ((ch (aref math-exp-str math-exp-pos)))
! (setq math-exp-old-pos math-exp-pos)
(cond ((memq ch '(32 10 9))
! (setq math-exp-pos (1+ math-exp-pos))
! (if math-exp-keep-spaces
! (setq math-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 math-exp-str
math-exp-pos)
! math-exp-pos)))
! (setq math-exp-token 'punc
! math-expr-data (math-match-substring math-exp-str 0)
! math-exp-pos (match-end 0)))
((or (and (>= ch ?a) (<= ch ?z))
(and (>= ch ?A) (<= ch ?Z)))
(string-match (if (memq calc-language '(c fortran pascal maple))
"[a-zA-Z0-9_#]*"
"[a-zA-Z0-9'#]*")
! math-exp-str math-exp-pos)
! (setq math-exp-token 'symbol
! math-exp-pos (match-end 0)
! math-expr-data (math-restore-dashes
! (math-match-substring math-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 math-exp-token 'punc
! math-expr-data (nth 2 code)))
(t
(math-read-token)
(math-read-token))))))
((or (and (>= ch ?0) (<= ch ?9))
(and (eq ch '?\.)
! (eq (string-match "\\.[0-9]" math-exp-str math-exp-pos)
! math-exp-pos))
(and (eq ch '?_)
! (eq (string-match "_\\.?[0-9]" math-exp-str math-exp-pos)
! math-exp-pos)
! (or (eq math-exp-pos 0)
(and (memq calc-language '(nil flat big unform
tex eqn))
(eq (string-match "[^])}\"a-zA-Z0-9'$]_"
! math-exp-str (1- math-exp-pos))
! (1- math-exp-pos))))))
(or (and (eq calc-language 'c)
! (string-match "0[xX][0-9a-fA-F]+" math-exp-str
math-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]+\\)?\"?\\)?"
! math-exp-str math-exp-pos))
! (setq math-exp-token 'number
! math-expr-data (math-match-substring math-exp-str 0)
! math-exp-pos (match-end 0)))
((eq ch ?\$)
(if (and (eq calc-language 'pascal)
(eq (string-match
"\\(\\$[0-9a-fA-F]+\\)\\($\\|[^0-9a-zA-Z]\\)"
! math-exp-str math-exp-pos)
! math-exp-pos))
! (setq math-exp-token 'number
! math-expr-data (math-match-substring math-exp-str 1)
! math-exp-pos (match-end 1))
! (if (eq (string-match "\\$\\([1-9][0-9]*\\)" math-exp-str
math-exp-pos)
! math-exp-pos)
! (setq math-expr-data (- (string-to-int (math-match-substring
! math-exp-str 1))))
! (string-match "\\$+" math-exp-str math-exp-pos)
! (setq math-expr-data (- (match-end 0) (match-beginning 0))))
! (setq math-exp-token 'dollar
! math-exp-pos (match-end 0))))
((eq ch ?\#)
! (if (eq (string-match "#\\([1-9][0-9]*\\)" math-exp-str
math-exp-pos)
! math-exp-pos)
! (setq math-expr-data (string-to-int
! (math-match-substring math-exp-str 1))
! math-exp-pos (match-end 0))
! (setq math-expr-data 1
! math-exp-pos (1+ math-exp-pos)))
! (setq math-exp-token 'hash))
((eq (string-match
"~=\\|<=\\|>=\\|<>\\|/=\\|\\+/-\\|\\\\dots\\|\\\\ldots\\|\\*\\*\\|<<\\|>>\\|==\\|!=\\|&&&\\||||\\|!!!\\|&&\\|||\\|!!\\|:=\\|::\\|=>"
! math-exp-str math-exp-pos)
! math-exp-pos)
! (setq math-exp-token 'punc
! math-expr-data (math-match-substring math-exp-str 0)
! math-exp-pos (match-end 0)))
((and (eq ch ?\")
! (string-match "\\(\"\\([^\"\\]\\|\\\\.\\)*\\)\\(\"\\|\\'\\)"
! math-exp-str math-exp-pos))
(if (eq calc-language 'eqn)
(progn
! (setq math-exp-str (copy-sequence math-exp-str))
! (aset math-exp-str (match-beginning 1) ?\{)
! (if (< (match-end 1) (length math-exp-str))
! (aset math-exp-str (match-end 1) ?\}))
(math-read-token))
! (setq math-exp-token 'string
! math-expr-data (math-match-substring math-exp-str 1)
! math-exp-pos (match-end 0))))
((and (= ch ?\\) (eq calc-language 'tex)
! (< math-exp-pos (1- (length math-exp-str))))
! (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}"
! math-exp-str math-exp-pos)
! (string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)"
! math-exp-str math-exp-pos))
! (setq math-exp-token 'symbol
! math-exp-pos (match-end 0)
! math-expr-data (math-restore-dashes
! (math-match-substring math-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 math-exp-token 'punc
! math-expr-data (nth 2 code)))
((and (eq (nth 1 code) 'mat)
! (string-match " *{" math-exp-str math-exp-pos))
! (setq math-exp-pos (match-end 0)
! math-exp-token 'punc
! math-expr-data "[")
! (let ((right (string-match "}" math-exp-str
math-exp-pos)))
(and right
! (setq math-exp-str (copy-sequence math-exp-str))
! (aset math-exp-str right ?\])))))))
((and (= ch ?\.) (eq calc-language 'fortran)
(eq (string-match "\\.[a-zA-Z][a-zA-Z][a-zA-Z]?\\."
! math-exp-str math-exp-pos) math-exp-pos))
! (setq math-exp-token 'punc
! math-expr-data (upcase (math-match-substring math-exp-str 0))
! math-exp-pos (match-end 0)))
((and (eq calc-language 'math)
! (eq (string-match "\\[\\[\\|->\\|:>" math-exp-str
math-exp-pos)
! math-exp-pos))
! (setq math-exp-token 'punc
! math-expr-data (math-match-substring math-exp-str 0)
! math-exp-pos (match-end 0)))
((and (eq calc-language 'eqn)
(eq (string-match "->\\|<-\\|+-\\|\\\\dots\\|~\\|\\^"
! math-exp-str math-exp-pos)
! math-exp-pos))
! (setq math-exp-token 'punc
! math-expr-data (math-match-substring math-exp-str 0)
! math-exp-pos (match-end 0))
! (and (eq (string-match "\\\\dots\\." math-exp-str math-exp-pos)
! math-exp-pos)
! (setq math-exp-pos (match-end 0)))
! (if (memq (aref math-expr-data 0) '(?~ ?^))
(math-read-token)))
! ((eq (string-match "%%.*$" math-exp-str math-exp-pos) math-exp-pos)
! (setq math-exp-pos (match-end 0))
(math-read-token))
(t
(if (and (eq ch ?\{) (memq calc-language '(tex eqn)))
***************
*** 705,713 ****
(setq ch ?\)))
(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)))))))
(defun math-read-expr-level (exp-prec &optional exp-term)
--- 723,731 ----
(setq ch ?\)))
(if (and (eq ch ?\&) (eq calc-language 'tex))
(setq ch ?\,))
! (setq math-exp-token 'punc
! math-expr-data (char-to-string ch)
! math-exp-pos (1+ math-exp-pos)))))))
(defun math-read-expr-level (exp-prec &optional exp-term)
***************
*** 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))
--- 734,743 ----
(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))
***************
*** 728,754 ****
(setq op op2))
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))
(let ((p calc-user-parse-table))
(while (and p
(or (not (integerp
(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))
--- 746,772 ----
(setq op op2))
t))
(and (or (eq (nth 2 op) -1)
! (memq math-exp-token '(symbol number dollar hash))
! (equal math-expr-data "(")
! (and (equal math-expr-data "[")
(not (eq calc-language 'math))
! (not (and math-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 math-exp-token 'symbol))
(let ((p calc-user-parse-table))
(while (and p
(or (not (integerp
(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
--- 805,817 ----
(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 math-exp-pos)
! (save-exp-old-pos math-exp-old-pos)
! (save-exp-token math-exp-token)
! (save-exp-data math-expr-data))
(or (not (listp
(setq matches (calc-match-user-syntax rule))))
(let ((args (progn
***************
*** 856,877 ****
(if match
(not (setq match (math-multi-subst
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)))
(defun calc-match-user-syntax (p &optional term)
(let ((matches nil)
! (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)))
--- 874,896 ----
(if match
(not (setq match (math-multi-subst
match args matches)))
! (setq math-exp-old-pos save-exp-old-pos
! math-exp-token save-exp-token
! math-expr-data save-exp-data
! math-exp-pos save-exp-pos)))))))
(setq p (cdr p)))
(and p match)))
(defun calc-match-user-syntax (p &optional term)
(let ((matches nil)
! (save-exp-pos math-exp-pos)
! (save-exp-old-pos math-exp-old-pos)
! (save-exp-token math-exp-token)
! (save-exp-data math-expr-data)
! m)
(while (and p
(cond ((stringp (car p))
! (and (equal math-expr-data (car p))
(progn
(math-read-token)
t)))
***************
*** 895,901 ****
(cons 'vec (and (listp m) m))))))
(or (listp m) (not (nth 2 (car p)))
(not (eq (aref (car (nth 2 (car p))) 0) ?\$))
! (eq exp-token 'end)))
(t
(setq m (calc-match-user-syntax (nth 1 (car p))
(car (nth 2 (car p)))))
--- 914,920 ----
(cons 'vec (and (listp m) m))))))
(or (listp m) (not (nth 2 (car p)))
(not (eq (aref (car (nth 2 (car p))) 0) ?\$))
! (eq math-exp-token 'end)))
(t
(setq m (calc-match-user-syntax (nth 1 (car p))
(car (nth 2 (car p)))))
***************
*** 903,924 ****
(let ((vec (cons 'vec m))
opos mm)
(while (and (listp
! (setq opos exp-pos
mm (calc-match-user-syntax
(or (nth 2 (car p))
(nth 1 (car p)))
(car (nth 2 (car p))))))
! (> exp-pos opos))
(setq vec (nconc vec mm)))
(setq matches (nconc matches (list vec))))
(and (eq (car (car p)) '*)
(setq matches (nconc matches (list '(vec)))))))))
(setq p (cdr p)))
(if p
! (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))
--- 922,943 ----
(let ((vec (cons 'vec m))
opos mm)
(while (and (listp
! (setq opos math-exp-pos
mm (calc-match-user-syntax
(or (nth 2 (car p))
(nth 1 (car p)))
(car (nth 2 (car p))))))
! (> math-exp-pos opos))
(setq vec (nconc vec mm)))
(setq matches (nconc matches (list vec))))
(and (eq (car (car p)) '*)
(setq matches (nconc matches (list '(vec)))))))))
(setq p (cdr p)))
(if p
! (setq math-exp-pos save-exp-pos
! math-exp-old-pos save-exp-old-pos
! math-exp-token save-exp-token
! math-expr-data save-exp-data
matches "Failed"))
matches))
***************
*** 940,967 ****
(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)
(throw 'syntax "Bad format")))
(math-read-token)
(if (and math-read-expr-quotes
--- 959,986 ----
(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 ((math-exp-pos math-exp-pos)
! math-exp-old-pos math-exp-token math-expr-data)
(math-read-token)
! (or (memq math-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 math-exp-token 'number)
! (let ((num (math-read-number math-expr-data)))
(if (not num)
(progn
! (setq math-exp-old-pos math-exp-pos)
(throw 'syntax "Bad format")))
(math-read-token)
(if (and math-read-expr-quotes
***************
*** 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)
--- 990,1003 ----
((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)
***************
*** 990,1009 ****
(equal (car op) "u-"))
(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)
(if (and (eq calc-language 'fortran) args
--- 1009,1028 ----
(equal (car op) "u-"))
(math-neg val))
(t (list (nth 1 op) val))))))
! ((eq math-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 math-exp-token 'end))
nil
(math-read-expr-list))))
! (if (not (or (equal math-expr-data calc-function-close)
! (eq math-exp-token 'end)))
(throw 'syntax "Expected `)'"))
(math-read-token)
(if (and (eq calc-language 'fortran) args
***************
*** 1045,1088 ****
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)))
(throw 'syntax (if calc-dollar-values
"Too many $'s"
"$'s not allowed in this context")))))
! ((eq exp-token 'hash)
(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)))
--- 1064,1107 ----
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 math-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)))
(throw 'syntax (if calc-dollar-values
"Too many $'s"
"$'s not allowed in this context")))))
! ((eq math-exp-token 'hash)
(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 ((math-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 ((math-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)))
--- 1109,1115 ----
(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,1138 ****
(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)
exp))
! ((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")))))
--- 1122,1157 ----
(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 math-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 math-exp-token 'end)))
(throw 'syntax "Expected `)'"))
(math-read-token)
exp))
! ((eq math-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")))))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el [emacs-unicode-2],
Miles Bader <=