0.pre7.77:

[sbcl.git] / src / code / defstruct.lisp

diff --git a/src/code/defstruct.lisp b/src/code/defstruct.lisp
index d19a42c..2b845ea 100644 (file)
--- a/src/code/defstruct.lisp
+++ b/src/code/defstruct.lisp
@@ -489,7 +489,7 @@
                (%defstruct ',dd ',inherits)
                (/show0 "back from %DEFSTRUCT")
                ,@(unless expanding-into-code-for-xc-host-p
-                   (append (raw-accessor-definitions dd)
+                   (append #|(raw-accessor-definitions dd)|# ; REMOVEME
                            (predicate-definitions dd)
                            ;; FIXME: We've inherited from CMU CL nonparallel
                            ;; code for creating copiers for typed and untyped
@@ -550,6 +550,8 @@
 \f
 ;;;; functions to generate code for various parts of DEFSTRUCT definitions
 
+;;; REMOVEME: no longer used
+#|
 ;;; Return forms to define readers and writers for raw slots as inline
 ;;; functions.
 (defun raw-accessor-definitions (dd)
@@ -599,6 +601,7 @@
       `((/show0 "beginning RAW-ACCESSOR-DEFINITIONS forms")
        ,@(res)
        (/show0 "done with RAW-ACCESSOR-DEFINITIONS forms")))))
+|#
 
 ;;; Return a list of forms which create a predicate for an untyped DEFSTRUCT.
 (defun predicate-definitions (dd)
@@ -1011,8 +1014,8 @@
              (class-layout (sb!xc:find-class
                             (or (first superclass-opt)
                                 'structure-object))))))
-    (if (eq (dd-name info) 'lisp-stream)
-       ;; a hack to added the stream class as a mixin for LISP-STREAMs
+    (if (eq (dd-name info) 'ansi-stream)
+       ;; a hack to add the CL:STREAM class as a mixin for ANSI-STREAMs
        (concatenate 'simple-vector
                     (layout-inherits super)
                     (vector super
@@ -1306,8 +1309,8 @@
                                (sb!xc:typep x (sb!xc:find-class class))))
                            (fdefinition constructor)))
     (setf (class-direct-superclasses class)
-         (if (eq (dd-name info) 'lisp-stream)
-             ;; a hack to add STREAM as a superclass mixin to LISP-STREAMs
+         (if (eq (dd-name info) 'ansi-stream)
+             ;; a hack to add CL:STREAM as a superclass mixin to ANSI-STREAMs
              (list (layout-class (svref inherits (1- (length inherits))))
                    (layout-class (svref inherits (- (length inherits) 2))))
              (list (layout-class (svref inherits (1- (length inherits)))))))