Update of /cvsroot/sbcl/sbcl/src/code
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8415/src/code
Modified Files:
class.lisp condition.lisp defmacro.lisp defstruct.lisp
Log Message:
1.0.42.24: print symbols with fully qualified names in critical places
Patch by Attila Lendvai, lp#622789.
Less room for package confusion this way.
Index: class.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/class.lisp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- class.lisp 24 Apr 2009 15:56:10 -0000 1.87
+++ class.lisp 2 Sep 2010 08:14:32 -0000 1.88
@@ -767,7 +767,8 @@
(:primitive
(error "Cannot redefine standard type ~S." name))
(:defined
- (warn "Redefining DEFTYPE type to be a class: ~S" name)
+ (warn "redefining DEFTYPE type to be a class: ~
+ ~/sb-impl::print-symbol-with-prefix/" name)
(setf (info :type :expander name) nil
(info :type :lambda-list name) nil
(info :type :source-location name) nil)))
Index: condition.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/condition.lisp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- condition.lisp 17 Aug 2010 12:26:24 -0000 1.106
+++ condition.lisp 2 Sep 2010 08:14:32 -0000 1.107
@@ -680,7 +680,7 @@
(:report
(lambda (condition stream)
(format stream
- "The function ~S is undefined."
+ "The function ~/sb-impl::print-symbol-with-prefix/ is undefined."
(cell-error-name condition)))))
(define-condition special-form-function (undefined-function) ()
@@ -1353,14 +1353,16 @@
(new-location :initarg :new-location
:reader redefinition-with-defun-new-location))
(:report (lambda (warning stream)
- (format stream "redefining ~S in DEFUN"
+ (format stream "redefining ~/sb-impl::print-symbol-with-prefix/ ~
+ in DEFUN"
(function-redefinition-warning-name warning)))))
(define-condition redefinition-with-defgeneric (function-redefinition-warning)
((new-location :initarg :new-location
:reader redefinition-with-defgeneric-new-location))
(:report (lambda (warning stream)
- (format stream "redefining ~S in DEFGENERIC"
+ (format stream "redefining ~/sb-impl::print-symbol-with-prefix/ ~
+ in DEFGENERIC"
(function-redefinition-warning-name warning)))))
(define-condition redefinition-with-defmethod (redefinition-warning)
Index: defmacro.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/defmacro.lisp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- defmacro.lisp 22 Jun 2009 08:05:46 -0000 1.26
+++ defmacro.lisp 2 Sep 2010 08:14:32 -0000 1.27
@@ -89,7 +89,8 @@
;; being incompatibly redefined. Doing this right
;; will involve finding the old macro lambda-list
;; and comparing it with the new one.
- (style-warn "redefining ~S in DEFMACRO" name))
+ (style-warn "redefining ~/sb-impl::print-symbol-with-prefix/ ~
+ in DEFMACRO" name))
(setf (sb!xc:macro-function name) definition)
,(when set-p
`(setf (%fun-doc definition) doc
Index: defstruct.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/defstruct.lisp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- defstruct.lisp 12 Mar 2010 11:23:10 -0000 1.101
+++ defstruct.lisp 2 Sep 2010 08:14:32 -0000 1.102
@@ -732,7 +732,8 @@
;;x#-sb-xc-host
;;x(when (and (fboundp accessor-name)
;;x (not (accessor-inherited-data accessor-name defstruct)))
- ;;x (style-warn "redefining ~S in DEFSTRUCT" accessor-name)))
+ ;;x (style-warn "redefining ~/sb-impl::print-symbol-with-prefix/ ~
+ ;; in DEFSTRUCT" accessor-name)))
;; which was done until sbcl-0.8.11.18 or so, is wrong: it causes
;; a warning at MACROEXPAND time, when instead the warning should
;; occur not just because the code was constructed, but because it
|