* lisp/calc/calc-alg.el: Use lexical-binding and silence warnings
* lisp/calc/calc-alg.el: Use lexical-binding and silence warnings. (math-defsimplify): Let-bind 'expr' instead of math-simplify-expr. Adjust all users. (math-simplify-expr): Don't declare any more. (math--simplify-divide-expr): New dynbound var. (math-simplify-divide): Bind it when needed. (math-simplify-divisor): Use it instead of math-simplify-expr. (math-simplify-divisor): Only bind math-simplify-divisor-[nd]over around the calls to math-simplify-one-divisor. (math-expr-subst, math-is-polynomial): Don't use dynbound vars as formal arguments. (math-polynomial-base): Move binding of math-poly-base-pred. Don't bind math-poly-base-top-expr any more... * lisp/calc/calc-poly.el (math-total-polynomial-base): Bind it here instead! * lisp/calc/calc-units.el: Use lexical-binding and silence warnings. Adjust to the new 'expr' name in math-defsimplify. (math-find-base-units, math-to-standard-units, math-convert-units): Don't use dynbound vars as formal arguments. (math-simplify-expr): Don't declare any more.
This commit is contained in:
Stefan Monnier
parent
5007c23a6d
commit
e1b2c21b43
4 changed files with 578 additions and 585 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -714,8 +714,8 @@
|
|||
|
||||
;;;; (Autoloads here)
|
||||
(mapc (function (lambda (x)
|
||||
(mapcar (function (lambda (func)
|
||||
(autoload func (car x)))) (cdr x))))
|
||||
(mapcar (function (lambda (func) (autoload func (car x))))
|
||||
(cdr x))))
|
||||
'(
|
||||
|
||||
("calc-alg" calc-has-rules math-defsimplify
|
||||
|
|
|
|||
|
|
@ -517,8 +517,9 @@
|
|||
(defvar math-poly-base-total-base)
|
||||
|
||||
(defun math-total-polynomial-base (expr)
|
||||
(let ((math-poly-base-total-base nil))
|
||||
(math-polynomial-base expr 'math-polynomial-p1)
|
||||
(let ((math-poly-base-total-base nil)
|
||||
(math-poly-base-top-expr expr))
|
||||
(math-polynomial-base expr #'math-polynomial-p1)
|
||||
(math-sort-poly-base-list math-poly-base-total-base)))
|
||||
|
||||
;; The variable math-poly-base-top-expr is local to math-polynomial-base
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
;;; calc-units.el --- unit conversion functions for Calc
|
||||
;;; calc-units.el --- unit conversion functions for Calc -*- lexical-binding:t -*-
|
||||
|
||||
;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
|
||||
|
||||
|
|
@ -455,7 +455,6 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(uoldname nil)
|
||||
(unitscancel nil)
|
||||
(nouold nil)
|
||||
unew
|
||||
units
|
||||
defunits)
|
||||
(if (or (not (math-units-in-expr-p expr t))
|
||||
|
|
@ -672,8 +671,8 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(substring name (1+ pos)))))
|
||||
(setq name (concat "(" name ")"))))
|
||||
(or (eq (nth 1 expr) (car u))
|
||||
(setq name (concat (nth 2 (assq (aref (symbol-name
|
||||
(nth 1 expr)) 0)
|
||||
(setq name (concat (nth 2 (assq (aref (symbol-name (nth 1 expr))
|
||||
0)
|
||||
math-unit-prefixes))
|
||||
(if (and (string-match "[^a-zA-Zα-ωΑ-Ω0-9']" name)
|
||||
(not (memq (car u) '(mHg gf))))
|
||||
|
|
@ -857,7 +856,7 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(or math-units-table
|
||||
(let* ((combined-units (append math-additional-units
|
||||
math-standard-units))
|
||||
(math-cu-unit-list (mapcar 'car combined-units))
|
||||
(math-cu-unit-list (mapcar #'car combined-units))
|
||||
tab)
|
||||
(message "Building units table...")
|
||||
(setq math-units-table-buffer-valid nil)
|
||||
|
|
@ -880,7 +879,7 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(nth 4 x))))
|
||||
combined-units))
|
||||
(let ((math-units-table tab))
|
||||
(mapc 'math-find-base-units tab))
|
||||
(mapc #'math-find-base-units tab))
|
||||
(message "Building units table...done")
|
||||
(setq math-units-table tab))))
|
||||
|
||||
|
|
@ -890,15 +889,16 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(defvar math-fbu-base)
|
||||
(defvar math-fbu-entry)
|
||||
|
||||
(defun math-find-base-units (math-fbu-entry)
|
||||
(if (eq (nth 4 math-fbu-entry) 'boom)
|
||||
(error "Circular definition involving unit %s" (car math-fbu-entry)))
|
||||
(or (nth 4 math-fbu-entry)
|
||||
(let (math-fbu-base)
|
||||
(setcar (nthcdr 4 math-fbu-entry) 'boom)
|
||||
(math-find-base-units-rec (nth 1 math-fbu-entry) 1)
|
||||
(defun math-find-base-units (entry)
|
||||
(if (eq (nth 4 entry) 'boom)
|
||||
(error "Circular definition involving unit %s" (car entry)))
|
||||
(or (nth 4 entry)
|
||||
(let (math-fbu-base
|
||||
(math-fbu-entry entry))
|
||||
(setcar (nthcdr 4 entry) 'boom)
|
||||
(math-find-base-units-rec (nth 1 entry) 1)
|
||||
'(or math-fbu-base
|
||||
(error "Dimensionless definition for unit %s" (car math-fbu-entry)))
|
||||
(error "Dimensionless definition for unit %s" (car entry)))
|
||||
(while (eq (cdr (car math-fbu-base)) 0)
|
||||
(setq math-fbu-base (cdr math-fbu-base)))
|
||||
(let ((b math-fbu-base))
|
||||
|
|
@ -907,7 +907,7 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(setcdr b (cdr (cdr b)))
|
||||
(setq b (cdr b)))))
|
||||
(setq math-fbu-base (sort math-fbu-base 'math-compare-unit-names))
|
||||
(setcar (nthcdr 4 math-fbu-entry) math-fbu-base)
|
||||
(setcar (nthcdr 4 entry) math-fbu-base)
|
||||
math-fbu-base)))
|
||||
|
||||
(defun math-compare-unit-names (a b)
|
||||
|
|
@ -942,7 +942,8 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(error "Unknown name %s in defining expression for unit %s"
|
||||
(nth 1 expr) (car math-fbu-entry))))
|
||||
((equal expr '(calcFunc-ln 10)))
|
||||
(t (error "Malformed defining expression for unit %s" (car math-fbu-entry))))))
|
||||
(t (error "Malformed defining expression for unit %s"
|
||||
(car math-fbu-entry))))))
|
||||
|
||||
|
||||
(defun math-units-in-expr-p (expr sub-exprs)
|
||||
|
|
@ -1018,8 +1019,9 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
;; math-to-standard-units.
|
||||
(defvar math-which-standard)
|
||||
|
||||
(defun math-to-standard-units (expr math-which-standard)
|
||||
(math-to-standard-rec expr))
|
||||
(defun math-to-standard-units (expr which-standard)
|
||||
(let ((math-which-standard which-standard))
|
||||
(math-to-standard-rec expr)))
|
||||
|
||||
(defun math-to-standard-rec (expr)
|
||||
(if (eq (car-safe expr) 'var)
|
||||
|
|
@ -1052,7 +1054,7 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(eq (car-safe (nth 1 expr)) 'var)))
|
||||
expr
|
||||
(cons (car expr)
|
||||
(mapcar 'math-to-standard-rec (cdr expr))))))
|
||||
(mapcar #'math-to-standard-rec (cdr expr))))))
|
||||
|
||||
(defun math-apply-units (expr units ulist &optional pure)
|
||||
(setq expr (math-simplify-units expr))
|
||||
|
|
@ -1085,8 +1087,7 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(let ((entry (list units calc-internal-prec calc-prefer-frac)))
|
||||
(or (equal entry (car math-decompose-units-cache))
|
||||
(let ((ulist nil)
|
||||
(utemp units)
|
||||
qty unit)
|
||||
(utemp units))
|
||||
(while (eq (car-safe utemp) '+)
|
||||
(setq ulist (cons (math-decompose-unit-part (nth 2 utemp))
|
||||
ulist)
|
||||
|
|
@ -1144,15 +1145,15 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(defvar math-cu-new-units)
|
||||
(defvar math-cu-pure)
|
||||
|
||||
(defun math-convert-units (expr math-cu-new-units &optional math-cu-pure)
|
||||
(if (eq (car-safe math-cu-new-units) 'var)
|
||||
(let ((unew (assq (nth 1 math-cu-new-units)
|
||||
(defun math-convert-units (expr new-units &optional pure)
|
||||
(if (eq (car-safe new-units) 'var)
|
||||
(let ((unew (assq (nth 1 new-units)
|
||||
(math-build-units-table))))
|
||||
(if (eq (car-safe (nth 1 unew)) '+)
|
||||
(setq math-cu-new-units (nth 1 unew)))))
|
||||
(setq new-units (nth 1 unew)))))
|
||||
(math-with-extra-prec 2
|
||||
(let ((compat (and (not math-cu-pure)
|
||||
(math-find-compatible-unit expr math-cu-new-units)))
|
||||
(let ((compat (and (not pure)
|
||||
(math-find-compatible-unit expr new-units)))
|
||||
(math-cu-unit-list nil)
|
||||
(math-combining-units nil))
|
||||
(if compat
|
||||
|
|
@ -1160,21 +1161,23 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(math-mul (math-mul (math-simplify-units
|
||||
(math-div expr (math-pow (car compat)
|
||||
(cdr compat))))
|
||||
(math-pow math-cu-new-units (cdr compat)))
|
||||
(math-pow new-units (cdr compat)))
|
||||
(math-simplify-units
|
||||
(math-to-standard-units
|
||||
(math-pow (math-div (car compat) math-cu-new-units)
|
||||
(math-pow (math-div (car compat) new-units)
|
||||
(cdr compat))
|
||||
nil))))
|
||||
(when (setq math-cu-unit-list (math-decompose-units math-cu-new-units))
|
||||
(setq math-cu-new-units (nth 2 (car math-cu-unit-list))))
|
||||
(when (setq math-cu-unit-list (math-decompose-units new-units))
|
||||
(setq new-units (nth 2 (car math-cu-unit-list))))
|
||||
(when (eq (car-safe expr) '+)
|
||||
(setq expr (math-simplify-units expr)))
|
||||
(if (math-units-in-expr-p expr t)
|
||||
(math-convert-units-rec expr)
|
||||
(let ((math-cu-new-units new-units)
|
||||
(math-cu-pure pure))
|
||||
(math-convert-units-rec expr))
|
||||
(math-apply-units (math-to-standard-units
|
||||
(list '/ expr math-cu-new-units) nil)
|
||||
math-cu-new-units math-cu-unit-list math-cu-pure))))))
|
||||
(list '/ expr new-units) nil)
|
||||
new-units math-cu-unit-list pure))))))
|
||||
|
||||
(defun math-convert-units-rec (expr)
|
||||
(if (math-units-in-expr-p expr nil)
|
||||
|
|
@ -1184,7 +1187,7 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(if (Math-primp expr)
|
||||
expr
|
||||
(cons (car expr)
|
||||
(mapcar 'math-convert-units-rec (cdr expr))))))
|
||||
(mapcar #'math-convert-units-rec (cdr expr))))))
|
||||
|
||||
(defun math-convert-temperature (expr old new &optional pure)
|
||||
(let* ((units (math-single-units-in-expr-p expr))
|
||||
|
|
@ -1228,37 +1231,34 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(math-simplify a)))
|
||||
(defalias 'calcFunc-usimplify 'math-simplify-units)
|
||||
|
||||
;; The function created by math-defsimplify uses the variable
|
||||
;; math-simplify-expr, and so is used by functions in math-defsimplify
|
||||
(defvar math-simplify-expr)
|
||||
|
||||
;; The function created by math-defsimplify uses the variable `expr'.
|
||||
(math-defsimplify (+ -)
|
||||
(and math-simplifying-units
|
||||
(math-units-in-expr-p (nth 1 math-simplify-expr) nil)
|
||||
(let* ((units (math-extract-units (nth 1 math-simplify-expr)))
|
||||
(math-units-in-expr-p (nth 1 expr) nil)
|
||||
(let* ((units (math-extract-units (nth 1 expr)))
|
||||
(ratio (math-simplify (math-to-standard-units
|
||||
(list '/ (nth 2 math-simplify-expr) units) nil))))
|
||||
(list '/ (nth 2 expr) units) nil))))
|
||||
(if (math-units-in-expr-p ratio nil)
|
||||
(progn
|
||||
(calc-record-why "*Inconsistent units" math-simplify-expr)
|
||||
math-simplify-expr)
|
||||
(list '* (math-add (math-remove-units (nth 1 math-simplify-expr))
|
||||
(if (eq (car math-simplify-expr) '-)
|
||||
(calc-record-why "*Inconsistent units" expr)
|
||||
expr)
|
||||
(list '* (math-add (math-remove-units (nth 1 expr))
|
||||
(if (eq (car expr) '-)
|
||||
(math-neg ratio) ratio))
|
||||
units)))))
|
||||
|
||||
(math-defsimplify *
|
||||
(math-simplify-units-prod))
|
||||
(math-simplify-units-prod expr))
|
||||
|
||||
(defun math-simplify-units-prod ()
|
||||
(defun math-simplify-units-prod (expr)
|
||||
(and math-simplifying-units
|
||||
calc-autorange-units
|
||||
(Math-realp (nth 1 math-simplify-expr))
|
||||
(let* ((num (math-float (nth 1 math-simplify-expr)))
|
||||
(Math-realp (nth 1 expr))
|
||||
(let* ((num (math-float (nth 1 expr)))
|
||||
(xpon (calcFunc-xpon num))
|
||||
(unitp (cdr (cdr math-simplify-expr)))
|
||||
(unitp (cdr (cdr expr)))
|
||||
(unit (car unitp))
|
||||
(pow (if (eq (car math-simplify-expr) '*) 1 -1))
|
||||
(pow (if (eq (car expr) '*) 1 -1))
|
||||
u)
|
||||
(and (eq (car-safe unit) '*)
|
||||
(setq unitp (cdr unit)
|
||||
|
|
@ -1308,46 +1308,46 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(or (not (eq p pref))
|
||||
(< xpon (+ pxpon (* (math-abs pow) 3))))
|
||||
(progn
|
||||
(setcar (cdr math-simplify-expr)
|
||||
(setcar (cdr expr)
|
||||
(let ((calc-prefer-frac nil))
|
||||
(calcFunc-scf (nth 1 math-simplify-expr)
|
||||
(calcFunc-scf (nth 1 expr)
|
||||
(- uxpon pxpon))))
|
||||
(setcar unitp pname)
|
||||
math-simplify-expr)))))))
|
||||
expr)))))))
|
||||
|
||||
(defvar math-try-cancel-units)
|
||||
|
||||
(math-defsimplify /
|
||||
(and math-simplifying-units
|
||||
(let ((np (cdr math-simplify-expr))
|
||||
(let ((np (cdr expr))
|
||||
(math-try-cancel-units 0)
|
||||
n nn)
|
||||
(setq n (if (eq (car-safe (nth 2 math-simplify-expr)) '*)
|
||||
(cdr (nth 2 math-simplify-expr))
|
||||
(nthcdr 2 math-simplify-expr)))
|
||||
n)
|
||||
(setq n (if (eq (car-safe (nth 2 expr)) '*)
|
||||
(cdr (nth 2 expr))
|
||||
(nthcdr 2 expr)))
|
||||
(if (math-realp (car n))
|
||||
(progn
|
||||
(setcar (cdr math-simplify-expr) (math-mul (nth 1 math-simplify-expr)
|
||||
(setcar (cdr expr) (math-mul (nth 1 expr)
|
||||
(let ((calc-prefer-frac nil))
|
||||
(math-div 1 (car n)))))
|
||||
(setcar n 1)))
|
||||
(while (eq (car-safe (setq n (car np))) '*)
|
||||
(math-simplify-units-divisor (cdr n) (cdr (cdr math-simplify-expr)))
|
||||
(math-simplify-units-divisor (cdr n) (cdr (cdr expr)))
|
||||
(setq np (cdr (cdr n))))
|
||||
(math-simplify-units-divisor np (cdr (cdr math-simplify-expr)))
|
||||
(math-simplify-units-divisor np (cdr (cdr expr)))
|
||||
(if (eq math-try-cancel-units 0)
|
||||
(let* ((math-simplifying-units nil)
|
||||
(base (math-simplify
|
||||
(math-to-standard-units math-simplify-expr nil))))
|
||||
(math-to-standard-units expr nil))))
|
||||
(if (Math-numberp base)
|
||||
(setq math-simplify-expr base))))
|
||||
(if (eq (car-safe math-simplify-expr) '/)
|
||||
(math-simplify-units-prod))
|
||||
math-simplify-expr)))
|
||||
(setq expr base))))
|
||||
(if (eq (car-safe expr) '/)
|
||||
(math-simplify-units-prod expr))
|
||||
expr)))
|
||||
|
||||
(defun math-simplify-units-divisor (np dp)
|
||||
(let ((n (car np))
|
||||
d dd temp)
|
||||
d temp)
|
||||
(while (eq (car-safe (setq d (car dp))) '*)
|
||||
(when (setq temp (math-simplify-units-quotient n (nth 1 d)))
|
||||
(setcar np (setq n temp))
|
||||
|
|
@ -1387,23 +1387,23 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
|
||||
(math-defsimplify ^
|
||||
(and math-simplifying-units
|
||||
(math-realp (nth 2 math-simplify-expr))
|
||||
(if (memq (car-safe (nth 1 math-simplify-expr)) '(* /))
|
||||
(list (car (nth 1 math-simplify-expr))
|
||||
(list '^ (nth 1 (nth 1 math-simplify-expr))
|
||||
(nth 2 math-simplify-expr))
|
||||
(list '^ (nth 2 (nth 1 math-simplify-expr))
|
||||
(nth 2 math-simplify-expr)))
|
||||
(math-simplify-units-pow (nth 1 math-simplify-expr)
|
||||
(nth 2 math-simplify-expr)))))
|
||||
(math-realp (nth 2 expr))
|
||||
(if (memq (car-safe (nth 1 expr)) '(* /))
|
||||
(list (car (nth 1 expr))
|
||||
(list '^ (nth 1 (nth 1 expr))
|
||||
(nth 2 expr))
|
||||
(list '^ (nth 2 (nth 1 expr))
|
||||
(nth 2 expr)))
|
||||
(math-simplify-units-pow (nth 1 expr)
|
||||
(nth 2 expr)))))
|
||||
|
||||
(math-defsimplify calcFunc-sqrt
|
||||
(and math-simplifying-units
|
||||
(if (memq (car-safe (nth 1 math-simplify-expr)) '(* /))
|
||||
(list (car (nth 1 math-simplify-expr))
|
||||
(list 'calcFunc-sqrt (nth 1 (nth 1 math-simplify-expr)))
|
||||
(list 'calcFunc-sqrt (nth 2 (nth 1 math-simplify-expr))))
|
||||
(math-simplify-units-pow (nth 1 math-simplify-expr) '(frac 1 2)))))
|
||||
(if (memq (car-safe (nth 1 expr)) '(* /))
|
||||
(list (car (nth 1 expr))
|
||||
(list 'calcFunc-sqrt (nth 1 (nth 1 expr)))
|
||||
(list 'calcFunc-sqrt (nth 2 (nth 1 expr))))
|
||||
(math-simplify-units-pow (nth 1 expr) '(frac 1 2)))))
|
||||
|
||||
(math-defsimplify (calcFunc-floor
|
||||
calcFunc-ceil
|
||||
|
|
@ -1416,21 +1416,21 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
calcFunc-abs
|
||||
calcFunc-clean)
|
||||
(and math-simplifying-units
|
||||
(= (length math-simplify-expr) 2)
|
||||
(if (math-only-units-in-expr-p (nth 1 math-simplify-expr))
|
||||
(nth 1 math-simplify-expr)
|
||||
(if (and (memq (car-safe (nth 1 math-simplify-expr)) '(* /))
|
||||
(= (length expr) 2)
|
||||
(if (math-only-units-in-expr-p (nth 1 expr))
|
||||
(nth 1 expr)
|
||||
(if (and (memq (car-safe (nth 1 expr)) '(* /))
|
||||
(or (math-only-units-in-expr-p
|
||||
(nth 1 (nth 1 math-simplify-expr)))
|
||||
(nth 1 (nth 1 expr)))
|
||||
(math-only-units-in-expr-p
|
||||
(nth 2 (nth 1 math-simplify-expr)))))
|
||||
(list (car (nth 1 math-simplify-expr))
|
||||
(cons (car math-simplify-expr)
|
||||
(cons (nth 1 (nth 1 math-simplify-expr))
|
||||
(cdr (cdr math-simplify-expr))))
|
||||
(cons (car math-simplify-expr)
|
||||
(cons (nth 2 (nth 1 math-simplify-expr))
|
||||
(cdr (cdr math-simplify-expr)))))))))
|
||||
(nth 2 (nth 1 expr)))))
|
||||
(list (car (nth 1 expr))
|
||||
(cons (car expr)
|
||||
(cons (nth 1 (nth 1 expr))
|
||||
(cdr (cdr expr))))
|
||||
(cons (car expr)
|
||||
(cons (nth 2 (nth 1 expr))
|
||||
(cdr (cdr expr)))))))))
|
||||
|
||||
(defun math-simplify-units-pow (a pow)
|
||||
(if (and (eq (car-safe a) '^)
|
||||
|
|
@ -1453,10 +1453,10 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
|
||||
(math-defsimplify calcFunc-sin
|
||||
(and math-simplifying-units
|
||||
(math-units-in-expr-p (nth 1 math-simplify-expr) nil)
|
||||
(math-units-in-expr-p (nth 1 expr) nil)
|
||||
(let ((rad (math-simplify-units
|
||||
(math-evaluate-expr
|
||||
(math-to-standard-units (nth 1 math-simplify-expr) nil))))
|
||||
(math-to-standard-units (nth 1 expr) nil))))
|
||||
(calc-angle-mode 'rad))
|
||||
(and (eq (car-safe rad) '*)
|
||||
(math-realp (nth 1 rad))
|
||||
|
|
@ -1466,10 +1466,10 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
|
||||
(math-defsimplify calcFunc-cos
|
||||
(and math-simplifying-units
|
||||
(math-units-in-expr-p (nth 1 math-simplify-expr) nil)
|
||||
(math-units-in-expr-p (nth 1 expr) nil)
|
||||
(let ((rad (math-simplify-units
|
||||
(math-evaluate-expr
|
||||
(math-to-standard-units (nth 1 math-simplify-expr) nil))))
|
||||
(math-to-standard-units (nth 1 expr) nil))))
|
||||
(calc-angle-mode 'rad))
|
||||
(and (eq (car-safe rad) '*)
|
||||
(math-realp (nth 1 rad))
|
||||
|
|
@ -1479,10 +1479,10 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
|
||||
(math-defsimplify calcFunc-tan
|
||||
(and math-simplifying-units
|
||||
(math-units-in-expr-p (nth 1 math-simplify-expr) nil)
|
||||
(math-units-in-expr-p (nth 1 expr) nil)
|
||||
(let ((rad (math-simplify-units
|
||||
(math-evaluate-expr
|
||||
(math-to-standard-units (nth 1 math-simplify-expr) nil))))
|
||||
(math-to-standard-units (nth 1 expr) nil))))
|
||||
(calc-angle-mode 'rad))
|
||||
(and (eq (car-safe rad) '*)
|
||||
(math-realp (nth 1 rad))
|
||||
|
|
@ -1492,10 +1492,10 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
|
||||
(math-defsimplify calcFunc-sec
|
||||
(and math-simplifying-units
|
||||
(math-units-in-expr-p (nth 1 math-simplify-expr) nil)
|
||||
(math-units-in-expr-p (nth 1 expr) nil)
|
||||
(let ((rad (math-simplify-units
|
||||
(math-evaluate-expr
|
||||
(math-to-standard-units (nth 1 math-simplify-expr) nil))))
|
||||
(math-to-standard-units (nth 1 expr) nil))))
|
||||
(calc-angle-mode 'rad))
|
||||
(and (eq (car-safe rad) '*)
|
||||
(math-realp (nth 1 rad))
|
||||
|
|
@ -1505,10 +1505,10 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
|
||||
(math-defsimplify calcFunc-csc
|
||||
(and math-simplifying-units
|
||||
(math-units-in-expr-p (nth 1 math-simplify-expr) nil)
|
||||
(math-units-in-expr-p (nth 1 expr) nil)
|
||||
(let ((rad (math-simplify-units
|
||||
(math-evaluate-expr
|
||||
(math-to-standard-units (nth 1 math-simplify-expr) nil))))
|
||||
(math-to-standard-units (nth 1 expr) nil))))
|
||||
(calc-angle-mode 'rad))
|
||||
(and (eq (car-safe rad) '*)
|
||||
(math-realp (nth 1 rad))
|
||||
|
|
@ -1518,10 +1518,10 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
|
||||
(math-defsimplify calcFunc-cot
|
||||
(and math-simplifying-units
|
||||
(math-units-in-expr-p (nth 1 math-simplify-expr) nil)
|
||||
(math-units-in-expr-p (nth 1 expr) nil)
|
||||
(let ((rad (math-simplify-units
|
||||
(math-evaluate-expr
|
||||
(math-to-standard-units (nth 1 math-simplify-expr) nil))))
|
||||
(math-to-standard-units (nth 1 expr) nil))))
|
||||
(calc-angle-mode 'rad))
|
||||
(and (eq (car-safe rad) '*)
|
||||
(math-realp (nth 1 rad))
|
||||
|
|
@ -1536,13 +1536,13 @@ If COMP or STD is non-nil, put that in the units table instead."
|
|||
(if (Math-primp expr)
|
||||
expr
|
||||
(cons (car expr)
|
||||
(mapcar 'math-remove-units (cdr expr))))))
|
||||
(mapcar #'math-remove-units (cdr expr))))))
|
||||
|
||||
(defun math-extract-units (expr)
|
||||
(cond
|
||||
((memq (car-safe expr) '(* /))
|
||||
(cons (car expr)
|
||||
(mapcar 'math-extract-units (cdr expr))))
|
||||
(mapcar #'math-extract-units (cdr expr))))
|
||||
((eq (car-safe expr) 'neg)
|
||||
(math-extract-units (nth 1 expr)))
|
||||
((eq (car-safe expr) '^)
|
||||
|
|
@ -1669,7 +1669,7 @@ In symbolic mode, return the list (^ a b)."
|
|||
(defun math-extract-logunits (expr)
|
||||
(if (memq (car-safe expr) '(* /))
|
||||
(cons (car expr)
|
||||
(mapcar 'math-extract-logunits (cdr expr)))
|
||||
(mapcar #'math-extract-logunits (cdr expr)))
|
||||
(if (memq (car-safe expr) '(^))
|
||||
(list '^ (math-extract-logunits (nth 1 expr)) (nth 2 expr))
|
||||
(if (member expr math-logunits) expr 1))))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue