From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Wed, 18 Jun 2003 16:30:59 +0000 (+0000)
Subject: 0.8.0.78.vector-nil.2:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=910e718eb815ef3ecbe82191e8dc4e3728c4e67f;p=sbcl.git

0.8.0.78.vector-nil.2:
	I can't see how to expose it, but fix the CLASS descriptions for
	STRING and SIMPLE-STRING anyway (so that they have direct
	superclasses, and their inherits look right).
---

diff --git a/src/code/class.lisp b/src/code/class.lisp
index 0b3e65f..bea6e90 100644
--- a/src/code/class.lisp
+++ b/src/code/class.lisp
@@ -1058,10 +1058,12 @@
      :inherits (vector simple-array array sequence))
     (string
      :translation string
+     :direct-superclasses (vector)
      :inherits (vector array sequence))
     (simple-string
      :translation simple-string
-     :inherits (string simple-array))
+     :direct-superclasses (string simple-array)
+     :inherits (string vector simple-array array sequence))
     (vector-nil
      ;; FIXME: Should this be (AND (VECTOR NIL) (NOT (SIMPLE-ARRAY NIL (*))))?
      :translation (vector nil)
diff --git a/src/code/defpackage.lisp b/src/code/defpackage.lisp
index 1989869..2d50d0a 100644
--- a/src/code/defpackage.lisp
+++ b/src/code/defpackage.lisp
@@ -135,11 +135,9 @@
 		       :format-arguments (list (car x)(car y) z)))))
 
 (defun stringify-name (name kind)
-  (/show0 "in STRINGIFY-NAME, NAME=..")
-  (/hexstr name)
   (typecase name
     (simple-base-string name)
-    (base-string (coerce name 'simple-base-string))
+    (string (coerce name 'simple-base-string))
     (symbol (symbol-name name))
     (base-char (string name))
     (t
diff --git a/src/code/late-type.lisp b/src/code/late-type.lisp
index 23c0097..b8d83ee 100644
--- a/src/code/late-type.lisp
+++ b/src/code/late-type.lisp
@@ -2190,6 +2190,7 @@
 			  (specialized-element-type-maybe type2))
 		   t)))))
 
+;;; FIXME: is this dead?
 (!define-superclasses array
   ((base-string base-string)
    (vector vector)
diff --git a/version.lisp-expr b/version.lisp-expr
index 6bfa2bf..eeae117 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.0.78.vector-nil-string.1"
+"0.8.0.78.vector-nil-string.2"