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

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

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

Modified Files:
	nset.lisp 
Log Message:
Remove curly braces macro from global variable macros (since it is not a user macro).

Index: nset.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/nset.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- nset.lisp	25 Nov 2005 07:37:37 -0000	1.6
+++ nset.lisp	23 Dec 2005 06:51:00 -0000	1.7
@@ -30,12 +30,20 @@
 
 ;; Parse {a, b, c} into set(a, b, c).
 ;; Don't bother with DEF-NUD etc -- matchfix + ::= works just fine.
+;; Well, MDEFMACRO is a little too zealous in this context, since we
+;; don't really want this macro defn to show up on the $MACROS infolist.
+;; (Maybe it would be cleanest to append built-in defns to FOO::$MACROS
+;; where FOO is something other than MAXIMA, but that awaits
+;; regularization of package use within Maxima.)
 
 (eval-when (compile load eval)
   ; matchfix ("{", "}")
   (meval '(($matchfix) &{ &}))
   ; "{" ([L]) ::= buildq ([L], set (splice (L)));
-  (meval '((mdefmacro) ((${) ((mlist) $L)) (($buildq) ((mlist) $L) (($set) (($splice) $L))))))
+  (let
+    ((new-defn (meval '((mdefmacro) ((${) ((mlist) $L)) (($buildq) ((mlist) $L) (($set) (($splice) $L)))))))
+    ; Simpler to patch up $MACROS here, than to replicate the functionality of MDEFMACRO.
+    (zl-delete (cadr new-defn) $macros)))
 
 ;; Support for TeXing sets. If your mactex doesn't TeX the empty set
 ;; correctly, get the latest mactex.lisp.