[Maxima-commits] CVS: maxima/src nrat4.lisp,1.15,1.16

[Robert D. <rob...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4832/src

Modified Files:
	nrat4.lisp 
Log Message:
freeof checks both noun and verb forms of operators.
See discussion on Maxima mailing list 2007-02-04.

Index: nrat4.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/nrat4.lisp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- nrat4.lisp	16 May 2007 19:24:27 -0000	1.15
+++ nrat4.lisp	5 Apr 2008 19:19:08 -0000	1.16
@@ -356,7 +356,11 @@
 (defun freeof (var e) 
   (cond ((alike1 var e) nil)
 	((atom e) t)
-	((and (not argsfreeofp) (alike1 var (caar e))) nil)
+	((and (not argsfreeofp)
+          (or
+            (alike1 var ($verbify (caar e)))
+            (alike1 var ($nounify (caar e)))))
+     nil)
 	((and (or (member (caar e) '(%product %sum %laplace) :test #'eq)
 		  (and (eq (caar e) '%integrate) (cdddr e))
 		  (and (eq (caar e) '%limit) (cddr e)))