0.pre7.86.flaky7.2:

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

diff --git a/src/code/room.lisp b/src/code/room.lisp
index 4c394f8..a5735e0 100644 (file)
--- a/src/code/room.lisp
+++ b/src/code/room.lisp
@@ -15,13 +15,13 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (def!struct (room-info (:make-load-form-fun just-dump-it-normally))
-    ;; The name of this type.
+    ;; the name of this type
     (name nil :type symbol)
-    ;; Kind of type (how we determine length).
-    (kind (required-argument)
+    ;; kind of type (how we determine length)
+    (kind (missing-arg)
          :type (member :lowtag :fixed :header :vector
                        :string :code :closure :instance))
-    ;; Length if fixed-length, shift amount for element size if :VECTOR.
+    ;; length if fixed-length, shift amount for element size if :VECTOR
     (length nil :type (or fixnum null))))
 
 (eval-when (:compile-toplevel :execute)
@@ -32,7 +32,7 @@
   (let ((widetag (primitive-object-widetag obj))
        (lowtag (primitive-object-lowtag obj))
        (name (primitive-object-name obj))
-       (variable (primitive-object-variable-length obj))
+       (variable (primitive-object-var-length obj))
        (size (primitive-object-size obj)))
     (cond
      ((not lowtag))
@@ -560,9 +560,9 @@
 (defun print-allocated-objects (space &key (percent 0) (pages 5)
                                      type larger smaller count
                                      (stream *standard-output*))
-  (declare (type (integer 0 99) percent) (type sb!c::index pages)
+  (declare (type (integer 0 99) percent) (type index pages)
           (type stream stream) (type spaces space)
-          (type (or sb!c::index null) type larger smaller count))
+          (type (or index null) type larger smaller count))
   (multiple-value-bind (start-sap end-sap) (space-bounds space)
     (let* ((space-start (sap-int start-sap))
           (space-end (sap-int end-sap))
@@ -649,7 +649,7 @@
 (defun list-allocated-objects (space &key type larger smaller count
                                     test)
   (declare (type spaces space)
-          (type (or sb!c::index null) larger smaller type count)
+          (type (or index null) larger smaller type count)
           (type (or function null) test)
           (inline map-allocated-objects))
   (unless *ignore-after* (setq *ignore-after* (cons 1 2)))