0.6.11.37:
[sbcl.git] / src / code / package.lisp
index 7a64d3a..276633d 100644 (file)
                                  (,',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)
                     ,@(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)))
                     ,@(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)))