0.7.4.7:

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

diff --git a/src/code/target-defstruct.lisp b/src/code/target-defstruct.lisp
index 864a436..858e452 100644 (file)
--- a/src/code/target-defstruct.lisp
+++ b/src/code/target-defstruct.lisp
@@ -213,11 +213,12 @@
            ((structure funcallable-structure)
             (/show0 "with-LAYOUT case")
             (lambda (object)
-              (declare (optimize (speed 3) (safety 0)))
-              (/noshow0 "in with-LAYOUT structure predicate closure, OBJECT,LAYOUT=..")
-              (/nohexstr object)
-              (/nohexstr layout)
-              (typep-to-layout object layout)))
+              (locally ; <- to keep SAFETY 0 from affecting arg count checking
+                (declare (optimize (speed 3) (safety 0)))
+                (/noshow0 "in with-LAYOUT structure predicate closure, OBJECT,LAYOUT=..")
+                (/nohexstr object)
+                (/nohexstr layout)
+                (typep-to-layout object layout))))
            ;; structures with no LAYOUT (i.e. :TYPE VECTOR or :TYPE LIST)
            ;;
            ;; FIXME: should handle the :NAMED T case in these cases
@@ -297,8 +298,7 @@
                               *raw-slot-data-list*)
                     ;; oops
                     (t
-                     (error "internal error: unexpected DSD-RAW-TYPE ~S"
-                            dsd-raw-type))))))
+                     (bug "unexpected DSD-RAW-TYPE ~S" dsd-raw-type))))))
             ;; code shared between DEFSTRUCT :TYPE LIST and
             ;; DEFSTRUCT :TYPE VECTOR cases: Handle the "typed
             ;; structure" case, with no LAYOUTs and no raw slots.
@@ -412,11 +412,9 @@
             (write-char #\space stream)
             (pprint-newline :linear stream))))))))
 (defun %default-structure-ugly-print (structure stream)
-  (/show0 "entering %DEFAULT-STRUCTURE-UGLY-PRINT")
   (let* ((layout (%instance-layout structure))
         (name (sb!xc:class-name (layout-class layout)))
         (dd (layout-info layout)))
-    (/show0 "got LAYOUT, NAME, and DD")
     (descend-into (stream)
       (write-string "#S(" stream)
       (prin1 name stream)
@@ -441,24 +439,20 @@
           stream))))))
 (defun default-structure-print (structure stream depth)
   (declare (ignore depth))
-  (/show0 "entering DEFAULT-STRUCTURE-PRINT")
   (cond ((funcallable-instance-p structure)
-        (/show0 "in FUNCALLABLE-INSTANCE-P case")
         (print-unreadable-object (structure stream :identity t :type t)))
        (*print-pretty*
-        (/show0 "in *PRINT-PRETTY* case")
         (%default-structure-pretty-print structure stream))
        (t
-        (/show0 "in ugly-print case")
         (%default-structure-ugly-print structure stream))))
 (def!method print-object ((x structure-object) stream)
-  (default-structure-print x stream *current-level*))
+  (default-structure-print x stream *current-level-in-print*))
 
 (defun make-load-form-saving-slots (object &key slot-names environment)
   (declare (ignore object environment))
   (if slot-names
-    (error "stub: MAKE-LOAD-FORM-SAVING-SLOTS :SLOT-NAMES not implemented") ; KLUDGE
-    :just-dump-it-normally))
+      (error "stub: MAKE-LOAD-FORM-SAVING-SLOTS :SLOT-NAMES not implemented") ; KLUDGE
+      :sb-just-dump-it-normally))
 \f
 ;;;; testing structure types
 
@@ -467,9 +461,11 @@
 ;;; which have a handle on the type's LAYOUT.
 ;;;
 ;;; FIXME: This is fairly big, so it should probably become
-;;; MAYBE-INLINE instead of INLINE. Or else we could fix things up so
-;;; that the things which call it are all closures, so that it's
-;;; expanded only in a small number of places.
+;;; MAYBE-INLINE instead of INLINE, or its inlineness should become
+;;; conditional (probably through DEFTRANSFORM) on (> SPEED SPACE). Or
+;;; else we could fix things up so that the things which call it are
+;;; all closures, so that it's expanded only in a small number of
+;;; places.
 #!-sb-fluid (declaim (inline typep-to-layout))
 (defun typep-to-layout (obj layout)
   (declare (type layout layout) (optimize (speed 3) (safety 0)))