X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpackage.lisp;h=c43c5e4006f43da5fbca9d95bf13e6e05c0bba1e;hb=96de323a7da5d9f72473b48625dcb6d084ec0a3b;hp=e376b9d7d55af56749a9e2552d161bbee56176b2;hpb=ea1fd7753b7dc1277a7d250fed317300fe1e5772;p=sbcl.git

diff --git a/src/code/package.lisp b/src/code/package.lisp
index e376b9d..c43c5e4 100644
--- a/src/code/package.lisp
+++ b/src/code/package.lisp
@@ -32,22 +32,22 @@
 
 (sb!xc:deftype hash-vector () '(simple-array (unsigned-byte 8) (*)))
 
-(sb!xc:defstruct (package-hashtable (:constructor %make-package-hashtable ())
-				    (:copier nil))
+(sb!xc:defstruct (package-hashtable
+                   (:constructor %make-package-hashtable
+                                 (table hash size &aux (free size)))
+                   (:copier nil))
   ;; The g-vector of symbols.
-  ;; FIXME: could just be type SIMPLE-VECTOR, with (MISSING-ARG) default
-  (table nil :type (or simple-vector null))
+  (table (missing-arg) :type simple-vector)
   ;; The i-vector of pname hash values.
-  ;; FIXME: could just be type HASH-VECTOR, with (MISSING-ARG) default
-  (hash nil :type (or hash-vector null))
+  (hash (missing-arg) :type hash-vector)
   ;; The total number of entries allowed before resizing.
   ;;
   ;; FIXME: CAPACITY would be a more descriptive name. (This is
   ;; related to but not quite the same as HASH-TABLE-SIZE, so calling
   ;; it SIZE seems somewhat misleading.)
-  (size 0 :type index)
+  (size (missing-arg) :type index)
   ;; The remaining number of entries that can be made before we have to rehash.
-  (free 0 :type index)
+  (free (missing-arg) :type index)
   ;; The number of deleted entries.
   (deleted 0 :type index))
 
@@ -122,9 +122,6 @@
 	     (flet ((iterate-over-hash-table (table ignore)
 		      (let ((hash-vec (package-hashtable-hash table))
 			    (sym-vec (package-hashtable-table table)))
-			(declare (type (simple-array (unsigned-byte 8) (*))
-				       hash-vec)
-				 (type simple-vector sym-vec))
 			(dotimes (i (length sym-vec))
 			  (when (>= (aref hash-vec i) 2)
 			    (let ((sym (aref sym-vec i)))
@@ -159,9 +156,6 @@
 		  (table (package-external-symbols package))
 		  (hash-vec (package-hashtable-hash table))
 		  (sym-vec (package-hashtable-table table)))
-	     (declare (type (simple-array (unsigned-byte 8) (*))
-			    hash-vec)
-		      (type simple-vector sym-vec))
 	     (dotimes (i (length sym-vec))
 	       (when (>= (aref hash-vec i) 2)
 		 (,flet-name (aref sym-vec i))))))
@@ -187,9 +181,6 @@
 	     (flet ((iterate-over-hash-table (table)
 		      (let ((hash-vec (package-hashtable-hash table))
 			    (sym-vec (package-hashtable-table table)))
-			(declare (type (simple-array (unsigned-byte 8) (*))
-				       hash-vec)
-				 (type simple-vector sym-vec))
 			(dotimes (i (length sym-vec))
 			  (when (>= (aref hash-vec i) 2)
 			    (,flet-name (aref sym-vec i)))))))
@@ -231,7 +222,13 @@
 	    (,packages `,(mapcar (lambda (package)
 				   (if (packagep package)
 				       package
-				       (find-package package)))
+				       ;; Maybe FIND-PACKAGE-OR-DIE?
+				       (or (find-package package)
+					   (error 'simple-package-error
+						  ;; could be a character
+						  :name (string package)
+						  :format-control "~@<~S does not name a package ~:>"
+						  :format-arguments (list package)))))
 				 (if (consp ,these-packages)
 				     ,these-packages
 				     (list ,these-packages))))
@@ -244,6 +241,7 @@
 	    `(setf ,package-use-list (package-%use-list (car ,packages)))
 	    `(declare (ignore ,package-use-list)))
        (macrolet ((,init-macro (next-kind)
+	 (declare (optimize (inhibit-warnings 3)))
  	 (let ((symbols (gensym)))
 	   `(progn
 	      (setf ,',kind ,next-kind)
@@ -295,6 +293,7 @@
 	   (flet ((,real-symbol-p (number)
 		    (> number 1)))
 	     (macrolet ((,mname ()
+	      (declare (optimize (inhibit-warnings 3)))
 	      `(block ,',BLOCK
 		 (loop
 		   (case ,',kind