X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fhash-table.lisp;h=8a79e0ea84ae5065b80fd79f1e1bf6d10eaff9f5;hb=1af3faa2b79125b774c2182cab841ed7ee555bed;hp=b82a58580837c11e4a20c2da01b060b25a9beec2;hpb=4a4f1e5ca70363d64d7cbb141863a387334e6760;p=sbcl.git

diff --git a/src/code/hash-table.lisp b/src/code/hash-table.lisp
index b82a585..8a79e0e 100644
--- a/src/code/hash-table.lisp
+++ b/src/code/hash-table.lisp
@@ -16,30 +16,29 @@
 (sb!xc:defstruct (hash-table (:constructor %make-hash-table))
   ;; The type of hash table this is. Only used for printing and as
   ;; part of the exported interface.
-  (test (required-argument) :type symbol :read-only t)
+  (test (missing-arg) :type symbol :read-only t)
   ;; The function used to compare two keys. Returns T if they are the
   ;; same and NIL if not.
-  (test-fun (required-argument) :type function :read-only t)
+  (test-fun (missing-arg) :type function :read-only t)
   ;; The function used to compute the hashing of a key. Returns two
   ;; values: the index hashing and T if that might change with the
   ;; next GC.
-  (hash-fun (required-argument) :type function :read-only t)
+  (hash-fun (missing-arg) :type function :read-only t)
   ;; how much to grow the hash table by when it fills up. If an index,
   ;; then add that amount. If a floating point number, then multiply
   ;; it by that.
-  (rehash-size (required-argument) :type (or index (single-float (1.0)))
+  (rehash-size (missing-arg) :type (or index (single-float (1.0)))
 	       :read-only t)
   ;; how full the hash table has to get before we rehash
-  (rehash-threshold (required-argument) :type (single-float (0.0) 1.0)
-		    :read-only t)
+  (rehash-threshold (missing-arg) :type (single-float (0.0) 1.0) :read-only t)
   ;; The number of entries before a rehash, just one less than the
   ;; size of the next-vector, hash-vector, and half the size of the
   ;; kv-vector.
-  (rehash-trigger (required-argument) :type index)
+  (rehash-trigger (missing-arg) :type index)
   ;; The current number of entries in the table.
   (number-entries 0 :type index)
   ;; The Key-Value pair vector.
-  (table (required-argument) :type simple-vector)
+  (table (missing-arg) :type simple-vector)
   ;; True if this is a weak hash table, meaning that key->value
   ;; mappings will disappear if there are no other references to the
   ;; key. Note: this only matters if the hash function indicates that
@@ -54,18 +53,20 @@
   (next-free-kv 0 :type index)
   ;; The index vector. This may be larger than the hash size to help
   ;; reduce collisions.
-  (index-vector (required-argument)
-		:type (simple-array (unsigned-byte 32) (*)))
+  (index-vector (missing-arg)
+		:type (simple-array (unsigned-byte #.sb!vm:n-word-bits) (*)))
   ;; This table parallels the KV vector, and is used to chain together
   ;; the hash buckets, the free list, and the values needing rehash, a
   ;; slot will only ever be in one of these lists.
-  (next-vector (required-argument) :type (simple-array (unsigned-byte 32) (*)))
+  (next-vector (missing-arg)
+	       :type (simple-array (unsigned-byte #.sb!vm:n-word-bits) (*)))
   ;; This table parallels the KV table, and can be used to store the
   ;; hash associated with the key, saving recalculation. Could be
   ;; useful for EQL, and EQUAL hash tables. This table is not needed
-  ;; for EQ hash tables, and when present the value of #x8000000
+  ;; for EQ hash tables, and when present the value of #x80000000
   ;; represents EQ-based hashing on the respective key.
-  (hash-vector nil :type (or null (simple-array (unsigned-byte 32) (*)))))
+  (hash-vector nil :type (or null (simple-array (unsigned-byte
+						 #.sb!vm:n-word-bits) (*)))))
 
 (defmacro-mundanely with-hash-table-iterator ((function hash-table) &body body)
   #!+sb-doc