projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.6.10.5:
[sbcl.git]
/
src
/
code
/
package.lisp
diff --git
a/src/code/package.lisp
b/src/code/package.lisp
index
4078b05
..
276633d
100644
(file)
--- a/
src/code/package.lisp
+++ b/
src/code/package.lisp
@@
-11,9
+11,6
@@
;;;; files for more information.
(in-package "SB!IMPL")
;;;; files for more information.
(in-package "SB!IMPL")
-
-(file-comment
- "$Header$")
\f
;;;; the PACKAGE-HASHTABLE structure
\f
;;;; the PACKAGE-HASHTABLE structure
@@
-282,15
+279,15
@@
(,',init-macro ,(car ',ordered-types)))))))
(when ,packages
,(when (null symbol-types)
(,',init-macro ,(car ',ordered-types)))))))
(when ,packages
,(when (null symbol-types)
- (error 'program-error
+ (error 'simple-program-error
:format-control
: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
,(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)
: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
,@(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)))
:start (if ,',counter
(1+ ,',counter)
0)))
@@
-314,7
+312,8
@@
,@(when (member :external ',ordered-types)
`((:external
(setf ,',counter
,@(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)))
:start (if ,',counter
(1+ ,',counter)
0)))