[Maxima-commits] CVS: maxima/src merror.lisp,1.13,1.14

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

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

Modified Files:
	merror.lisp 
Log Message:
RATDISREP the argument of ERROR-SIZE in case it is a CRE.
Merging in this change from orthopoly-init.lisp.

Index: merror.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/merror.lisp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- merror.lisp	7 Nov 2005 17:37:11 -0000	1.13
+++ merror.lisp	23 Dec 2005 06:53:40 -0000	1.14
@@ -38,6 +38,12 @@
   this variable may be determined by factors of terminal speed and type.")
 
 (defun error-size (exp)
+  ; RATDISREP the argument in case it's a CRE. Ugh.
+  ; But RATDISREP simplifies its argument, which is a no-no if we got here
+  ; because some simplification code is complaining, so inhibit simplification. Double ugh.
+  (let (($simp nil))
+    (setq exp (ratdisrep exp)))
+
   (if (atom exp) 0
       (do ((l (cdr exp) (cdr l))
 	   (n 1 (f1+ (f+ n (error-size (car l))))))