X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpackage.lisp;h=8af6ad8e068aa0d8907b0a5510b57ece8b4c30b4;hb=90ca09b75fbc3b63b2f7d09c67b04b866dd783f6;hp=4078b05a2b30239dea3af2a969f9d53332790d79;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/code/package.lisp b/src/code/package.lisp
index 4078b05..8af6ad8 100644
--- a/src/code/package.lisp
+++ b/src/code/package.lisp
@@ -11,9 +11,6 @@
 ;;;; files for more information.
 
 (in-package "SB!IMPL")
-
-(file-comment
-  "$Header$")
 
 ;;;; the PACKAGE-HASHTABLE structure
 
@@ -38,10 +35,10 @@
 (sb!xc:defstruct (package-hashtable (:constructor %make-package-hashtable ())
 				    (:copier nil))
   ;; The g-vector of symbols.
-  ;; FIXME: could just be type SIMPLE-VECTOR, with REQUIRED-ARGUMENT
+  ;; FIXME: could just be type SIMPLE-VECTOR, with (MISSING-ARG) default
   (table nil :type (or simple-vector null))
   ;; The i-vector of pname hash values.
-  ;; FIXME: could just be type HASH-VECTOR, with REQUIRED-ARGUMENT
+  ;; FIXME: could just be type HASH-VECTOR, with (MISSING-ARG) default
   (hash nil :type (or hash-vector null))
   ;; The total number of entries allowed before resizing.
   ;;
@@ -96,8 +93,8 @@
   ;; packages that use this package
   (%used-by-list () :type list)
   ;; PACKAGE-HASHTABLEs of internal & external symbols
-  (internal-symbols (required-argument) :type package-hashtable)
-  (external-symbols (required-argument) :type package-hashtable)
+  (internal-symbols (missing-arg) :type package-hashtable)
+  (external-symbols (missing-arg) :type package-hashtable)
   ;; shadowing symbols
   (%shadowing-symbols () :type list)
   ;; documentation string for this package
@@ -282,15 +279,15 @@
 				  (,',init-macro ,(car ',ordered-types)))))))
 	 (when ,packages
 	   ,(when (null symbol-types)
-	      (error 'program-error
+	      (error 'simple-program-error
 		     :format-control
-		     "Must supply at least one of :internal, :external, or ~
-		      :inherited."))
+		     "At least one of :INTERNAL, :EXTERNAL, or ~
+		      :INHERITED must be supplied."))
 	   ,(dolist (symbol symbol-types)
 	      (unless (member symbol '(:internal :external :inherited))
 		(error 'program-error
 		       :format-control
-		       "~S is not one of :internal, :external, or :inherited."
+		       "~S is not one of :INTERNAL, :EXTERNAL, or :INHERITED."
 		       :format-argument symbol)))
 	   (,init-macro ,(car ordered-types))
 	   (flet ((,real-symbol-p (number)
@@ -302,7 +299,8 @@
 		     ,@(when (member :internal ',ordered-types)
 			 `((:internal
 			    (setf ,',counter
-				  (position-if #',',real-symbol-p ,',hash-vector
+				  (position-if #',',real-symbol-p
+					       ,',hash-vector
 					       :start (if ,',counter
 							  (1+ ,',counter)
 							  0)))
@@ -314,7 +312,8 @@
 		     ,@(when (member :external ',ordered-types)
 			 `((:external
 			    (setf ,',counter
-				  (position-if #',',real-symbol-p ,',hash-vector
+				  (position-if #',',real-symbol-p
+					       ,',hash-vector
 					       :start (if ,',counter
 							  (1+ ,',counter)
 							  0)))