X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fhash-table.lisp;h=8ad97f3b29528e88acc1f2b1bdf61e6b005b2d21;hb=279283bc1724b60ef9ebbf31ab4837061989be18;hp=9f2a6b4325773ef5dad0e4f87d73c382a71c5268;hpb=055ce77ed25e387a4061653709fe1e03c193eb92;p=sbcl.git diff --git a/src/code/hash-table.lisp b/src/code/hash-table.lisp index 9f2a6b4..8ad97f3 100644 --- a/src/code/hash-table.lisp +++ b/src/code/hash-table.lisp @@ -87,18 +87,21 @@ (defmacro-mundanely with-hash-table-iterator ((function hash-table) &body body) #!+sb-doc - "WITH-HASH-TABLE-ITERATOR ((function hash-table) &body body) - provides a method of manually looping over the elements of a hash-table. - FUNCTION is bound to a generator-macro that, within the scope of the - invocation, returns one or three values. The first value tells whether - any objects remain in the hash table. When the first value is non-NIL, - the second and third values are the key and the value of the next object." + "WITH-HASH-TABLE-ITERATOR ((function hash-table) &body body) + +Provides a method of manually looping over the elements of a hash-table. +FUNCTION is bound to a generator-macro that, within the scope of the +invocation, returns one or three values. The first value tells whether any +objects remain in the hash table. When the first value is non-NIL, the second +and third values are the key and the value of the next object." + ;; This essentially duplicates MAPHASH, so any changes here should + ;; be reflected there as well. (let ((n-function (gensym "WITH-HASH-TABLE-ITERATOR-"))) `(let ((,n-function (let* ((table ,hash-table) (length (length (hash-table-next-vector table))) (index 1)) - (declare (type (mod #.(floor most-positive-fixnum 2)) index)) + (declare (type index/2 index)) (labels ((,function () ;; (We grab the table again on each iteration just in