[Maxima-commits] CVS: maxima/src dskfn.lisp,1.2,1.3

[Wolfgang J. <wje...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26691

Modified Files:
	dskfn.lisp 
Log Message:
DSKSTORE: The property value of TRANSLATED-MMACRO is a function
object, which can't be saved.

MPROPSCHK: Add TRACE-OLDFUN to the mprops which are not saved.


Index: dskfn.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/dskfn.lisp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dskfn.lisp	24 May 2000 01:06:39 -0000	1.2
+++ dskfn.lisp	13 Nov 2003 04:56:32 -0000	1.3
@@ -287,10 +287,10 @@
 		(IF (SETQ VAL (ARGS ITEM))
 		    (FASPRIN `(ARGS (QUOTE ,RENAME) (QUOTE ,VAL))))
 		(PROPSCHK ITEM RENAME 'TRANSLATED))
-	  (WHEN (AND (SETQ VAL (GETL ITEM '(A-EXPR FEXPR TRANSLATED-MMACRO))) 
-		     (GET ITEM 'TRANSLATED))
-		(DSKDEFPROP RENAME (CADR VAL) (CAR VAL))
-		(PROPSCHK ITEM RENAME 'TRANSLATED))
+;; 	  (WHEN (AND (SETQ VAL (GETL ITEM '(A-EXPR FEXPR TRANSLATED-MMACRO))) 
+;; 		     (GET ITEM 'TRANSLATED))
+;; 		(DSKDEFPROP RENAME (CADR VAL) (CAR VAL))
+;; 		(PROPSCHK ITEM RENAME 'TRANSLATED))
 	  (WHEN (SETQ VAL (GET ITEM 'OPERATORS))
 		(DSKDEFPROP RENAME VAL 'OPERATORS)
 		(WHEN (SETQ VAL (GET ITEM 'RULES))
@@ -359,7 +359,7 @@
 (DEFUN MPROPSCHK (ITEM RENAME FILE STFL)
  (DO ((PROPS (CDR (OR (GET ITEM 'MPROPS) '(NIL))) (CDDR PROPS)) (VAL))
      ((NULL PROPS))
-     (COND ((OR (MEMQ (CAR PROPS) '(TRACE TRACE-TYPE TRACE-LEVEL))
+     (COND ((OR (MEMQ (CAR PROPS) '(TRACE TRACE-TYPE TRACE-LEVEL trace-oldfun))
 		(MFILEP (SETQ VAL (CADR PROPS)))
 		(AND (EQ (CAR PROPS) 'T-MFEXPR) (NOT (GET ITEM 'TRANSLATED)))))
 	   ((NOT (MEMQ (CAR PROPS) '(HASHAR ARRAY)))