X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpackage.lisp;h=276633d96238d24e87af248847d0dde9105d323f;hb=5108495b13b99452d5a85c4600f68432ff8894b2;hp=7a64d3ab3fcfca4b6e5d65ed470d1479f70ecaef;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git diff --git a/src/code/package.lisp b/src/code/package.lisp index 7a64d3a..276633d 100644 --- a/src/code/package.lisp +++ b/src/code/package.lisp @@ -279,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) @@ -299,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))) @@ -311,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)))