0.8.0.78.vector-nil-string.6:

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

diff --git a/src/code/package.lisp b/src/code/package.lisp
index 7f67aa6..4239b37 100644 (file)
--- a/src/code/package.lisp
+++ b/src/code/package.lisp
@@ -73,7 +73,7 @@
   #!+sb-doc
   "the standard structure for the description of a package"
   ;; the name of the package, or NIL for a deleted package
-  (%name nil :type (or simple-string null))
+  (%name nil :type (or simple-base-string null))
   ;; nickname strings
   (%nicknames () :type list)
   ;; packages used by this package
@@ -99,7 +99,7 @@
   ;; shadowing symbols
   (%shadowing-symbols () :type list)
   ;; documentation string for this package
-  (doc-string nil :type (or simple-string null)))
+  (doc-string nil :type (or simple-base-string null)))
 \f
 ;;;; iteration macros
 
@@ -341,12 +341,13 @@
                                                  (car ,',packages)))
                                              :inherited)))))
                              (setf ,',counter
-                                   (position-if #',',inherited-symbol-p
-                                                (the hash-vector
-                                                  ,',hash-vector)
-                                                :start (if ,',counter
-                                                           (1+ ,',counter)
-                                                           0))))
+                                   (when ,',hash-vector
+                                     (position-if #',',inherited-symbol-p
+                                                  (the hash-vector
+                                                    ,',hash-vector)
+                                                  :start (if ,',counter
+                                                             (1+ ,',counter)
+                                                             0)))))
                            (cond (,',counter
                                   (return-from
                                    ,',BLOCK