2001-11-19 07:44:56 +00:00
|
|
|
|
;;; calc-aent.el --- algebraic entry functions for Calc
|
|
|
|
|
|
2015-01-01 14:26:41 -08:00
|
|
|
|
;; Copyright (C) 1990-1993, 2001-2015 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.
|
|
|
|
|
|
2008-05-06 03:16:00 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2007-03-19 20:59:53 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:16:00 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
2007-03-19 20:59:53 +00:00
|
|
|
|
|
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
|
2008-05-06 03:16:00 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
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)
|
|
|
|
|
|
(calc-refresh-evaltos, calc-execute-kbd-macro)
(math-is-true, calc-explain-why, calc-alg-edit)
(math-composite-inequalities, math-flatten-lands)
(math-multi-subst, calcFunc-vmatches, math-simplify)
(math-known-matrixp, math-parse-fortran-subscr, math-to-radians-2)
(math-read-string, math-read-brackets, math-read-angle-brackets):
Declare as functions.
2007-11-27 04:00:56 +00:00
|
|
|
|
;; Declare functions which are defined elsewhere.
|
|
|
|
|
(declare-function calc-refresh-evaltos "calc-ext" (&optional which-var))
|
|
|
|
|
(declare-function calc-execute-kbd-macro "calc-prog" (mac arg &rest prefix))
|
|
|
|
|
(declare-function math-is-true "calc-ext" (expr))
|
|
|
|
|
(declare-function calc-explain-why "calc-stuff" (why &optional more))
|
|
|
|
|
(declare-function calc-alg-edit "calc-yank" (str))
|
|
|
|
|
(declare-function math-composite-inequalities "calc-prog" (x op))
|
|
|
|
|
(declare-function math-flatten-lands "calc-rewr" (expr))
|
|
|
|
|
(declare-function math-multi-subst "calc-map" (expr olds news))
|
|
|
|
|
(declare-function calcFunc-vmatches "calc-rewr" (expr pat))
|
|
|
|
|
(declare-function math-simplify "calc-alg" (top-expr))
|
|
|
|
|
(declare-function math-known-matrixp "calc-arith" (a))
|
|
|
|
|
(declare-function math-parse-fortran-subscr "calc-lang" (sym args))
|
2013-05-10 19:27:28 -07:00
|
|
|
|
(declare-function math-to-radians-2 "calc-math" (a &optional force-symbolic))
|
(calc-refresh-evaltos, calc-execute-kbd-macro)
(math-is-true, calc-explain-why, calc-alg-edit)
(math-composite-inequalities, math-flatten-lands)
(math-multi-subst, calcFunc-vmatches, math-simplify)
(math-known-matrixp, math-parse-fortran-subscr, math-to-radians-2)
(math-read-string, math-read-brackets, math-read-angle-brackets):
Declare as functions.
2007-11-27 04:00:56 +00:00
|
|
|
|
(declare-function math-read-string "calc-ext" ())
|
|
|
|
|
(declare-function math-read-brackets "calc-vec" (space-sep math-rb-close))
|
|
|
|
|
(declare-function math-read-angle-brackets "calc-forms" ())
|
2007-12-26 17:32:13 +00:00
|
|
|
|
(declare-function math-to-percentsigns "calccomp" (x))
|
(calc-refresh-evaltos, calc-execute-kbd-macro)
(math-is-true, calc-explain-why, calc-alg-edit)
(math-composite-inequalities, math-flatten-lands)
(math-multi-subst, calcFunc-vmatches, math-simplify)
(math-known-matrixp, math-parse-fortran-subscr, math-to-radians-2)
(math-read-string, math-read-brackets, math-read-angle-brackets):
Declare as functions.
2007-11-27 04:00:56 +00:00
|
|
|
|
|
2006-07-20 20:23:06 +00:00
|
|
|
|
(defvar calc-quick-calc-history nil
|
|
|
|
|
"The history list for quick-calc.")
|
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
2014-10-28 19:37:37 -05:00
|
|
|
|
(defun calc-do-quick-calc (&optional insert)
|
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)))
|
2014-10-28 19:37:37 -05:00
|
|
|
|
(if (or insert
|
|
|
|
|
(eq last-command-event 10))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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)
|
2009-11-20 00:55:13 +00:00
|
|
|
|
(calc-twos-complement-mode nil)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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.
|
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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))))
|
2009-01-09 03:57:12 +00:00
|
|
|
|
(calc-alg-entry (and auto (char-to-string last-command-event))))))
|
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.")
|
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calc-alg-entry (&optional initial prompt)
|
2012-09-19 23:44:57 -04:00
|
|
|
|
(let* ((calc-dollar-values (mapcar #'calc-get-stack-element
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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))
|
2009-01-09 03:57:12 +00:00
|
|
|
|
(let* ((calc-simplify-mode (if (eq last-command-event ?\C-j)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
'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
|
|
|
|
|
2010-09-03 13:26:08 +02:00
|
|
|
|
(defvar calc-alg-ent-map
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(set-keymap-parent map minibuffer-local-map)
|
|
|
|
|
(define-key map "'" 'calcAlg-previous)
|
|
|
|
|
(define-key map "`" 'calcAlg-edit)
|
|
|
|
|
(define-key map "\C-m" 'calcAlg-enter)
|
|
|
|
|
(define-key map "\C-j" 'calcAlg-enter)
|
|
|
|
|
map)
|
2004-10-21 19:20:11 +00:00
|
|
|
|
"The keymap used for algebraic entry.")
|
|
|
|
|
|
2010-09-03 13:26:08 +02:00
|
|
|
|
(defvar calc-alg-ent-esc-map
|
|
|
|
|
(let ((map (make-keymap))
|
|
|
|
|
(i 33))
|
|
|
|
|
(set-keymap-parent map esc-map)
|
|
|
|
|
(while (< i 127)
|
|
|
|
|
(define-key map (vector i) 'calcAlg-escape)
|
|
|
|
|
(setq i (1+ i)))
|
|
|
|
|
map)
|
2004-10-21 19:20:11 +00:00
|
|
|
|
"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)
|
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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))
|
2010-09-03 13:26:08 +02:00
|
|
|
|
(blink-matching-check-function 'calcAlg-blink-matching-check)
|
(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-19 14:22:47 +00:00
|
|
|
|
(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)
|
* calc/calc.el (calc, calc-refresh, calc-trail-buffer, calc-record)
(calcDigit-nondigit):
* calc/calc-yank.el (calc-copy-to-buffer):
* calc/calc-units.el (calc-invalidate-units-table):
* calc/calc-trail.el (calc-trail-yank):
* calc/calc-store.el (calc-insert-variables):
* calc/calc-rewr.el (math-rewrite, math-rewrite-phase):
* calc/calc-prog.el (calc-read-parse-table):
* calc/calc-keypd.el (calc-do-keypad, calc-keypad-right-click):
* calc/calc-help.el (calc-describe-bindings, calc-describe-key):
* calc/calc-graph.el (calc-graph-delete, calc-graph-add-curve)
(calc-graph-juggle, calc-graph-count-curves, calc-graph-plot)
(calc-graph-plot, calc-graph-format-data, calc-graph-set-styles)
(calc-graph-name, calc-graph-find-command, calc-graph-view)
(calc-graph-view, calc-gnuplot-command, calc-graph-init):
* calc/calc-ext.el (calc-realign):
* calc/calc-embed.el (calc-do-embedded, calc-do-embedded)
(calc-embedded-finish-edit, calc-embedded-make-info)
(calc-embedded-finish-command, calc-embedded-stack-change):
* calc/calc-aent.el (calcAlg-enter): Use with-current-buffer.
2009-10-28 18:35:33 +00:00
|
|
|
|
(with-current-buffer calc-buffer
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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
|
|
|
|
|
2010-09-03 13:26:08 +02:00
|
|
|
|
(defun calcAlg-blink-matching-check (leftpt rightpt)
|
|
|
|
|
(let ((rightchar (char-before rightpt))
|
|
|
|
|
(leftchar (if leftpt (char-after leftpt))))
|
2004-12-19 06:59:33 +00:00
|
|
|
|
(if (and leftpt
|
|
|
|
|
(or (and (= rightchar ?\))
|
|
|
|
|
(= leftchar ?\[))
|
|
|
|
|
(and (= rightchar ?\])
|
|
|
|
|
(= leftchar ?\()))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char leftpt)
|
|
|
|
|
(looking-at ".+\\(\\.\\.\\|\\\\dots\\|\\\\ldots\\)")))
|
2010-09-03 13:26:08 +02:00
|
|
|
|
;; [2..5) perfectly valid!
|
|
|
|
|
nil
|
|
|
|
|
(blink-matching-check-mismatch leftpt rightpt))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(defun calc-alg-digit-entry ()
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(calc-alg-entry
|
2009-01-09 03:57:12 +00:00
|
|
|
|
(cond ((eq last-command-event ?e)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(if (> calc-number-radix 14) (format "%d.^" calc-number-radix) "1e"))
|
2009-01-09 03:57:12 +00:00
|
|
|
|
((eq last-command-event ?#) (format "%d#" calc-number-radix))
|
|
|
|
|
((eq last-command-event ?_) "-")
|
|
|
|
|
((eq last-command-event ?@) "0@ ")
|
|
|
|
|
(t (char-to-string last-command-event)))))
|
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)
|
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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
|
|
|
|
|
("≤" "<=")
|
|
|
|
|
("≥" ">=")
|
|
|
|
|
("≦" "<=")
|
|
|
|
|
("≧" ">=")
|
2010-05-14 23:50:25 -05:00
|
|
|
|
("µ" "μ")
|
2004-12-08 06:09:20 +00:00
|
|
|
|
;; 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.")
|
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
(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))
|
2007-12-26 17:32:13 +00:00
|
|
|
|
(if (memq calc-language calc-lang-allow-percentsigns)
|
|
|
|
|
(setq math-exp-str (math-remove-percentsigns 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)))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(while (setq math-exp-token
|
2007-12-26 17:32:13 +00:00
|
|
|
|
(string-match "\\.\\.\\([^.]\\|.[^.]\\)" math-exp-str))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(setq math-exp-str
|
2007-12-26 17:32:13 +00:00
|
|
|
|
(concat (substring math-exp-str 0 math-exp-token) "\\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
|
|
|
|
(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
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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.")
|
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
(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) "\""))
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(string-match "[^a-zA-Zα-ωΑ-Ω0-9]" (car p)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(let ((s (regexp-quote (car p))))
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(if (string-match "\\`[a-zA-Zα-ωΑ-Ω0-9]" s)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(setq s (concat "\\<" s)))
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(if (string-match "[a-zA-Zα-ωΑ-Ω0-9]\\'" s)
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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")
|
2007-12-02 03:13:28 +00:00
|
|
|
|
(let (adfn
|
|
|
|
|
(ch (aref 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-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))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(eq (string-match
|
2007-12-26 17:32:13 +00:00
|
|
|
|
calc-user-tokens 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-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))
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(and (>= ch ?A) (<= ch ?Z))
|
|
|
|
|
(and (>= ch ?α) (<= ch ?ω))
|
|
|
|
|
(and (>= ch ?Α) (<= ch ?Ω)))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(string-match
|
2007-12-26 17:32:13 +00:00
|
|
|
|
(cond
|
|
|
|
|
((and (memq calc-language calc-lang-allow-underscores)
|
|
|
|
|
(memq calc-language calc-lang-allow-percentsigns))
|
2010-05-14 23:50:25 -05:00
|
|
|
|
"[a-zA-Zα-ωΑ-Ω0-9_'#]*")
|
2007-12-26 17:32:13 +00:00
|
|
|
|
((memq calc-language calc-lang-allow-underscores)
|
2010-05-14 23:50:25 -05:00
|
|
|
|
"[a-zA-Zα-ωΑ-Ω0-9_#]*")
|
|
|
|
|
(t "[a-zA-Zα-ωΑ-Ω0-9'#]*"))
|
2007-12-26 17:32:13 +00:00
|
|
|
|
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-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)))
|
2007-12-02 03:13:28 +00:00
|
|
|
|
(if (setq adfn (get calc-language 'math-lang-adjust-words))
|
|
|
|
|
(funcall adfn)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((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)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(and (not (memq calc-language
|
2007-12-02 03:13:28 +00:00
|
|
|
|
calc-lang-allow-underscores))
|
2010-05-14 23:50:25 -05:00
|
|
|
|
(eq (string-match "[^])}\"a-zA-Zα-ωΑ-Ω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 (1- math-exp-pos))
|
|
|
|
|
(1- math-exp-pos))))))
|
2007-12-02 03:13:28 +00:00
|
|
|
|
(or (and (memq calc-language calc-lang-c-type-hex)
|
(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))
|
2010-05-14 23:50:25 -05: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)))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
((and (setq adfn
|
2007-12-02 03:13:28 +00:00
|
|
|
|
(assq ch (get calc-language 'math-lang-read-symbol)))
|
|
|
|
|
(eval (nth 1 adfn)))
|
|
|
|
|
(eval (nth 2 adfn)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
((eq ch ?\$)
|
2007-12-02 03:13:28 +00:00
|
|
|
|
(if (eq (string-match "\\$\\([1-9][0-9]*\\)" math-exp-str math-exp-pos)
|
|
|
|
|
math-exp-pos)
|
|
|
|
|
(setq math-expr-data (- (string-to-number (math-match-substring
|
|
|
|
|
math-exp-str 1))))
|
|
|
|
|
(string-match "\\$+" math-exp-str math-exp-pos)
|
|
|
|
|
(setq math-expr-data (- (match-end 0) (match-beginning 0))))
|
|
|
|
|
(setq math-exp-token 'dollar
|
|
|
|
|
math-exp-pos (match-end 0)))
|
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))
|
2007-12-02 03:13:28 +00:00
|
|
|
|
(setq math-exp-token 'string
|
|
|
|
|
math-expr-data (math-match-substring math-exp-str 1)
|
|
|
|
|
math-exp-pos (match-end 0)))
|
2007-12-29 00:23:41 +00:00
|
|
|
|
((and (setq adfn (get calc-language 'math-lang-read))
|
2007-12-02 03:13:28 +00:00
|
|
|
|
(eval (nth 0 adfn))
|
2007-12-29 00:23:41 +00:00
|
|
|
|
(eval (nth 1 adfn))))
|
(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
|
2007-12-02 03:13:28 +00:00
|
|
|
|
(if (setq adfn (assq ch (get calc-language 'math-punc-table)))
|
|
|
|
|
(setq ch (cdr adfn)))
|
(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))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(x (math-read-factor))
|
|
|
|
|
(first t)
|
2007-06-20 04:12:15 +00:00
|
|
|
|
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 "[")
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(not (equal
|
|
|
|
|
(get calc-language
|
2007-12-02 03:13:28 +00:00
|
|
|
|
'math-function-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
|
|
|
|
(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)
|
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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
|
|
|
|
|
2007-12-26 17:32:13 +00:00
|
|
|
|
(defun math-remove-percentsigns (x)
|
|
|
|
|
(if (string-match "\\`\\(.*\\)%\\(.*\\)\\'" x)
|
|
|
|
|
(math-remove-percentsigns
|
2007-12-27 17:35:59 +00:00
|
|
|
|
(concat (math-match-substring x 1) "o'o" (math-match-substring x 2)))
|
2007-12-26 17:32:13 +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
|
|
|
|
|
2007-12-26 17:32:13 +00:00
|
|
|
|
(defun math-restore-placeholders (x)
|
|
|
|
|
"Replace placeholders by the proper characters in the symbol x.
|
Fix minor quoting problems in doc strings
These were glitches regardless of how or whether we tackle the
problem of grave accent in doc strings.
* lisp/calc/calc-aent.el (math-restore-placeholders):
* lisp/ido.el (ido-ignore-buffers, ido-ignore-files):
* lisp/leim/quail/cyrillic.el ("bulgarian-alt-phonetic"):
* lisp/leim/quail/hebrew.el ("hebrew-new")
("hebrew-biblical-sil"):
* lisp/leim/quail/thai.el ("thai-kesmanee"):
* lisp/progmodes/idlw-shell.el (idlwave-shell-file-name-chars):
Used curved quotes to avoid ambiguities like ‘`''’ in doc strings.
* lisp/calendar/calendar.el (calendar-month-abbrev-array):
* lisp/cedet/semantic/mru-bookmark.el (semantic-mrub-cache-flush-fcn):
* lisp/cedet/semantic/symref.el (semantic-symref-tool-baseclass):
* lisp/cedet/semantic/tag.el (semantic-tag-copy)
(semantic-tag-components):
* lisp/cedet/srecode/cpp.el (srecode-semantic-handle-:cpp):
* lisp/cedet/srecode/texi.el (srecode-texi-texify-docstring):
* lisp/emacs-lisp/byte-opt.el (byte-optimize-all-constp):
* lisp/emacs-lisp/checkdoc.el (checkdoc-message-text-engine):
* lisp/emacs-lisp/generator.el (iter-next):
* lisp/gnus/gnus-art.el (gnus-treat-strip-list-identifiers)
(gnus-article-mode-syntax-table):
* lisp/net/rlogin.el (rlogin-directory-tracking-mode):
* lisp/net/soap-client.el (soap-wsdl-get):
* lisp/net/telnet.el (telnet-mode):
* lisp/org/org-compat.el (org-number-sequence):
* lisp/org/org.el (org-remove-highlights-with-change)
(org-structure-template-alist):
* lisp/org/ox-html.el (org-html-link-org-files-as-html):
* lisp/play/handwrite.el (handwrite-10pt, handwrite-11pt)
(handwrite-12pt, handwrite-13pt):
* lisp/progmodes/f90.el (f90-mode, f90-abbrev-start):
* lisp/progmodes/idlwave.el (idlwave-mode, idlwave-check-abbrev):
* lisp/progmodes/verilog-mode.el (verilog-tool)
(verilog-string-replace-matches, verilog-preprocess)
(verilog-auto-insert-lisp, verilog-auto-insert-last):
* lisp/textmodes/makeinfo.el (makeinfo-options):
* src/font.c (Ffont_spec):
Fix minor quoting problems in doc strings, e.g., missing quote,
``x'' where `x' was meant, etc.
* lisp/erc/erc-backend.el (erc-process-sentinel-2):
Fix minor quoting problem in other string.
* lisp/leim/quail/ethiopic.el ("ethiopic"):
* lisp/term/tvi970.el (tvi970-set-keypad-mode):
Omit unnecessary quotes.
* lisp/faces.el (set-face-attribute, set-face-underline)
(set-face-inverse-video, x-create-frame-with-faces):
* lisp/gnus/gnus-group.el (gnus-group-nnimap-edit-acl):
* lisp/mail/supercite.el (sc-attribs-%@-addresses)
(sc-attribs-!-addresses, sc-attribs-<>-addresses):
* lisp/net/tramp.el (tramp-methods):
* lisp/recentf.el (recentf-show-file-shortcuts-flag):
* lisp/textmodes/artist.el (artist-ellipse-right-char)
(artist-ellipse-left-char, artist-vaporize-fuzziness)
(artist-spray-chars, artist-mode, artist-replace-string)
(artist-put-pixel, artist-text-see-thru):
* lisp/vc/ediff-util.el (ediff-submit-report):
* lisp/vc/log-edit.el (log-edit-changelog-full-paragraphs):
Use double-quotes rather than TeX markup in doc strings.
* lisp/skeleton.el (skeleton-pair-insert-maybe):
Reword to avoid the need for grave accent and apostrophe.
* lisp/xt-mouse.el (xterm-mouse-tracking-enable-sequence):
Don't use grave and acute accents to quote.
2015-05-19 14:59:15 -07:00
|
|
|
|
This includes ‘#’ for ‘_’ and ‘'’ for ‘%’.
|
2007-12-26 17:32:13 +00:00
|
|
|
|
If the current Calc language does not use placeholders, return nil."
|
|
|
|
|
(if (or (memq calc-language calc-lang-allow-underscores)
|
|
|
|
|
(memq calc-language calc-lang-allow-percentsigns))
|
|
|
|
|
(let ((sx (symbol-name x)))
|
|
|
|
|
(when (memq calc-language calc-lang-allow-percentsigns)
|
|
|
|
|
(require 'calccomp)
|
|
|
|
|
(setq sx (math-to-percentsigns sx)))
|
|
|
|
|
(if (memq calc-language calc-lang-allow-underscores)
|
|
|
|
|
(setq sx (math-string-restore-underscores sx)))
|
|
|
|
|
(intern-soft sx))))
|
2007-12-12 04:55:20 +00:00
|
|
|
|
|
|
|
|
|
(defun math-string-restore-underscores (x)
|
|
|
|
|
"Replace pound signs by underscores in the string x."
|
|
|
|
|
(if (string-match "\\`\\(.*\\)#\\(.*\\)\\'" x)
|
|
|
|
|
(math-string-restore-underscores
|
|
|
|
|
(concat (math-match-substring x 1) "_" (math-match-substring x 2)))
|
|
|
|
|
x))
|
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;;;###autoload
|
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 ":")
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-24 23:39:33 -07:00
|
|
|
|
(throw 'syntax "Expected ‘:’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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)))
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(throw 'syntax "Expected ‘)’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(if (and (memq calc-language
|
|
|
|
|
calc-lang-parens-are-subscripts)
|
2007-12-02 03:13:28 +00:00
|
|
|
|
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)))))))
|
2007-12-12 04:55:20 +00:00
|
|
|
|
(let ((v (or
|
|
|
|
|
(assq (nth 1 val) math-expr-variable-mapping)
|
2007-12-26 17:32:13 +00:00
|
|
|
|
(assq (math-restore-placeholders (nth 1 val))
|
2007-12-12 04:55:20 +00:00
|
|
|
|
math-expr-variable-mapping))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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))))))
|
2010-06-22 00:41:10 -07:00
|
|
|
|
(while (and (memq calc-language
|
2007-12-02 03:13:28 +00:00
|
|
|
|
calc-lang-brackets-are-subscripts)
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(equal math-expr-data "["))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
2007-12-02 03:13:28 +00:00
|
|
|
|
(let ((el (math-read-expr-list)))
|
|
|
|
|
(while el
|
|
|
|
|
(setq val (append (list 'calcFunc-subscr val)
|
|
|
|
|
(list (car el))))
|
|
|
|
|
(setq el (cdr el))))
|
2004-11-09 20:32:37 +00:00
|
|
|
|
(if (equal math-expr-data "]")
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(math-read-token)
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-24 23:39:33 -07:00
|
|
|
|
(throw 'syntax "Expected ‘]’")))
|
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
|
|
|
|
((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)))
|
2015-08-21 06:31:54 -07:00
|
|
|
|
(throw 'syntax "Expected ‘)’"))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
(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)
|
|
|
|
|
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;; Local variables:
|
2010-06-22 00:41:10 -07:00
|
|
|
|
;; coding: utf-8
|
2008-04-08 22:07:55 +00:00
|
|
|
|
;; generated-autoload-file: "calc-loaddefs.el"
|
|
|
|
|
;; End:
|
|
|
|
|
|
2001-11-14 08:59:18 +00:00
|
|
|
|
;;; calc-aent.el ends here
|