[Maxima-commits] CVS: maxima/src combin.lisp,1.6,1.7

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

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

Modified Files:
	combin.lisp 
Log Message:
Replace definition of CFRATSIMP with definition given by S Macrakis
in SF bug report # 620928. New defn fixes the two problem cases
mentioned in the bug report. run_testsuite succeeds, and examples
in the texinfo description of cf are unchanged. (rtest10.mac 
contains a few cf-related expressions, so the new defn is
exercised a little bit by the test suite.)

Index: combin.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/combin.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- combin.lisp	25 Nov 2004 02:36:00 -0000	1.6
+++ combin.lisp	9 Apr 2005 22:28:39 -0000	1.7
@@ -581,10 +581,12 @@
   (cfratsimp  (let ($listarith)
 		(bind-status-divov-t (cfeval (meval (fexprcheck a)))))))
 
+;; Definition of cfratsimp as given in SF bug report # 620928.
 (defun cfratsimp (a)
-  (cond ((memq (car a) '(cf)) a)
-	(t
-	 (cons '(mlist cf simp)(apply 'find-cf (cf-back-recurrence (cdr a)))))))
+  (cond ((atom a) a)
+        ((memq 'cf (car a)) a)
+        (t (cons '(mlist cf simp)
+                 (apply 'find-cf (cf-back-recurrence (cdr a)))))))
 
 (defun cfeval (a)
   (let (temp $ratprint)