From: Robert D. <rob...@us...> - 2008-11-29 22:39:07
|
Update of /cvsroot/maxima/maxima/share/contrib/namespaces In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4097/share/contrib/namespaces Modified Files: namespaces.lisp Log Message: Work around apparent bug in GCL PACKAGE-NAME function: it appears to return something other than NIL or a string in some cases (when SYMBOL-PACKGE returns a package that was constructed by the namespace code, specifically). Index: namespaces.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/share/contrib/namespaces/namespaces.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- namespaces.lisp 28 Nov 2008 19:38:25 -0000 1.5 +++ namespaces.lisp 29 Nov 2008 22:39:00 -0000 1.6 @@ -343,7 +343,8 @@ ;; !! THE FOLLOWING DOES NOT DISPLAY NESTED PACKAGES CORRECTLY (ONLY THE INNERMOST IS DISPLAYED) (dimension-infix ; NEW `(($\|) ; NEW - ,(make-symbol (package-name (symbol-package form))) ; NEW + ,#-gcl (make-symbol (package-name (symbol-package form))) ; NEW + #+gcl (make-symbol (let ((x (package-name (symbol-package form)))) (if (stringp x) x "(none)"))) ; NEW ,(make-symbol (symbol-name form))) ; NEW result)) ; NEW (t (dimension-string (makestring form) result)))) @@ -469,7 +470,8 @@ ;; !! THE FOLLOWING DOES NOT DISPLAY NESTED PACKAGES CORRECTLY (ONLY THE INNERMOST IS DISPLAYED) (msize ; NEW `(($\|) ; NEW - ,(make-symbol (package-name (symbol-package x))) ; NEW + ,#-gcl (make-symbol (package-name (symbol-package x))) ; NEW + #+gcl (make-symbol (let ((x (package-name (symbol-package x)))) (if (stringp x) x "(none)"))) ; NEW ,(make-symbol (symbol-name x))) ; NEW l r lop rop))) ; NEW ((and (setq y (safe-get x 'reversealias)) |