[Maxima-commits] CVS: maxima/src db.lisp, 1.14, 1.15 mrgmac.lisp, 1.15, 1.16

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

Update of /cvsroot/maxima/maxima/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20056/src

Modified Files:
	db.lisp mrgmac.lisp 
Log Message:
Rename macro _ in src/mrgmac.lisp to PUSH+STO to avoid name collision
with reader macro of the same name in src/intl.lisp.

Index: db.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/db.lisp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- db.lisp	10 Feb 2009 05:42:06 -0000	1.14
+++ db.lisp	17 Feb 2009 15:31:48 -0000	1.15
@@ -321,8 +321,8 @@
 (defmfun clear ()
   (if dbtrace
       (mtell "CLEAR: clearing ~A~%" marks))
-  (mapc #'(lambda (sym) (_ (sel sym +labs) nil)) +labs)
-  (mapc #'(lambda (sym) (_ (sel sym -labs) nil)) -labs)
+  (mapc #'(lambda (sym) (push+sto (sel sym +labs) nil)) +labs)
+  (mapc #'(lambda (sym) (push+sto (sel sym -labs) nil)) -labs)
   (mapc #'(lambda (sym) (zl-remprop sym 'ulabs)) ulabs)
   (setq +s nil
 	+sm nil
@@ -417,10 +417,10 @@
 
 
 (defmfun addf (dat nd)
-  (_ (sel nd data) (cons dat (sel nd data))))
+  (push+sto (sel nd data) (cons dat (sel nd data))))
 
 (defmfun maxima-remf (dat nd)
-  (_ (sel nd data) (fdel dat (sel nd data))))
+  (push+sto (sel nd data) (fdel dat (sel nd data))))
 
 (defun fdel (fact data)
   (cond
@@ -436,7 +436,7 @@
 	 (cond ((and (eq (car fact) (car d))
 		     (eq (cadr fact) (cadr d))
 		     (eq (caddr fact) (caddr d)))
-		(_ (sel d con data) (delete d (sel d con data) :test #'eq))
+		(push+sto (sel d con data) (delete d (sel d con data) :test #'eq))
 		(rplacd ds (cddr ds)) (return t))))
        data)))
 
@@ -502,7 +502,7 @@
 (defun kill2 (fun arg val cl)
   (cond ((not (atom cl)) (mapc #'(lambda (lis) (kill2 fun arg val lis)) cl))
 	((numberp cl))
-	(t (_ (sel cl data) (kill3 fun arg val (sel cl data))))))
+	(t (push+sto (sel cl data) (kill3 fun arg val (sel cl data))))))
 
 (defun kill3 (fun arg val data)
   (cond ((and (eq fun (caaar data))
@@ -518,7 +518,7 @@
 			  (eq arg (cadr d))
 			  (eq val (caddr d))))
 		t)
-	       (t (_ (sel d con data) (delete d (sel d con data) :test #'eq))
+	       (t (push+sto (sel d con data) (delete d (sel d con data) :test #'eq))
 		  (rplacd ds (cddr ds)) (return t))))
 	 data)))
 
@@ -535,7 +535,7 @@
   (cond ((or (symbolp cl)		;if CL is a symbol or
 	     (and (consp cl) ;an interned number, then we want to REMOV4 FACT
 		  (mnump (car cl))))	;from its property list.
-	 (_ (sel cl data) (delete fact (sel cl data) :test #'eq)))
+	 (push+sto (sel cl data) (delete fact (sel cl data) :test #'eq)))
 	((or (atom cl) (atom (car cl)))) ;if CL is an atom (not a symbol)
 					;or its CAR is an atom then we don't want to do
 					;anything to it.

Index: mrgmac.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/mrgmac.lisp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- mrgmac.lisp	29 Apr 2007 20:01:19 -0000	1.15
+++ mrgmac.lisp	17 Feb 2009 15:31:49 -0000	1.16
@@ -34,13 +34,13 @@
   (push 's-mode x)
   (cond ((eq 'c (third x)) `(first ,(second x)))
 	((eq 'sel (third x)) `(second ,(second x)))
-	((eq '_ (third x)) `(third ,(second x)))))
+	((eq 'push+sto (third x)) `(third ,(second x)))))
 
 (defmacro a-mode (&rest x)
   (push 'a-mode x)
   (cond ((eq 'c (third x)) `(rplaca (second x) ,(fourth x)))
 	((eq 'sel (third x)) `(rplaca (cdr ,(second x)) ,(fourth x)))
-	((eq '_ (third x)) `(rplaca (cddr ,(second x)) ,(fourth x)))))
+	((eq 'push+sto (third x)) `(rplaca (cddr ,(second x)) ,(fourth x)))))
 
 (defmacro defmode (&rest x)
   (push 'defmode x)
@@ -188,10 +188,10 @@
   (declare (ignore env))
   (if (null (cddr x))
       `(sel ,(second x) ,(car x))
-      `(_ (sel ,(second x) ,(car x)) ,(third x))))
+      `(push+sto (sel ,(second x) ,(car x)) ,(third x))))
 
-(defmacro _ (&rest x)
-  (push '_ x )
+(defmacro push+sto (&rest x)
+  (push 'push+sto x )
   `(sto ,@(cdr x)))
 
 (defmacro sto (&rest x)