Just Launched: You can now import projects and releases from Google Code onto SourceForge
We are excited to release new functionality to enable a 1-click import from Google Code onto the Allura platform on SourceForge. You can import tickets, wikis, source, releases, and more with a few simple steps. Read More
From: William Harold Newman <wnewman@us...> - 2004-06-19 21:42:58
Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7966/src/code
DEFSTRUCT shouldn't issue warnings for FBOUNDP conflicts at
macroexpansion time. (at compile time or load time,
OK, but not macroexpansion time)
Make DESCRIBE on a gf report its method combination.
manual fix from Brian Mastenbrook sbcl-devel 16 Jun 2004
RCS file: /cvsroot/sbcl/sbcl/src/code/defstruct.lisp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- defstruct.lisp 14 May 2004 22:57:30 -0000 1.68
+++ defstruct.lisp 19 Jun 2004 21:42:49 -0000 1.69
@@ -657,11 +657,18 @@
remove the ambiguity in your code.~@:>"
(setf (dd-predicate-name defstruct) nil))
- (when (and (fboundp accessor-name)
- (not (accessor-inherited-data accessor-name defstruct)))
- (style-warn "redefining ~S in DEFSTRUCT" accessor-name)))
+ ;; FIXME: It would be good to check for name collisions here, but
+ ;; the easy check,
+ ;;x(when (and (fboundp accessor-name)
+ ;;x (not (accessor-inherited-data accessor-name defstruct)))
+ ;;x (style-warn "redefining ~S 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
+ ;; is actually compiled or loaded.
(setf (dsd-default slot) default))
@@ -673,8 +680,8 @@
(setf (dsd-read-only slot) t)
(when (dsd-read-only slot)
- (error "Slot ~S is :READ-ONLY in parent and must be :READ-ONLY in subtype ~S."
+ (error "~@<The slot ~S is :READ-ONLY in superclass, and so must ~
+ be :READ-ONLY in subclass.~:@>"