;; boxing.
(rehash-threshold (float rehash-threshold 1.0))
(size+1 (1+ size)) ; The first element is not usable.
- (scaled-size (round (/ (float size+1) rehash-threshold)))
+ ;; KLUDGE: The most natural way of expressing the below is
+ ;; (round (/ (float size+1) rehash-threshold)), and indeed
+ ;; it was expressed like that until 0.7.0. However,
+ ;; MAKE-HASH-TABLE is called very early in cold-init, and
+ ;; the SPARC has no primitive instructions for rounding,
+ ;; but only for truncating; therefore, we fudge this issue
+ ;; a little. The other uses of truncate, below, similarly
+ ;; used to be round. -- CSR, 2002-10-01
+ ;;
+ ;; Note that this has not yet been audited for
+ ;; correctness. It just seems to work. -- CSR, 2002-11-02
+ (scaled-size (truncate (/ (float size+1) rehash-threshold)))
(length (almost-primify (max scaled-size
(1+ +min-hash-table-size+))))
(index-vector (make-array length
(defun hash-table-count (hash-table)
#!+sb-doc
- "Returns the number of entries in the given HASH-TABLE."
+ "Return the number of entries in the given HASH-TABLE."
(declare (type hash-table hash-table)
(values index))
(hash-table-number-entries hash-table))
(fixnum
(+ rehash-size old-size))
(float
- (the index (round (* rehash-size old-size)))))))
+ (the index (truncate (* rehash-size old-size)))))))
(new-kv-vector (make-array (* 2 new-size)
:initial-element +empty-ht-slot+))
(new-next-vector (make-array new-size
:initial-element #x80000000)))
(old-index-vector (hash-table-index-vector table))
(new-length (almost-primify
- (round (/ (float new-size)
+ (truncate (/ (float new-size)
(hash-table-rehash-threshold table)))))
(new-index-vector (make-array new-length
:element-type '(unsigned-byte 32)
(defun remhash (key hash-table)
#!+sb-doc
- "Remove the entry in HASH-TABLE associated with KEY. Returns T if there
- was such an entry, and NIL if not."
+ "Remove the entry in HASH-TABLE associated with KEY. Return T if there
+ was such an entry, or NIL if not."
(declare (type hash-table hash-table)
(values (member t nil)))
(without-gcing
;;; not only parts of the system which are defined after DEFUN MAPHASH.
;;; 2. It could be conditional on compilation policy, so that
;;; it could be compiled as a full call instead of an inline
-;;; expansion when SPACE>SPEED. (Not only would this save space,
-;;; it might actually be faster when a call is made from byte-compiled
-;;; code.)
+;;; expansion when SPACE>SPEED.
(declaim (inline maphash))
(defun maphash (function-designator hash-table)
#!+sb-doc
- "For each entry in HASH-TABLE, call the designated function on the key
- and value of the entry. Return NIL."
- (let ((fun (%coerce-callable-to-function function-designator))
+ "For each entry in HASH-TABLE, call the designated two-argument function
+ on the key and value of the entry. Return NIL."
+ (let ((fun (%coerce-callable-to-fun function-designator))
(size (length (hash-table-next-vector hash-table))))
(declare (type function fun))
(do ((i 1 (1+ i)))
\f
;;;; methods on HASH-TABLE
-(def!method print-object ((ht hash-table) stream)
+;;; Return a list of keyword args and values to use for MAKE-HASH-TABLE
+;;; when reconstructing HASH-TABLE.
+(defun %hash-table-ctor-args (hash-table)
+ (when (hash-table-weak-p hash-table)
+ ;; FIXME: This might actually work with no trouble, but as of
+ ;; sbcl-0.6.12.10 when this code was written, weak hash tables
+ ;; weren't working yet, so I couldn't test it. When weak hash
+ ;; tables are supported again, this should be fixed.
+ (error "can't dump weak hash tables readably")) ; defensive programming..
+ `(:test ',(hash-table-test hash-table)
+ :size ',(hash-table-size hash-table)
+ :rehash-size ',(hash-table-rehash-size hash-table)
+ :rehash-threshold ',(hash-table-rehash-threshold hash-table)))
+
+;;; Return an association list representing the same data as HASH-TABLE.
+(defun %hash-table-alist (hash-table)
+ (let ((result nil))
+ (maphash (lambda (key value)
+ (push (cons key value) result))
+ hash-table)
+ result))
+
+;;; Stuff an association list into HASH-TABLE. Return the hash table,
+;;; so that we can use this for the *PRINT-READABLY* case in
+;;; PRINT-OBJECT (HASH-TABLE T) without having to worry about LET
+;;; forms and readable gensyms and stuff.
+(defun %stuff-hash-table (hash-table alist)
+ (dolist (x alist)
+ (setf (gethash (car x) hash-table) (cdr x)))
+ hash-table)
+
+(def!method print-object ((hash-table hash-table) stream)
(declare (type stream stream))
- (print-unreadable-object (ht stream :type t :identity t)
- (format stream
- ":TEST ~S :COUNT ~D"
- (hash-table-test ht)
- (hash-table-number-entries ht))))
+ (cond ((not *print-readably*)
+ (print-unreadable-object (hash-table stream :type t :identity t)
+ (format stream
+ ":TEST ~S :COUNT ~S"
+ (hash-table-test hash-table)
+ (hash-table-count hash-table))))
+ ((not *read-eval*)
+ (error "can't print hash tables readably without *READ-EVAL*"))
+ (t
+ (with-standard-io-syntax
+ (format stream
+ "#.~W"
+ `(%stuff-hash-table (make-hash-table ,@(%hash-table-ctor-args
+ hash-table))
+ ',(%hash-table-alist hash-table)))))))
(def!method make-load-form ((hash-table hash-table) &optional environment)
- (declare (ignorable environment))
- (values
- `(make-hash-table
- :test ',(hash-table-test hash-table)
- :size ',(hash-table-size hash-table)
- :rehash-size ',(hash-table-rehash-size hash-table)
- :rehash-threshold ',(hash-table-rehash-threshold hash-table))
- (let ((alist nil))
- (maphash (lambda (key value)
- (push (cons key value) alist))
- hash-table)
- (if alist
- ;; FIXME: It'd probably be more efficient here to write the
- ;; hash table values as a SIMPLE-VECTOR rather than an alist.
- ;; (Someone dumping a huge hash table might well thank us..)
- `(stuff-hash-table ,hash-table ',alist)
- nil))))
-
-(defun stuff-hash-table (table alist)
- (dolist (x alist)
- (setf (gethash (car x) table) (cdr x))))
+ (declare (ignore environment))
+ (values `(make-hash-table ,@(%hash-table-ctor-args hash-table))
+ `(%stuff-hash-table ,hash-table ',(%hash-table-alist hash-table))))
projects / sbcl.git / blobdiff