projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.18.3:
[sbcl.git]
/
src
/
code
/
package.lisp
diff --git
a/src/code/package.lisp
b/src/code/package.lisp
index
bc7ca27
..
80455ac
100644
(file)
--- a/
src/code/package.lisp
+++ b/
src/code/package.lisp
@@
-30,12
+30,12
@@
;;; the entry is unused. If it is one, then it is deleted.
;;; Double-hashing is used for collision resolution.
;;; the entry is unused. If it is one, then it is deleted.
;;; Double-hashing is used for collision resolution.
-(sb!xc:deftype hash-vector () '(simple-array (unsigned-byte 8) (*)))
+(def!type hash-vector () '(simple-array (unsigned-byte 8) (*)))
-(sb!xc:defstruct (package-hashtable
- (:constructor %make-package-hashtable
- (table hash size &aux (free size)))
- (:copier nil))
+(def!struct (package-hashtable
+ (:constructor %make-package-hashtable
+ (table hash size &aux (free size)))
+ (:copier nil))
;; The g-vector of symbols.
(table (missing-arg) :type simple-vector)
;; The i-vector of pname hash values.
;; The g-vector of symbols.
(table (missing-arg) :type simple-vector)
;; The i-vector of pname hash values.
@@
-73,7
+73,7
@@
#!+sb-doc
"the standard structure for the description of a package"
;; the name of the package, or NIL for a deleted package
#!+sb-doc
"the standard structure for the description of a package"
;; the name of the package, or NIL for a deleted package
- (%name nil :type (or simple-base-string null))
+ (%name nil :type (or simple-string null))
;; nickname strings
(%nicknames () :type list)
;; packages used by this package
;; nickname strings
(%nicknames () :type list)
;; packages used by this package
@@
-99,7
+99,12
@@
;; shadowing symbols
(%shadowing-symbols () :type list)
;; documentation string for this package
;; shadowing symbols
(%shadowing-symbols () :type list)
;; documentation string for this package
- (doc-string nil :type (or simple-base-string null)))
+ (doc-string nil :type (or simple-string null))
+ ;; package locking
+ #!+sb-package-locks
+ (lock nil :type boolean)
+ #!+sb-package-locks
+ (%implementation-packages nil :type list))
\f
;;;; iteration macros
\f
;;;; iteration macros
@@
-285,7
+290,7
@@
(error 'simple-program-error
:format-control
"At least one of :INTERNAL, :EXTERNAL, or ~
(error 'simple-program-error
:format-control
"At least one of :INTERNAL, :EXTERNAL, or ~
- :INHERITED must be supplied."))
+ :INHERITED must be supplied."))
,(dolist (symbol symbol-types)
(unless (member symbol '(:internal :external :inherited))
(error 'program-error
,(dolist (symbol symbol-types)
(unless (member symbol '(:internal :external :inherited))
(error 'program-error