From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 25 Jun 2022 11:24:35 +0000 (+0100)
Subject: dot/emacs-calc: Write `var-IntegNumerRules' as longhand sexp.
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/685b368080facdfb032e0e2c37cd4f85406feeaa?hp=5025cdbcdca9c30c39729859003192a881f2e1a3

dot/emacs-calc: Write `var-IntegNumerRules' as longhand sexp.
---

diff --git a/dot/emacs-calc b/dot/emacs-calc
index 0cea5a6..8d722f6 100644
--- a/dot/emacs-calc
+++ b/dot/emacs-calc
@@ -51,11 +51,16 @@ obtained using `z n' (`calc-integrate-numerically')."
 (put 'calc-define 'calc-path-length
      '(progn (define-key calc-mode-map "zp" 'calc-path-length)))
 
-(defvar var-IntegNumerRules 'calc-IntegNumerRules)
-(defun calc-IntegNumerRules ()
-  (math-read-plain-expr "[
-integ(f, x, a, b) := ninteg(f, x, a, b) :: constant(a) :: constant(b)
-]"))
+(defvar var-IntegNumerRules
+  '(vec (calcFunc-condition
+	 (calcFunc-condition
+	  (calcFunc-assign
+	   (calcFunc-integ (var f var-f) (var x var-x)
+			   (var a var-a) (var b var-b))
+	   (calcFunc-ninteg (var f var-f) (var x var-x)
+			    (var a var-a) (var b var-b)))
+	  (calcFunc-constant (var a var-a)))
+	 (calcFunc-constant (var b var-b)))))
 
 (defun calc-integrate-numerically ()
   "Computes an approximate result for a symbolic definite integral with