2001-11-19 07:44:56 +00:00
|
|
|
|
;;; calc-aent.el --- algebraic entry functions for Calc
|
|
|
|
|
|
2005-07-14 19:30:13 +00:00
|
|
|
|
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
|
2007-01-21 02:48:43 +00:00
|
|
|
|
;; 2005, 2006, 2007 Free Software Foundation, Inc.
|
2001-11-19 07:44:56 +00:00
|
|
|
|
|
|
|
|
|
;; Author: Dave Gillespie <daveg@synaptics.com>
|
2007-04-23 21:30:42 +00:00
|
|
|
|
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2007-03-19 20:59:53 +00:00
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2007-07-25 03:51:22 +00:00
|
|
|
|
;; the Free Software Foundation; either version 3, or (at your option)
|
2007-03-19 20:59:53 +00:00
|
|
|
|
;; any later version.
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
2007-03-19 20:59:53 +00:00
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
|
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
|
;; Boston, MA 02110-1301, USA.
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2001-11-19 07:44:56 +00:00
|
|
|
|
;;; Commentary:
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2001-11-19 07:44:56 +00:00
|
|
|
|
;;; Code:
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
;; This file is autoloaded from calc.el.
|
|
|
|
|
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(require 'calc-macs)
|
|
|
|
|
|
2006-07-20 20:23:06 +00:00
|
|
|
|
(defvar calc-quick-calc-history nil
|
|
|
|
|
"The history list for quick-calc.")
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calc-do-quick-calc ()
|
2006-07-20 20:23:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(calc-check-defines)
|
|
|
|
|
(if (eq major-mode 'calc-mode)
|
|
|
|
|
(calc-algebraic-entry t)
|
|
|
|
|
(let (buf shortbuf)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(calc-create-buffer)
|
|
|
|
|
(let* ((calc-command-flags nil)
|
|
|
|
|
(calc-dollar-values calc-quick-prev-results)
|
|
|
|
|
(calc-dollar-used 0)
|
|
|
|
|
(enable-recursive-minibuffers t)
|
|
|
|
|
(calc-language (if (memq calc-language '(nil big))
|
|
|
|
|
'flat calc-language))
|
2006-07-20 20:23:06 +00:00
|
|
|
|
(entry (calc-do-alg-entry "" "Quick calc: " t 'calc-quick-calc-history))
|
|
|
|
|
(alg-exp (mapcar 'math-evaluate-expr entry)))
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(when (and (= (length alg-exp) 1)
|
|
|
|
|
(eq (car-safe (car alg-exp)) 'calcFunc-assign)
|
|
|
|
|
(= (length (car alg-exp)) 3)
|
|
|
|
|
(eq (car-safe (nth 1 (car alg-exp))) 'var))
|
|
|
|
|
(set (nth 2 (nth 1 (car alg-exp))) (nth 2 (car alg-exp)))
|
|
|
|
|
(calc-refresh-evaltos (nth 2 (nth 1 (car alg-exp))))
|
|
|
|
|
(setq alg-exp (list (nth 2 (car alg-exp)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq calc-quick-prev-results alg-exp
|
|
|
|
|
buf (mapconcat (function (lambda (x)
|
|
|
|
|
(math-format-value x 1000)))
|
|
|
|
|
alg-exp
|
|
|
|
|
" ")
|
|
|
|
|
shortbuf buf)
|
|
|
|
|
(if (and (= (length alg-exp) 1)
|
|
|
|
|
(memq (car-safe (car alg-exp)) '(nil bigpos bigneg))
|
|
|
|
|
(< (length buf) 20)
|
|
|
|
|
(= calc-number-radix 10))
|
|
|
|
|
(setq buf (concat buf " ("
|
|
|
|
|
(let ((calc-number-radix 16))
|
|
|
|
|
(math-format-value (car alg-exp) 1000))
|
|
|
|
|
", "
|
|
|
|
|
(let ((calc-number-radix 8))
|
|
|
|
|
(math-format-value (car alg-exp) 1000))
|
2007-08-14 14:52:51 +00:00
|
|
|
|
", "
|
|
|
|
|
(let ((calc-number-radix 2))
|
|
|
|
|
(math-format-value (car alg-exp) 1000))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (and (integerp (car alg-exp))
|
|
|
|
|
(> (car alg-exp) 0)
|
|
|
|
|
(< (car alg-exp) 127))
|
|
|
|
|
(format ", \"%c\"" (car alg-exp))
|
|
|
|
|
"")
|
|
|
|
|
")")))
|
2001-11-11 10:26:44 +00:00
|
|
|
|
(if (and (< (length buf) (frame-width)) (= (length entry) 1)
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(featurep 'calc-ext))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(let ((long (concat (math-format-value (car entry) 1000)
|
|
|
|
|
" => " buf)))
|
2001-11-11 10:26:44 +00:00
|
|
|
|
(if (<= (length long) (- (frame-width) 8))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq buf long))))
|
|
|
|
|
(calc-handle-whys)
|
|
|
|
|
(message "Result: %s" buf)))
|
|
|
|
|
(if (eq last-command-char 10)
|
|
|
|
|
(insert shortbuf)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(kill-new shortbuf)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-do-calc-eval (str separator args)
|
|
|
|
|
(calc-check-defines)
|
|
|
|
|
(catch 'calc-error
|
|
|
|
|
(save-excursion
|
|
|
|
|
(calc-create-buffer)
|
|
|
|
|
(cond
|
|
|
|
|
((and (consp str) (not (symbolp (car str))))
|
|
|
|
|
(let ((calc-language nil)
|
2007-06-20 04:12:15 +00:00
|
|
|
|
(math-expr-opers (math-standard-ops))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(calc-internal-prec 12)
|
|
|
|
|
(calc-word-size 32)
|
|
|
|
|
(calc-symbolic-mode nil)
|
|
|
|
|
(calc-matrix-mode nil)
|
|
|
|
|
(calc-angle-mode 'deg)
|
|
|
|
|
(calc-number-radix 10)
|
|
|
|
|
(calc-leading-zeros nil)
|
|
|
|
|
(calc-group-digits nil)
|
|
|
|
|
(calc-point-char ".")
|
|
|
|
|
(calc-frac-format '(":" nil))
|
|
|
|
|
(calc-prefer-frac nil)
|
|
|
|
|
(calc-hms-format "%s@ %s' %s\"")
|
|
|
|
|
(calc-date-format '((H ":" mm C SS pp " ")
|
|
|
|
|
Www " " Mmm " " D ", " YYYY))
|
|
|
|
|
(calc-float-format '(float 0))
|
|
|
|
|
(calc-full-float-format '(float 0))
|
|
|
|
|
(calc-complex-format nil)
|
|
|
|
|
(calc-matrix-just nil)
|
|
|
|
|
(calc-full-vectors t)
|
|
|
|
|
(calc-break-vectors nil)
|
|
|
|
|
(calc-vector-commas ",")
|
|
|
|
|
(calc-vector-brackets "[]")
|
|
|
|
|
(calc-matrix-brackets '(R O))
|
|
|
|
|
(calc-complex-mode 'cplx)
|
|
|
|
|
(calc-infinite-mode nil)
|
|
|
|
|
(calc-display-strings nil)
|
|
|
|
|
(calc-simplify-mode nil)
|
|
|
|
|
(calc-display-working-message 'lots)
|
|
|
|
|
(strp (cdr str)))
|
|
|
|
|
(while strp
|
|
|
|
|
(set (car strp) (nth 1 strp))
|
|
|
|
|
(setq strp (cdr (cdr strp))))
|
|
|
|
|
(calc-do-calc-eval (car str) separator args)))
|
|
|
|
|
((eq separator 'eval)
|
|
|
|
|
(eval str))
|
|
|
|
|
((eq separator 'macro)
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(let* ((calc-buffer (current-buffer))
|
|
|
|
|
(calc-window (get-buffer-window calc-buffer))
|
|
|
|
|
(save-window (selected-window)))
|
|
|
|
|
(if calc-window
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(select-window calc-window)
|
|
|
|
|
(calc-execute-kbd-macro str nil (car args)))
|
|
|
|
|
(and (window-point save-window)
|
|
|
|
|
(select-window save-window)))
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
(select-window (get-largest-window))
|
|
|
|
|
(switch-to-buffer calc-buffer)
|
|
|
|
|
(calc-execute-kbd-macro str nil (car args)))))
|
|
|
|
|
nil)
|
|
|
|
|
((eq separator 'pop)
|
|
|
|
|
(or (not (integerp str))
|
|
|
|
|
(= str 0)
|
|
|
|
|
(calc-pop (min str (calc-stack-size))))
|
|
|
|
|
(calc-stack-size))
|
|
|
|
|
((eq separator 'top)
|
|
|
|
|
(and (integerp str)
|
|
|
|
|
(> str 0)
|
|
|
|
|
(<= str (calc-stack-size))
|
|
|
|
|
(math-format-value (calc-top-n str (car args)) 1000)))
|
|
|
|
|
((eq separator 'rawtop)
|
|
|
|
|
(and (integerp str)
|
|
|
|
|
(> str 0)
|
|
|
|
|
(<= str (calc-stack-size))
|
|
|
|
|
(calc-top-n str (car args))))
|
|
|
|
|
(t
|
|
|
|
|
(let* ((calc-command-flags nil)
|
|
|
|
|
(calc-next-why nil)
|
|
|
|
|
(calc-language (if (memq calc-language '(nil big))
|
|
|
|
|
'flat calc-language))
|
|
|
|
|
(calc-dollar-values (mapcar
|
|
|
|
|
(function
|
|
|
|
|
(lambda (x)
|
|
|
|
|
(if (stringp x)
|
|
|
|
|
(progn
|
|
|
|
|
(setq x (math-read-exprs x))
|
|
|
|
|
(if (eq (car-safe x)
|
|
|
|
|
'error)
|
|
|
|
|
(throw 'calc-error
|
|
|
|
|
(calc-eval-error
|
|
|
|
|
(cdr x)))
|
|
|
|
|
(car x)))
|
|
|
|
|
x)))
|
|
|
|
|
args))
|
|
|
|
|
(calc-dollar-used 0)
|
|
|
|
|
(res (if (stringp str)
|
|
|
|
|
(math-read-exprs str)
|
|
|
|
|
(list str)))
|
|
|
|
|
buf)
|
|
|
|
|
(if (eq (car res) 'error)
|
|
|
|
|
(calc-eval-error (cdr res))
|
|
|
|
|
(setq res (mapcar 'calc-normalize res))
|
|
|
|
|
(and (memq 'clear-message calc-command-flags)
|
|
|
|
|
(message ""))
|
|
|
|
|
(cond ((eq separator 'pred)
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (= (length res) 1)
|
|
|
|
|
(math-is-true (car res))
|
|
|
|
|
(calc-eval-error '(0 "Single value expected"))))
|
|
|
|
|
((eq separator 'raw)
|
|
|
|
|
(if (= (length res) 1)
|
|
|
|
|
(car res)
|
|
|
|
|
(calc-eval-error '(0 "Single value expected"))))
|
|
|
|
|
((eq separator 'list)
|
|
|
|
|
res)
|
|
|
|
|
((memq separator '(num rawnum))
|
|
|
|
|
(if (= (length res) 1)
|
|
|
|
|
(if (math-constp (car res))
|
|
|
|
|
(if (eq separator 'num)
|
|
|
|
|
(math-format-value (car res) 1000)
|
|
|
|
|
(car res))
|
|
|
|
|
(calc-eval-error
|
|
|
|
|
(list 0
|
|
|
|
|
(if calc-next-why
|
|
|
|
|
(calc-explain-why (car calc-next-why))
|
|
|
|
|
"Number expected"))))
|
|
|
|
|
(calc-eval-error '(0 "Single value expected"))))
|
|
|
|
|
((eq separator 'push)
|
|
|
|
|
(calc-push-list res)
|
|
|
|
|
nil)
|
|
|
|
|
(t (while res
|
|
|
|
|
(setq buf (concat buf
|
|
|
|
|
(and buf (or separator ", "))
|
|
|
|
|
(math-format-value (car res) 1000))
|
|
|
|
|
res (cdr res)))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
buf)))))))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2004-11-27 04:07:22 +00:00
|
|
|
|
(defvar calc-eval-error nil
|
|
|
|
|
"Determines how calc handles errors.
|
2006-12-10 23:48:40 +00:00
|
|
|
|
If nil, return a list containing the character position of error.
|
2004-11-27 04:07:22 +00:00
|
|
|
|
STRING means return error message as string rather than list.
|
2006-12-10 23:48:40 +00:00
|
|
|
|
The value t means abort and give an error message.")
|
2004-11-27 04:07:22 +00:00
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calc-eval-error (msg)
|
2004-11-27 04:07:22 +00:00
|
|
|
|
(if calc-eval-error
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (eq calc-eval-error 'string)
|
|
|
|
|
(nth 1 msg)
|
|
|
|
|
(error "%s" (nth 1 msg)))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
msg))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Reading an expression in algebraic form.
|
|
|
|
|
|
|
|
|
|
(defun calc-auto-algebraic-entry (&optional prefix)
|
|
|
|
|
(interactive "P")
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(calc-algebraic-entry prefix t))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-algebraic-entry (&optional prefix auto)
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(calc-wrapper
|
|
|
|
|
(let ((calc-language (if prefix nil calc-language))
|
2007-06-20 04:12:15 +00:00
|
|
|
|
(math-expr-opers (if prefix (math-standard-ops) (math-expr-ops))))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(calc-alg-entry (and auto (char-to-string last-command-char))))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2006-07-20 20:23:06 +00:00
|
|
|
|
(defvar calc-alg-entry-history nil
|
|
|
|
|
"History for algebraic entry.")
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calc-alg-entry (&optional initial prompt)
|
|
|
|
|
(let* ((sel-mode nil)
|
|
|
|
|
(calc-dollar-values (mapcar 'calc-get-stack-element
|
|
|
|
|
(nthcdr calc-stack-top calc-stack)))
|
|
|
|
|
(calc-dollar-used 0)
|
|
|
|
|
(calc-plain-entry t)
|
2006-07-20 20:23:06 +00:00
|
|
|
|
(alg-exp (calc-do-alg-entry initial prompt t 'calc-alg-entry-history)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (stringp alg-exp)
|
|
|
|
|
(progn
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(calc-alg-edit alg-exp))
|
|
|
|
|
(let* ((calc-simplify-mode (if (eq last-command-char ?\C-j)
|
|
|
|
|
'none
|
|
|
|
|
calc-simplify-mode))
|
|
|
|
|
(nvals (mapcar 'calc-normalize alg-exp)))
|
|
|
|
|
(while alg-exp
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(calc-record (if (featurep 'calc-ext) (car alg-exp) (car nvals))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
"alg'")
|
|
|
|
|
(calc-pop-push-record-list calc-dollar-used
|
|
|
|
|
(and (not (equal (car alg-exp)
|
|
|
|
|
(car nvals)))
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(featurep 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
"")
|
|
|
|
|
(list (car nvals)))
|
|
|
|
|
(setq alg-exp (cdr alg-exp)
|
|
|
|
|
nvals (cdr nvals)
|
|
|
|
|
calc-dollar-used 0)))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(calc-handle-whys))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2004-10-21 19:20:11 +00:00
|
|
|
|
(defvar calc-alg-ent-map nil
|
|
|
|
|
"The keymap used for algebraic entry.")
|
|
|
|
|
|
|
|
|
|
(defvar calc-alg-ent-esc-map nil
|
|
|
|
|
"The keymap used for escapes in algebraic entry.")
|
|
|
|
|
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(defvar calc-alg-exp)
|
|
|
|
|
|
2006-07-20 20:23:06 +00:00
|
|
|
|
(defun calc-do-alg-entry (&optional initial prompt no-normalize history)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(let* ((calc-buffer (current-buffer))
|
2001-11-13 07:27:27 +00:00
|
|
|
|
(blink-paren-function 'calcAlg-blink-matching-open)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(calc-alg-exp 'error))
|
2004-10-21 19:20:11 +00:00
|
|
|
|
(unless calc-alg-ent-map
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq calc-alg-ent-map (copy-keymap minibuffer-local-map))
|
|
|
|
|
(define-key calc-alg-ent-map "'" 'calcAlg-previous)
|
|
|
|
|
(define-key calc-alg-ent-map "`" 'calcAlg-edit)
|
|
|
|
|
(define-key calc-alg-ent-map "\C-m" 'calcAlg-enter)
|
|
|
|
|
(define-key calc-alg-ent-map "\C-j" 'calcAlg-enter)
|
2004-10-19 14:22:47 +00:00
|
|
|
|
(let ((i 33))
|
|
|
|
|
(setq calc-alg-ent-esc-map (copy-keymap esc-map))
|
|
|
|
|
(while (< i 127)
|
|
|
|
|
(aset (nth 1 calc-alg-ent-esc-map) i 'calcAlg-escape)
|
|
|
|
|
(setq i (1+ i)))))
|
|
|
|
|
(define-key calc-alg-ent-map "\e" nil)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (eq calc-algebraic-mode 'total)
|
|
|
|
|
(define-key calc-alg-ent-map "\e" calc-alg-ent-esc-map)
|
2006-07-20 20:23:06 +00:00
|
|
|
|
(define-key calc-alg-ent-map "\e+" 'calcAlg-plus-minus)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(define-key calc-alg-ent-map "\em" 'calcAlg-mod)
|
|
|
|
|
(define-key calc-alg-ent-map "\e=" 'calcAlg-equals)
|
|
|
|
|
(define-key calc-alg-ent-map "\e\r" 'calcAlg-equals)
|
2006-07-20 20:23:06 +00:00
|
|
|
|
(define-key calc-alg-ent-map "\ep" 'previous-history-element)
|
|
|
|
|
(define-key calc-alg-ent-map "\en" 'next-history-element)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(define-key calc-alg-ent-map "\e%" 'self-insert-command))
|
|
|
|
|
(setq calc-aborted-prefix nil)
|
|
|
|
|
(let ((buf (read-from-minibuffer (or prompt "Algebraic: ")
|
|
|
|
|
(or initial "")
|
2006-07-20 20:23:06 +00:00
|
|
|
|
calc-alg-ent-map nil history)))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(when (eq calc-alg-exp 'error)
|
|
|
|
|
(when (eq (car-safe (setq calc-alg-exp (math-read-exprs buf))) 'error)
|
|
|
|
|
(setq calc-alg-exp nil)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq calc-aborted-prefix "alg'")
|
|
|
|
|
(or no-normalize
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(and calc-alg-exp (setq calc-alg-exp (mapcar 'calc-normalize calc-alg-exp))))
|
|
|
|
|
calc-alg-exp)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calcAlg-plus-minus ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (calc-minibuffer-contains ".* \\'")
|
|
|
|
|
(insert "+/- ")
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(insert " +/- ")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calcAlg-mod ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (not (calc-minibuffer-contains ".* \\'"))
|
|
|
|
|
(insert " "))
|
|
|
|
|
(if (calc-minibuffer-contains ".* mod +\\'")
|
|
|
|
|
(if calc-previous-modulo
|
|
|
|
|
(insert (math-format-flat-expr calc-previous-modulo 0))
|
|
|
|
|
(beep))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(insert "mod ")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calcAlg-previous ()
|
|
|
|
|
(interactive)
|
2004-10-19 15:34:38 +00:00
|
|
|
|
(if (calc-minibuffer-contains "\\'")
|
2006-07-20 20:23:06 +00:00
|
|
|
|
(previous-history-element 1)
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(insert "'")))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calcAlg-equals ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(calcAlg-enter)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(if (consp calc-alg-exp)
|
|
|
|
|
(progn (setq prefix-arg (length calc-alg-exp))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(calc-unread-command ?=)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calcAlg-escape ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-unread-command)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(calc-select-buffer)
|
|
|
|
|
(use-local-map calc-mode-map))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(calcAlg-enter))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(defvar calc-plain-entry nil)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calcAlg-edit ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (or (not calc-plain-entry)
|
|
|
|
|
(calc-minibuffer-contains
|
|
|
|
|
"\\`\\([^\"]*\"[^\"]*\"\\)*[^\"]*\"[^\"]*\\'"))
|
|
|
|
|
(insert "`")
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq calc-alg-exp (minibuffer-contents))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(exit-minibuffer)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2004-11-27 04:07:22 +00:00
|
|
|
|
(defvar calc-buffer)
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calcAlg-enter ()
|
|
|
|
|
(interactive)
|
2001-11-11 10:26:44 +00:00
|
|
|
|
(let* ((str (minibuffer-contents))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(exp (and (> (length str) 0)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer calc-buffer)
|
|
|
|
|
(math-read-exprs str)))))
|
|
|
|
|
(if (eq (car-safe exp) 'error)
|
|
|
|
|
(progn
|
2001-11-11 10:26:44 +00:00
|
|
|
|
(goto-char (minibuffer-prompt-end))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(forward-char (nth 1 exp))
|
|
|
|
|
(beep)
|
|
|
|
|
(calc-temp-minibuffer-message
|
|
|
|
|
(concat " [" (or (nth 2 exp) "Error") "]"))
|
|
|
|
|
(calc-clear-unread-commands))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq calc-alg-exp (if (calc-minibuffer-contains "\\` *\\[ *\\'")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
'((incomplete vec))
|
|
|
|
|
exp))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(exit-minibuffer))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calcAlg-blink-matching-open ()
|
2004-12-19 06:59:33 +00:00
|
|
|
|
(let ((rightpt (point))
|
|
|
|
|
(leftpt nil)
|
|
|
|
|
(rightchar (preceding-char))
|
|
|
|
|
leftchar
|
|
|
|
|
rightsyntax
|
|
|
|
|
leftsyntax)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(condition-case ()
|
2004-12-19 06:59:33 +00:00
|
|
|
|
(setq leftpt (scan-sexps rightpt -1)
|
|
|
|
|
leftchar (char-after leftpt))
|
|
|
|
|
(error nil)))
|
|
|
|
|
(if (and leftpt
|
|
|
|
|
(or (and (= rightchar ?\))
|
|
|
|
|
(= leftchar ?\[))
|
|
|
|
|
(and (= rightchar ?\])
|
|
|
|
|
(= leftchar ?\()))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char leftpt)
|
|
|
|
|
(looking-at ".+\\(\\.\\.\\|\\\\dots\\|\\\\ldots\\)")))
|
|
|
|
|
(let ((leftsaved (aref (syntax-table) leftchar))
|
|
|
|
|
(rightsaved (aref (syntax-table) rightchar)))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(cond ((= leftchar ?\[)
|
|
|
|
|
(aset (syntax-table) leftchar (cons 4 ?\)))
|
|
|
|
|
(aset (syntax-table) rightchar (cons 5 ?\[)))
|
|
|
|
|
(t
|
|
|
|
|
(aset (syntax-table) leftchar (cons 4 ?\]))
|
|
|
|
|
(aset (syntax-table) rightchar (cons 5 ?\())))
|
|
|
|
|
(blink-matching-open))
|
|
|
|
|
(aset (syntax-table) leftchar leftsaved)
|
|
|
|
|
(aset (syntax-table) rightchar rightsaved)))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(blink-matching-open))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-alg-digit-entry ()
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(calc-alg-entry
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(cond ((eq last-command-char ?e)
|
|
|
|
|
(if (> calc-number-radix 14) (format "%d.^" calc-number-radix) "1e"))
|
|
|
|
|
((eq last-command-char ?#) (format "%d#" calc-number-radix))
|
|
|
|
|
((eq last-command-char ?_) "-")
|
|
|
|
|
((eq last-command-char ?@) "0@ ")
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(t (char-to-string last-command-char)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2004-11-27 04:07:22 +00:00
|
|
|
|
;; The variable calc-digit-value is initially declared in calc.el,
|
|
|
|
|
;; but can be set by calcDigit-algebraic and calcDigit-edit.
|
|
|
|
|
(defvar calc-digit-value)
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calcDigit-algebraic ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (calc-minibuffer-contains ".*[@oh] *[^'m ]+[^'m]*\\'")
|
|
|
|
|
(calcDigit-key)
|
2001-11-11 10:26:44 +00:00
|
|
|
|
(setq calc-digit-value (minibuffer-contents))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(exit-minibuffer)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calcDigit-edit ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(calc-unread-command)
|
2001-11-11 10:26:44 +00:00
|
|
|
|
(setq calc-digit-value (minibuffer-contents))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(exit-minibuffer))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Algebraic expression parsing. [Public]
|
|
|
|
|
|
2004-12-08 06:09:20 +00:00
|
|
|
|
(defvar math-read-replacement-list
|
|
|
|
|
'(;; Misc symbols
|
|
|
|
|
("±" "+/-") ; plus or minus
|
|
|
|
|
("×" "*") ; multiplication sign
|
|
|
|
|
("÷" ":") ; division sign
|
|
|
|
|
("−" "-") ; subtraction sign
|
|
|
|
|
("∕" "/") ; division sign
|
|
|
|
|
("∗" "*") ; asterisk multiplication
|
|
|
|
|
("∞" "inf") ; infinity symbol
|
|
|
|
|
("≤" "<=")
|
|
|
|
|
("≥" ">=")
|
|
|
|
|
("≦" "<=")
|
|
|
|
|
("≧" ">=")
|
|
|
|
|
;; fractions
|
|
|
|
|
("¼" "(1:4)") ; 1/4
|
|
|
|
|
("½" "(1:2)") ; 1/2
|
|
|
|
|
("¾" "(3:4)") ; 3/4
|
|
|
|
|
("⅓" "(1:3)") ; 1/3
|
|
|
|
|
("⅔" "(2:3)") ; 2/3
|
|
|
|
|
("⅕" "(1:5)") ; 1/5
|
|
|
|
|
("⅖" "(2:5)") ; 2/5
|
|
|
|
|
("⅗" "(3:5)") ; 3/5
|
|
|
|
|
("⅘" "(4:5)") ; 4/5
|
|
|
|
|
("⅙" "(1:6)") ; 1/6
|
|
|
|
|
("⅚" "(5:6)") ; 5/6
|
|
|
|
|
("⅛" "(1:8)") ; 1/8
|
|
|
|
|
("⅜" "(3:8)") ; 3/8
|
|
|
|
|
("⅝" "(5:8)") ; 5/8
|
|
|
|
|
("⅞" "(7:8)") ; 7/8
|
|
|
|
|
("⅟" "1:") ; 1/...
|
|
|
|
|
;; superscripts
|
|
|
|
|
("⁰" "0") ; 0
|
|
|
|
|
("¹" "1") ; 1
|
|
|
|
|
("²" "2") ; 2
|
|
|
|
|
("³" "3") ; 3
|
|
|
|
|
("⁴" "4") ; 4
|
|
|
|
|
("⁵" "5") ; 5
|
|
|
|
|
("⁶" "6") ; 6
|
|
|
|
|
("⁷" "7") ; 7
|
|
|
|
|
("⁸" "8") ; 8
|
|
|
|
|
("⁹" "9") ; 9
|
|
|
|
|
("⁺" "+") ; +
|
|
|
|
|
("⁻" "-") ; -
|
|
|
|
|
("⁽" "(") ; (
|
|
|
|
|
("⁾" ")") ; )
|
|
|
|
|
("ⁿ" "n") ; n
|
2005-04-05 03:50:26 +00:00
|
|
|
|
("ⁱ" "i") ; i
|
|
|
|
|
;; subscripts
|
|
|
|
|
("₀" "0") ; 0
|
|
|
|
|
("₁" "1") ; 1
|
|
|
|
|
("₂" "2") ; 2
|
|
|
|
|
("₃" "3") ; 3
|
|
|
|
|
("₄" "4") ; 4
|
|
|
|
|
("₅" "5") ; 5
|
|
|
|
|
("₆" "6") ; 6
|
|
|
|
|
("₇" "7") ; 7
|
|
|
|
|
("₈" "8") ; 8
|
|
|
|
|
("₉" "9") ; 9
|
|
|
|
|
("₊" "+") ; +
|
|
|
|
|
("₋" "-") ; -
|
|
|
|
|
("₍" "(") ; (
|
|
|
|
|
("₎" ")")) ; )
|
2004-12-08 06:09:20 +00:00
|
|
|
|
"A list whose elements (old new) indicate replacements to make
|
|
|
|
|
in Calc algebraic input.")
|
|
|
|
|
|
|
|
|
|
(defvar math-read-superscripts
|
|
|
|
|
"⁰¹²³⁴⁵⁶⁷⁸⁹⁺⁻⁽⁾ⁿⁱ" ; 0123456789+-()ni
|
|
|
|
|
"A string consisting of the superscripts allowed by Calc.")
|
|
|
|
|
|
2005-04-05 03:50:26 +00:00
|
|
|
|
(defvar math-read-subscripts
|
|
|
|
|
"₀₁₂₃₄₅₆₇₈₉₊₋₍₎" ; 0123456789+-()
|
|
|
|
|
"A string consisting of the subscripts allowed by Calc.")
|
|
|
|
|
|
2004-12-08 06:09:20 +00:00
|
|
|
|
(defun math-read-preprocess-string (str)
|
|
|
|
|
"Replace some substrings of STR by Calc equivalents."
|
|
|
|
|
(setq str
|
|
|
|
|
(replace-regexp-in-string (concat "[" math-read-superscripts "]+")
|
|
|
|
|
"^(\\&)" str))
|
2005-04-05 03:50:26 +00:00
|
|
|
|
(setq str
|
|
|
|
|
(replace-regexp-in-string (concat "[" math-read-subscripts "]+")
|
|
|
|
|
"_(\\&)" str))
|
2004-12-08 06:09:20 +00:00
|
|
|
|
(let ((rep-list math-read-replacement-list))
|
|
|
|
|
(while rep-list
|
|
|
|
|
(setq str
|
|
|
|
|
(replace-regexp-in-string (nth 0 (car rep-list))
|
|
|
|
|
(nth 1 (car rep-list)) str))
|
|
|
|
|
(setq rep-list (cdr rep-list))))
|
|
|
|
|
str)
|
|
|
|
|
|
2004-11-27 04:07:22 +00:00
|
|
|
|
;; The next few variables are local to math-read-exprs (and math-read-expr
|
|
|
|
|
;; in calc-ext.el), but are set in functions they call.
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
|
|
|
|
|
(defvar math-exp-pos)
|
|
|
|
|
(defvar math-exp-str)
|
|
|
|
|
(defvar math-exp-old-pos)
|
|
|
|
|
(defvar math-exp-token)
|
|
|
|
|
(defvar math-exp-keep-spaces)
|
2004-11-27 04:07:22 +00:00
|
|
|
|
(defvar math-expr-data)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
|
|
|
|
|
(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)
|
2004-11-23 05:58:20 +00:00
|
|
|
|
(setq math-exp-str (math-read-preprocess-string math-exp-str))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if calc-language-input-filter
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(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)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-build-parse-table)
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(let ((val (catch 'syntax (math-read-expr-list))))
|
|
|
|
|
(if (stringp val)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(list 'error math-exp-old-pos val)
|
|
|
|
|
(if (equal math-exp-token 'end)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
val
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(list 'error math-exp-old-pos "Syntax error"))))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-read-expr-list ()
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(let* ((math-exp-keep-spaces nil)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(val (list (math-read-expr-level 0)))
|
|
|
|
|
(last val))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(while (equal math-expr-data ",")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
|
|
|
|
(let ((rest (list (math-read-expr-level 0))))
|
|
|
|
|
(setcdr last rest)
|
|
|
|
|
(setq last rest)))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
val))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(defvar calc-user-parse-table nil)
|
|
|
|
|
(defvar calc-last-main-parse-table nil)
|
2007-11-16 23:48:26 +00:00
|
|
|
|
(defvar calc-last-user-lang-parse-table nil)
|
2001-11-19 07:44:56 +00:00
|
|
|
|
(defvar calc-last-lang-parse-table nil)
|
|
|
|
|
(defvar calc-user-tokens nil)
|
|
|
|
|
(defvar calc-user-token-chars nil)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(defvar math-toks nil
|
|
|
|
|
"Tokens to pass between math-build-parse-table and math-find-user-tokens.")
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun math-build-parse-table ()
|
|
|
|
|
(let ((mtab (cdr (assq nil calc-user-parse-tables)))
|
2007-11-16 23:48:26 +00:00
|
|
|
|
(ltab (cdr (assq calc-language calc-user-parse-tables)))
|
|
|
|
|
(lltab (get calc-language 'math-parse-table)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(or (and (eq mtab calc-last-main-parse-table)
|
2007-11-16 23:48:26 +00:00
|
|
|
|
(eq ltab calc-last-user-lang-parse-table)
|
|
|
|
|
(eq lltab calc-last-lang-parse-table))
|
|
|
|
|
(let ((p (append mtab ltab lltab))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(math-toks nil))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(sort (mapcar 'car math-toks)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(function (lambda (x y)
|
|
|
|
|
(> (length x)
|
|
|
|
|
(length y)))))
|
|
|
|
|
"\\|")
|
|
|
|
|
calc-last-main-parse-table mtab
|
2007-11-16 23:48:26 +00:00
|
|
|
|
calc-last-user-lang-parse-table ltab
|
|
|
|
|
calc-last-lang-parse-table lltab)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(defun math-find-user-tokens (p)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(while p
|
|
|
|
|
(cond ((and (stringp (car p))
|
|
|
|
|
(or (> (length (car p)) 1) (equal (car p) "$")
|
|
|
|
|
(equal (car p) "\""))
|
|
|
|
|
(string-match "[^a-zA-Z0-9]" (car p)))
|
|
|
|
|
(let ((s (regexp-quote (car p))))
|
|
|
|
|
(if (string-match "\\`[a-zA-Z0-9]" s)
|
|
|
|
|
(setq s (concat "\\<" s)))
|
|
|
|
|
(if (string-match "[a-zA-Z0-9]\\'" s)
|
|
|
|
|
(setq s (concat s "\\>")))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(or (assoc s math-toks)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(progn
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-toks (cons (list s) math-toks))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(or (memq (aref (car p) 0) calc-user-token-chars)
|
|
|
|
|
(setq calc-user-token-chars
|
|
|
|
|
(cons (aref (car p) 0)
|
|
|
|
|
calc-user-token-chars)))))))
|
|
|
|
|
((consp (car p))
|
|
|
|
|
(math-find-user-tokens (nth 1 (car p)))
|
|
|
|
|
(or (eq (car (car p)) '\?)
|
|
|
|
|
(math-find-user-tokens (nth 2 (car p))))))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(setq p (cdr p))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-read-token ()
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(if (>= math-exp-pos (length math-exp-str))
|
|
|
|
|
(setq math-exp-old-pos math-exp-pos
|
|
|
|
|
math-exp-token 'end
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data "\000")
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(let ((ch (aref math-exp-str math-exp-pos)))
|
|
|
|
|
(setq math-exp-old-pos math-exp-pos)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(cond ((memq ch '(32 10 9))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-pos (1+ math-exp-pos))
|
|
|
|
|
(if math-exp-keep-spaces
|
|
|
|
|
(setq math-exp-token 'space
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data " ")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)))
|
|
|
|
|
((and (memq ch calc-user-token-chars)
|
|
|
|
|
(let ((case-fold-search nil))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(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)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((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'#]*")
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-str math-exp-pos)
|
|
|
|
|
(setq math-exp-token 'symbol
|
|
|
|
|
math-exp-pos (match-end 0)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data (math-restore-dashes
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(math-match-substring math-exp-str 0)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (eq calc-language 'eqn)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(let ((code (assoc math-expr-data math-eqn-ignore-words)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(cond ((null code))
|
|
|
|
|
((null (cdr code))
|
|
|
|
|
(math-read-token))
|
|
|
|
|
((consp (nth 1 code))
|
|
|
|
|
(math-read-token)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(if (assoc math-expr-data (cdr code))
|
|
|
|
|
(setq math-expr-data (format "%s %s"
|
|
|
|
|
(car code) math-expr-data))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((eq (nth 1 code) 'punc)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-token 'punc
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data (nth 2 code)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(t
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(math-read-token))))))
|
|
|
|
|
((or (and (>= ch ?0) (<= ch ?9))
|
|
|
|
|
(and (eq ch '?\.)
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(eq (string-match "\\.[0-9]" math-exp-str math-exp-pos)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-pos))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(and (eq ch '?_)
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(eq (string-match "_\\.?[0-9]" math-exp-str math-exp-pos)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-pos)
|
|
|
|
|
(or (eq math-exp-pos 0)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(and (memq calc-language '(nil flat big unform
|
2005-01-31 06:21:31 +00:00
|
|
|
|
tex latex eqn))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(eq (string-match "[^])}\"a-zA-Z0-9'$]_"
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-str (1- math-exp-pos))
|
|
|
|
|
(1- math-exp-pos))))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(or (and (eq calc-language 'c)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(string-match "0[xX][0-9a-fA-F]+" math-exp-str math-exp-pos))
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(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]+\\)?\"?\\)?"
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
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)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((eq ch ?\$)
|
|
|
|
|
(if (and (eq calc-language 'pascal)
|
|
|
|
|
(eq (string-match
|
|
|
|
|
"\\(\\$[0-9a-fA-F]+\\)\\($\\|[^0-9a-zA-Z]\\)"
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
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)
|
2005-05-02 19:40:50 +00:00
|
|
|
|
(setq math-expr-data (- (string-to-number (math-match-substring
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-str 1))))
|
|
|
|
|
(string-match "\\$+" math-exp-str math-exp-pos)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(setq math-expr-data (- (match-end 0) (match-beginning 0))))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-token 'dollar
|
|
|
|
|
math-exp-pos (match-end 0))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((eq ch ?\#)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(if (eq (string-match "#\\([1-9][0-9]*\\)" math-exp-str math-exp-pos)
|
|
|
|
|
math-exp-pos)
|
2005-05-02 19:40:50 +00:00
|
|
|
|
(setq math-expr-data (string-to-number
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(math-match-substring math-exp-str 1))
|
|
|
|
|
math-exp-pos (match-end 0))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(setq math-expr-data 1
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-pos (1+ math-exp-pos)))
|
|
|
|
|
(setq math-exp-token 'hash))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((eq (string-match "~=\\|<=\\|>=\\|<>\\|/=\\|\\+/-\\|\\\\dots\\|\\\\ldots\\|\\*\\*\\|<<\\|>>\\|==\\|!=\\|&&&\\||||\\|!!!\\|&&\\|||\\|!!\\|:=\\|::\\|=>"
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
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)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((and (eq ch ?\")
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(string-match "\\(\"\\([^\"\\]\\|\\\\.\\)*\\)\\(\"\\|\\'\\)"
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-str math-exp-pos))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (eq calc-language 'eqn)
|
|
|
|
|
(progn
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(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) ?\}))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-token 'string
|
|
|
|
|
math-expr-data (math-match-substring math-exp-str 1)
|
|
|
|
|
math-exp-pos (match-end 0))))
|
2005-01-31 21:51:34 +00:00
|
|
|
|
((and (= ch ?\\) (eq calc-language 'tex)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(< math-exp-pos (1- (length math-exp-str))))
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}"
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-str math-exp-pos)
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)"
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-str math-exp-pos))
|
|
|
|
|
(setq math-exp-token 'symbol
|
|
|
|
|
math-exp-pos (match-end 0)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data (math-restore-dashes
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(math-match-substring math-exp-str 1)))
|
2005-01-31 21:51:34 +00:00
|
|
|
|
(let ((code (assoc math-expr-data math-latex-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 'latex)
|
|
|
|
|
(< math-exp-pos (1- (length math-exp-str))))
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}"
|
2005-01-31 21:51:34 +00:00
|
|
|
|
math-exp-str math-exp-pos)
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(string-match "\\\\text *{\\([a-zA-Z0-9]+\\)}"
|
2005-01-31 21:51:34 +00:00
|
|
|
|
math-exp-str math-exp-pos)
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)"
|
2005-01-31 21:51:34 +00:00
|
|
|
|
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)))
|
2005-02-19 19:59:49 +00:00
|
|
|
|
(let ((code (assoc math-expr-data math-tex-ignore-words))
|
|
|
|
|
envname)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(cond ((null code))
|
|
|
|
|
((null (cdr code))
|
|
|
|
|
(math-read-token))
|
|
|
|
|
((eq (nth 1 code) 'punc)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-token 'punc
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data (nth 2 code)))
|
2005-01-31 09:05:27 +00:00
|
|
|
|
((and (eq (nth 1 code) 'begenv)
|
|
|
|
|
(string-match " *{\\([^}]*\\)}" math-exp-str math-exp-pos))
|
|
|
|
|
(setq math-exp-pos (match-end 0)
|
|
|
|
|
envname (match-string 1 math-exp-str)
|
|
|
|
|
math-exp-token 'punc
|
|
|
|
|
math-expr-data "[")
|
|
|
|
|
(cond ((or (string= envname "matrix")
|
|
|
|
|
(string= envname "bmatrix")
|
2005-01-31 09:16:44 +00:00
|
|
|
|
(string= envname "smallmatrix")
|
2005-01-31 09:05:27 +00:00
|
|
|
|
(string= envname "pmatrix"))
|
2005-02-19 19:59:49 +00:00
|
|
|
|
(if (string-match (concat "\\\\end{" envname "}")
|
|
|
|
|
math-exp-str math-exp-pos)
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(setq math-exp-str
|
2005-01-31 09:05:27 +00:00
|
|
|
|
(replace-match "]" t t math-exp-str))
|
|
|
|
|
(error "%s" (concat "No closing \\end{" envname "}"))))))
|
|
|
|
|
((and (eq (nth 1 code) 'mat)
|
|
|
|
|
(string-match " *{" math-exp-str math-exp-pos))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-pos (match-end 0)
|
|
|
|
|
math-exp-token 'punc
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data "[")
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(let ((right (string-match "}" math-exp-str math-exp-pos)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(and right
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-str (copy-sequence math-exp-str))
|
|
|
|
|
(aset math-exp-str right ?\])))))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((and (= ch ?\.) (eq calc-language 'fortran)
|
|
|
|
|
(eq (string-match "\\.[a-zA-Z][a-zA-Z][a-zA-Z]?\\."
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
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)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((and (eq calc-language 'math)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(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)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((and (eq calc-language 'eqn)
|
|
|
|
|
(eq (string-match "->\\|<-\\|+-\\|\\\\dots\\|~\\|\\^"
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
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))
|
2006-12-10 23:48:40 +00:00
|
|
|
|
(and (eq (string-match "\\\\dots\\." math-exp-str math-exp-pos)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-pos)
|
|
|
|
|
(setq math-exp-pos (match-end 0)))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(if (memq (aref math-expr-data 0) '(?~ ?^))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
((eq (string-match "%%.*$" math-exp-str math-exp-pos) math-exp-pos)
|
|
|
|
|
(setq math-exp-pos (match-end 0))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token))
|
|
|
|
|
(t
|
2005-01-31 06:21:31 +00:00
|
|
|
|
(if (and (eq ch ?\{) (memq calc-language '(tex latex eqn)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq ch ?\())
|
2005-01-31 06:21:31 +00:00
|
|
|
|
(if (and (eq ch ?\}) (memq calc-language '(tex latex eqn)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq ch ?\)))
|
2005-01-31 06:21:31 +00:00
|
|
|
|
(if (and (eq ch ?\&) (memq calc-language '(tex latex)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq ch ?\,))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-token 'punc
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data (char-to-string ch)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-pos (1+ math-exp-pos)))))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2004-11-27 04:07:22 +00:00
|
|
|
|
(defconst math-alg-inequalities
|
|
|
|
|
'(calcFunc-lt calcFunc-gt calcFunc-leq calcFunc-geq
|
|
|
|
|
calcFunc-eq calcFunc-neq))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-read-expr-level (exp-prec &optional exp-term)
|
2007-06-20 04:12:15 +00:00
|
|
|
|
(let* ((math-expr-opers (math-expr-ops))
|
|
|
|
|
(x (math-read-factor))
|
|
|
|
|
(first t)
|
|
|
|
|
op op2)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(while (and (or (and calc-user-parse-table
|
|
|
|
|
(setq op (calc-check-user-syntax x exp-prec))
|
|
|
|
|
(setq x op
|
|
|
|
|
op '("2x" ident 999999 -1)))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(and (setq op (assoc math-expr-data math-expr-opers))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(/= (nth 2 op) -1)
|
|
|
|
|
(or (and (setq op2 (assoc
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(cdr (memq op math-expr-opers))))
|
|
|
|
|
(eq (= (nth 3 op) -1)
|
|
|
|
|
(/= (nth 3 op2) -1))
|
|
|
|
|
(eq (= (nth 3 op2) -1)
|
|
|
|
|
(not (math-factor-after)))
|
|
|
|
|
(setq op op2))
|
|
|
|
|
t))
|
|
|
|
|
(and (or (eq (nth 2 op) -1)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(memq math-exp-token '(symbol number dollar hash))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(equal math-expr-data "(")
|
|
|
|
|
(and (equal math-expr-data "[")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(not (eq calc-language 'math))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(not (and math-exp-keep-spaces
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(eq (car-safe x) 'vec)))))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(or (not (setq op (assoc math-expr-data math-expr-opers)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(/= (nth 2 op) -1))
|
|
|
|
|
(or (not calc-user-parse-table)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(not (eq math-exp-token 'symbol))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(let ((p calc-user-parse-table))
|
|
|
|
|
(while (and p
|
|
|
|
|
(or (not (integerp
|
|
|
|
|
(car (car (car p)))))
|
|
|
|
|
(not (equal
|
|
|
|
|
(nth 1 (car (car p)))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (cdr p)))
|
|
|
|
|
(not p)))
|
|
|
|
|
(setq op (assoc "2x" math-expr-opers))))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(not (and exp-term (equal math-expr-data exp-term)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(>= (nth 2 op) exp-prec))
|
|
|
|
|
(if (not (equal (car op) "2x"))
|
|
|
|
|
(math-read-token))
|
|
|
|
|
(and (memq (nth 1 op) '(sdev mod))
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq x (cond ((consp (nth 1 op))
|
|
|
|
|
(funcall (car (nth 1 op)) x op))
|
|
|
|
|
((eq (nth 3 op) -1)
|
|
|
|
|
(if (eq (nth 1 op) 'ident)
|
|
|
|
|
x
|
|
|
|
|
(if (eq (nth 1 op) 'closing)
|
|
|
|
|
(if (eq (nth 2 op) exp-prec)
|
|
|
|
|
(progn
|
|
|
|
|
(setq exp-prec 1000)
|
|
|
|
|
x)
|
|
|
|
|
(throw 'syntax "Mismatched delimiters"))
|
|
|
|
|
(list (nth 1 op) x))))
|
|
|
|
|
((and (not first)
|
|
|
|
|
(memq (nth 1 op) math-alg-inequalities)
|
|
|
|
|
(memq (car-safe x) math-alg-inequalities))
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-composite-inequalities x op))
|
|
|
|
|
(t (list (nth 1 op)
|
|
|
|
|
x
|
|
|
|
|
(math-read-expr-level (nth 3 op) exp-term))))
|
|
|
|
|
first nil))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
x))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2005-05-28 04:40:31 +00:00
|
|
|
|
;; calc-arg-values is defined in calc-ext.el, but is used here.
|
|
|
|
|
(defvar calc-arg-values)
|
|
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calc-check-user-syntax (&optional x prec)
|
|
|
|
|
(let ((p calc-user-parse-table)
|
|
|
|
|
(matches nil)
|
|
|
|
|
match rule)
|
|
|
|
|
(while (and p
|
|
|
|
|
(or (not (progn
|
|
|
|
|
(setq rule (car (car p)))
|
|
|
|
|
(if x
|
|
|
|
|
(and (integerp (car rule))
|
|
|
|
|
(>= (car rule) prec)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(equal math-expr-data
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(car (setq rule (cdr rule)))))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(equal math-expr-data (car rule)))))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(let ((save-exp-pos math-exp-pos)
|
|
|
|
|
(save-exp-old-pos math-exp-old-pos)
|
|
|
|
|
(save-exp-token math-exp-token)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(save-exp-data math-expr-data))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(or (not (listp
|
|
|
|
|
(setq matches (calc-match-user-syntax rule))))
|
|
|
|
|
(let ((args (progn
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
calc-arg-values))
|
|
|
|
|
(conds nil)
|
|
|
|
|
temp)
|
|
|
|
|
(if x
|
|
|
|
|
(setq matches (cons x matches)))
|
|
|
|
|
(setq match (cdr (car p)))
|
|
|
|
|
(while (and (eq (car-safe match)
|
|
|
|
|
'calcFunc-condition)
|
|
|
|
|
(= (length match) 3))
|
|
|
|
|
(setq conds (append (math-flatten-lands
|
|
|
|
|
(nth 2 match))
|
|
|
|
|
conds)
|
|
|
|
|
match (nth 1 match)))
|
|
|
|
|
(while (and conds match)
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(cond ((eq (car-safe (car conds))
|
|
|
|
|
'calcFunc-let)
|
|
|
|
|
(setq temp (car conds))
|
|
|
|
|
(or (= (length temp) 3)
|
|
|
|
|
(and (= (length temp) 2)
|
|
|
|
|
(eq (car-safe (nth 1 temp))
|
|
|
|
|
'calcFunc-assign)
|
|
|
|
|
(= (length (nth 1 temp)) 3)
|
|
|
|
|
(setq temp (nth 1 temp)))
|
|
|
|
|
(setq match nil))
|
|
|
|
|
(setq matches (cons
|
|
|
|
|
(math-normalize
|
|
|
|
|
(math-multi-subst
|
|
|
|
|
(nth 2 temp)
|
|
|
|
|
args matches))
|
|
|
|
|
matches)
|
|
|
|
|
args (cons (nth 1 temp)
|
|
|
|
|
args)))
|
|
|
|
|
((and (eq (car-safe (car conds))
|
|
|
|
|
'calcFunc-matches)
|
|
|
|
|
(= (length (car conds)) 3))
|
|
|
|
|
(setq temp (calcFunc-vmatches
|
|
|
|
|
(math-multi-subst
|
|
|
|
|
(nth 1 (car conds))
|
|
|
|
|
args matches)
|
|
|
|
|
(nth 2 (car conds))))
|
|
|
|
|
(if (eq temp 0)
|
|
|
|
|
(setq match nil)
|
|
|
|
|
(while (setq temp (cdr temp))
|
|
|
|
|
(setq matches (cons (nth 2 (car temp))
|
|
|
|
|
matches)
|
|
|
|
|
args (cons (nth 1 (car temp))
|
|
|
|
|
args)))))
|
|
|
|
|
(t
|
|
|
|
|
(or (math-is-true (math-simplify
|
|
|
|
|
(math-multi-subst
|
|
|
|
|
(car conds)
|
|
|
|
|
args matches)))
|
|
|
|
|
(setq match nil))))
|
|
|
|
|
(setq conds (cdr conds)))
|
|
|
|
|
(if match
|
|
|
|
|
(not (setq match (math-multi-subst
|
|
|
|
|
match args matches)))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-old-pos save-exp-old-pos
|
|
|
|
|
math-exp-token save-exp-token
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data save-exp-data
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
math-exp-pos save-exp-pos)))))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq p (cdr p)))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(and p match)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun calc-match-user-syntax (p &optional term)
|
|
|
|
|
(let ((matches nil)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(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)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(while (and p
|
|
|
|
|
(cond ((stringp (car p))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(and (equal math-expr-data (car p))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(progn
|
|
|
|
|
(math-read-token)
|
|
|
|
|
t)))
|
|
|
|
|
((integerp (car p))
|
|
|
|
|
(and (setq m (catch 'syntax
|
|
|
|
|
(math-read-expr-level
|
|
|
|
|
(car p)
|
|
|
|
|
(if (cdr p)
|
|
|
|
|
(if (consp (nth 1 p))
|
|
|
|
|
(car (nth 1 (nth 1 p)))
|
|
|
|
|
(nth 1 p))
|
|
|
|
|
term))))
|
|
|
|
|
(not (stringp m))
|
|
|
|
|
(setq matches (nconc matches (list m)))))
|
|
|
|
|
((eq (car (car p)) '\?)
|
|
|
|
|
(setq m (calc-match-user-syntax (nth 1 (car p))))
|
|
|
|
|
(or (nth 2 (car p))
|
|
|
|
|
(setq matches
|
|
|
|
|
(nconc matches
|
|
|
|
|
(list
|
|
|
|
|
(cons 'vec (and (listp m) m))))))
|
|
|
|
|
(or (listp m) (not (nth 2 (car p)))
|
|
|
|
|
(not (eq (aref (car (nth 2 (car p))) 0) ?\$))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(eq math-exp-token 'end)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(t
|
|
|
|
|
(setq m (calc-match-user-syntax (nth 1 (car p))
|
|
|
|
|
(car (nth 2 (car p)))))
|
|
|
|
|
(if (listp m)
|
|
|
|
|
(let ((vec (cons 'vec m))
|
|
|
|
|
opos mm)
|
|
|
|
|
(while (and (listp
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq opos math-exp-pos
|
2001-11-06 18:59:06 +00:00
|
|
|
|
mm (calc-match-user-syntax
|
|
|
|
|
(or (nth 2 (car p))
|
|
|
|
|
(nth 1 (car p)))
|
|
|
|
|
(car (nth 2 (car p))))))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(> math-exp-pos opos))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-pos save-exp-pos
|
|
|
|
|
math-exp-old-pos save-exp-old-pos
|
|
|
|
|
math-exp-token save-exp-token
|
2004-11-09 20:32:37 +00:00
|
|
|
|
math-expr-data save-exp-data
|
2001-11-06 18:59:06 +00:00
|
|
|
|
matches "Failed"))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
matches))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-remove-dashes (x)
|
|
|
|
|
(if (string-match "\\`\\(.*\\)-\\(.*\\)\\'" x)
|
|
|
|
|
(math-remove-dashes
|
|
|
|
|
(concat (math-match-substring x 1) "#" (math-match-substring x 2)))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
x))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-restore-dashes (x)
|
|
|
|
|
(if (string-match "\\`\\(.*\\)[#_]\\(.*\\)\\'" x)
|
|
|
|
|
(math-restore-dashes
|
|
|
|
|
(concat (math-match-substring x 1) "-" (math-match-substring x 2)))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
x))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-read-if (cond op)
|
|
|
|
|
(let ((then (math-read-expr-level 0)))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(or (equal math-expr-data ":")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(throw 'syntax "Expected ':'"))
|
|
|
|
|
(math-read-token)
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(list 'calcFunc-if cond then (math-read-expr-level (nth 3 op)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-factor-after ()
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(let ((math-exp-pos math-exp-pos)
|
|
|
|
|
math-exp-old-pos math-exp-token math-expr-data)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(or (memq math-exp-token '(number symbol dollar hash string))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(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 '(("(") ("[") ("{"))))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
(defun math-read-factor ()
|
2007-06-20 04:12:15 +00:00
|
|
|
|
(let ((math-expr-opers (math-expr-ops))
|
|
|
|
|
op)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(cond ((eq math-exp-token 'number)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(let ((num (math-read-number math-expr-data)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (not num)
|
|
|
|
|
(progn
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(setq math-exp-old-pos math-exp-pos)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(throw 'syntax "Bad format")))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(if (and math-read-expr-quotes
|
|
|
|
|
(consp num))
|
|
|
|
|
(list 'quote num)
|
|
|
|
|
num)))
|
|
|
|
|
((and calc-user-parse-table
|
|
|
|
|
(setq op (calc-check-user-syntax)))
|
|
|
|
|
op)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
((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))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-factor))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
((and (setq op (assoc math-expr-data math-expr-opers))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(eq (nth 2 op) -1))
|
|
|
|
|
(if (consp (nth 1 op))
|
|
|
|
|
(funcall (car (nth 1 op)) op)
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(let ((val (math-read-expr-level (nth 3 op))))
|
|
|
|
|
(cond ((eq (nth 1 op) 'ident)
|
|
|
|
|
val)
|
|
|
|
|
((and (Math-numberp val)
|
|
|
|
|
(equal (car op) "u-"))
|
|
|
|
|
(math-neg val))
|
|
|
|
|
(t (list (nth 1 op) val))))))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
((eq math-exp-token 'symbol)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(let ((sym (intern math-expr-data)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(if (equal math-expr-data calc-function-open)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(let ((f (assq sym math-expr-function-mapping)))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(if (consp (cdr f))
|
|
|
|
|
(funcall (car (cdr f)) f sym)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(let ((args (if (or (equal math-expr-data calc-function-close)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(eq math-exp-token 'end))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
nil
|
|
|
|
|
(math-read-expr-list))))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(if (not (or (equal math-expr-data calc-function-close)
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(eq math-exp-token 'end)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(throw 'syntax "Expected `)'"))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(if (and (eq calc-language 'fortran) args
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(let ((calc-matrix-mode 'scalar))
|
|
|
|
|
(math-known-matrixp
|
|
|
|
|
(list 'var sym
|
|
|
|
|
(intern
|
|
|
|
|
(concat "var-"
|
|
|
|
|
(symbol-name sym)))))))
|
|
|
|
|
(math-parse-fortran-subscr sym args)
|
|
|
|
|
(if f
|
|
|
|
|
(setq sym (cdr f))
|
|
|
|
|
(and (= (aref (symbol-name sym) 0) ?\\)
|
|
|
|
|
(< (prefix-numeric-value calc-language-option)
|
|
|
|
|
0)
|
|
|
|
|
(setq sym (intern (substring (symbol-name sym)
|
|
|
|
|
1))))
|
|
|
|
|
(or (string-match "-" (symbol-name sym))
|
|
|
|
|
(setq sym (intern
|
|
|
|
|
(concat "calcFunc-"
|
|
|
|
|
(symbol-name sym))))))
|
|
|
|
|
(cons sym args)))))
|
|
|
|
|
(if math-read-expr-quotes
|
|
|
|
|
sym
|
|
|
|
|
(let ((val (list 'var
|
|
|
|
|
(intern (math-remove-dashes
|
|
|
|
|
(symbol-name sym)))
|
|
|
|
|
(if (string-match "-" (symbol-name sym))
|
|
|
|
|
sym
|
|
|
|
|
(intern (concat "var-"
|
|
|
|
|
(symbol-name sym)))))))
|
|
|
|
|
(let ((v (assq (nth 1 val) math-expr-variable-mapping)))
|
|
|
|
|
(and v (setq val (if (consp (cdr v))
|
|
|
|
|
(funcall (car (cdr v)) v val)
|
|
|
|
|
(list 'var
|
|
|
|
|
(intern
|
|
|
|
|
(substring (symbol-name (cdr v))
|
|
|
|
|
4))
|
|
|
|
|
(cdr v))))))
|
|
|
|
|
(while (and (memq calc-language '(c pascal maple))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(equal math-expr-data "["))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
|
|
|
|
(setq val (append (list 'calcFunc-subscr val)
|
|
|
|
|
(math-read-expr-list)))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(if (equal math-expr-data "]")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
|
|
|
|
(throw 'syntax "Expected ']'")))
|
|
|
|
|
val)))))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
((eq math-exp-token 'dollar)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(let ((abs (if (> math-expr-data 0) math-expr-data (- math-expr-data))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (>= (length calc-dollar-values) abs)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(let ((num math-expr-data))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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")))))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
((eq math-exp-token 'hash)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(or calc-hashes-used
|
|
|
|
|
(throw 'syntax "#'s not allowed in this context"))
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(if (<= math-expr-data (length calc-arg-values))
|
|
|
|
|
(let ((num math-expr-data))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
|
|
|
|
(setq calc-hashes-used (max calc-hashes-used num))
|
|
|
|
|
(nth (1- num) calc-arg-values))
|
|
|
|
|
(throw 'syntax "Too many # arguments")))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
((equal math-expr-data "(")
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(let* ((exp (let ((math-exp-keep-spaces nil))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(if (or (equal math-expr-data "\\dots")
|
|
|
|
|
(equal math-expr-data "\\ldots"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
'(neg (var inf var-inf))
|
|
|
|
|
(math-read-expr-level 0)))))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(let ((math-exp-keep-spaces nil))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(cond
|
2004-11-09 20:32:37 +00:00
|
|
|
|
((equal math-expr-data ",")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(progn
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(let ((exp2 (math-read-expr-level 0)))
|
|
|
|
|
(setq exp
|
|
|
|
|
(if (and exp2 (Math-realp exp) (Math-realp exp2))
|
|
|
|
|
(math-normalize (list 'cplx exp exp2))
|
|
|
|
|
(list '+ exp (list '* exp2 '(var i var-i))))))))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
((equal math-expr-data ";")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(progn
|
|
|
|
|
(math-read-token)
|
|
|
|
|
(let ((exp2 (math-read-expr-level 0)))
|
|
|
|
|
(setq exp (if (and exp2 (Math-realp exp)
|
|
|
|
|
(Math-anglep exp2))
|
|
|
|
|
(math-normalize (list 'polar exp exp2))
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(list '* exp
|
|
|
|
|
(list 'calcFunc-exp
|
|
|
|
|
(list '*
|
|
|
|
|
(math-to-radians-2 exp2)
|
|
|
|
|
'(var i var-i)))))))))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
((or (equal math-expr-data "\\dots")
|
|
|
|
|
(equal math-expr-data "\\ldots"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(progn
|
|
|
|
|
(math-read-token)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(let ((exp2 (if (or (equal math-expr-data ")")
|
|
|
|
|
(equal math-expr-data "]")
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(eq math-exp-token 'end))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
'(var inf var-inf)
|
|
|
|
|
(math-read-expr-level 0))))
|
|
|
|
|
(setq exp
|
|
|
|
|
(list 'intv
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(if (equal math-expr-data ")") 0 1)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
exp
|
|
|
|
|
exp2)))))))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(if (not (or (equal math-expr-data ")")
|
|
|
|
|
(and (equal math-expr-data "]") (eq (car-safe exp) 'intv))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
(eq math-exp-token 'end)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(throw 'syntax "Expected `)'"))
|
|
|
|
|
(math-read-token)
|
|
|
|
|
exp))
|
(calc-do-quick-calc): Use kill-new to append string to kill-ring.
(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str): New variables.
(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter): Use
declared variable calc-alg-exp.
(math-build-parse-table, math-find-user-token): Use declared variable
math-toks.
(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor): Use
declared variables math-exp-pos math-exp-old-pos.
(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor): Use declared variable math-exp-token.
(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor): Use declared variable math-exp-keep-spaces.
(math-read-exprs, math-read-token): Use declared variable
math-exp-str.
(calc-match-user-syntax): Made m a local variable.
2004-11-11 05:48:50 +00:00
|
|
|
|
((eq math-exp-token 'string)
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-string))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
((equal math-expr-data "[")
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-brackets t "]"))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
((equal math-expr-data "{")
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-brackets nil "}"))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
((equal math-expr-data "<")
|
2004-11-29 05:56:06 +00:00
|
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-angle-brackets))
|
2001-11-14 08:59:18 +00:00
|
|
|
|
(t (throw 'syntax "Expected a number")))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2004-11-30 16:59:39 +00:00
|
|
|
|
(provide 'calc-aent)
|
|
|
|
|
|
2003-09-01 15:45:59 +00:00
|
|
|
|
;;; arch-tag: 5599e45d-e51e-44bb-9a20-9f4ed8c96c32
|
2001-11-14 08:59:18 +00:00
|
|
|
|
;;; calc-aent.el ends here
|