From 9d830ee5a0b9dad8a60a02e0015919233a0d07cf Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Wed, 26 Jun 2024 05:53:39 -0700 Subject: [PATCH] Rename *ll* and *ul* to ll and ul in complm The function `complm` doesn't really need the special variables since they're arguments, so rename the args to `ll` and `ul` to break that connection. Also added `ll` and `ul` parameters to `kindp34` and renamed the existing uses of `*ll*` and `*ul*`. Note that AFAICT, `kindp34` isn't reachable from any user-called definite integral. Full testsuite + share passes with cmucl and ccl64. --- src/defint.lisp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/defint.lisp b/src/defint.lisp index 3f9c66409..aa8f84f50 100644 --- a/src/defint.lisp +++ b/src/defint.lisp @@ -589,7 +589,7 @@ in the interval of integration.") ((and (not *scflag*) (not (eq ul '$inf)) (radicalp exp ivar) - (kindp34 ivar) + (kindp34 ivar ll ul) (setq result (cv exp ivar ll ul)))) (t ())))) @@ -737,17 +737,17 @@ in the interval of integration.") ;;;If leadop isn't plus don't do anything. (t nil)))) -(defun kindp34 (ivar) +(defun kindp34 (ivar ll ul) (let* ((d (nth-value 1 (numden-var exp ivar))) - (a (cond ((and (zerop1 ($limit d ivar *ll* '$plus)) - (eq (limit-pole (m+ exp (m+ (m- *ll*) ivar)) - ivar *ll* '$plus) + (a (cond ((and (zerop1 ($limit d ivar ll '$plus)) + (eq (limit-pole (m+ exp (m+ (m- ll) ivar)) + ivar ll '$plus) '$yes)) t) (t nil))) - (b (cond ((and (zerop1 ($limit d ivar *ul* '$minus)) - (eq (limit-pole (m+ exp (m+ *ul* (m- ivar))) - ivar *ul* '$minus) + (b (cond ((and (zerop1 ($limit d ivar ul '$minus)) + (eq (limit-pole (m+ exp (m+ ul (m- ivar))) + ivar ul '$minus) '$yes)) t) (t nil)))) @@ -875,13 +875,13 @@ in the interval of integration.") (rotatef *ll* *ul*))) t))) -(defun complm (ask-or-not *ll* *ul*) +(defun complm (ask-or-not ll ul) (let ((askflag (cond ((eq ask-or-not 'ask) t) (t nil))) (a ())) - (cond ((alike1 *ul* *ll*) 0.) - ((eq (setq a (cond (askflag ($asksign ($limit (m+t *ul* (m- *ll*))))) - (t ($sign ($limit (m+t *ul* (m- *ll*))))))) + (cond ((alike1 ul ll) 0.) + ((eq (setq a (cond (askflag ($asksign ($limit (m+t ul (m- ll))))) + (t ($sign ($limit (m+t ul (m- ll))))))) '$pos) 1.) ((eq a '$neg) -1) -- 2.11.4.GIT