0.pre8.16:

	Fix nasty bug introduced in 0.pre8.1 or so, wherein #S no longer
		worked.  (mea maxima culpa)
	... export STRUCTURE-CLASSOID
	... write a test for it, so it doesn't happen again
	Now we can build from ourselves again, probably :-/

diff --git a/TODO b/TODO
index ab13f0c..d33c3e2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -56,13 +56,20 @@ for late 0.7.x:
 =======================================================================
 for 0.9:
 
+[ note: much of the below refers to preparation for merging SB-PCL:FOO
+  and CL:FOO.  However, it turned out to be surprisingly
+  straightforward to do this notional end goal without doing many of
+  the preparatory operations.  That doesn't mean that plenty of the
+  goals below aren't worthwhile, but the motivation is somewhat
+  different. ]
+
 * refactored in preparation for moving CLOS into cold init and merging
        SB-PCL:FOO with CL:FOO (for FOO=CLASS, FOO=CLASS-OF, etc.)
-       ** systematized support for MOP (new regression tests, maybe
-               new SB-MOP package..) to try to make sure things don't
-               get mislaid in the upcoming CLOS restructuring
-       ** extracted type system from SB-KERNEL into new SB-TYPE
-               package
+       ** systematized support for MOP (more regression tests, maybe) 
+               to try to make sure things don't get mislaid in the 
+               upcoming CLOS restructuring
+       ** extracted type system (and maybe CLASSOIDs) from SB-KERNEL 
+               into new SB-TYPE package
        ** reimplemented GENERIC-FUNCTION as a primitive object (or
                maybe made SB-MOP:FUNCALLABLE-STANDARD-OBJECT the
                primitive object, and then let GENERIC-FUNCTIONs
@@ -93,7 +100,6 @@ for 0.9:
 * (maybe) more refactoring in preparation for merging SB-PCL:FOO
        into CL:FOO: reimplemented type system OO dispatch
        (!DEFINE-TYPE-METHOD, etc.) in terms of CLOS OO dispatch
-* merged SB-PCL:FOO into CL:FOO (and similarly CLASS-OF, etc.)
 * added some automatic tests for basic binary compatibility, in hopes
        that it might be practical to maintain binary compatibility
        between minor maintenance releases on the stable branch (but no

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 9225f7a..853a3f1 100644 (file)
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -1306,6 +1306,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "%SET-INSTANCE-LAYOUT" "DD-DEFAULT-CONSTRUCTOR"
              "LAYOUT-OF" "%SIMPLE-FUN-SELF" "%REALPART"
              "STRUCTURE-CLASSOID-P" "DSD-INDEX"
+            "STRUCTURE-CLASSOID"
              "%INSTANCE-LAYOUT" "LAYOUT-CLOS-HASH"
              "%SIMPLE-FUN-TYPE" "PROCLAIM-AS-FUN-NAME"
              "BECOME-DEFINED-FUN-NAME"

diff --git a/tests/reader.impure.lisp b/tests/reader.impure.lisp
index 214ca6f..c3c8f4e 100644 (file)
--- a/tests/reader.impure.lisp
+++ b/tests/reader.impure.lisp
@@ -59,5 +59,12 @@
   (assert (eq (value res) res))
   (assert (= pos 8)))
 
+;;; CSR managed to break the #S reader macro in the process of merging
+;;; SB-PCL:CLASS and CL:CLASS -- make sure it works
+(defstruct readable-struct a)
+(assert (eq (readable-struct-a
+            (read-from-string "#S(READABLE-STRUCT :A T)"))
+           t))
+
 ;;; success
 (quit :unix-status 104)

diff --git a/version.lisp-expr b/version.lisp-expr
index 83085af..e8e4bae 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -18,4 +18,4 @@
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
 
-"0.pre8.15"
+"0.pre8.16"