From efbbfaa35590060584eda07e1f6781c4ea2cf484 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Mon, 22 Dec 2008 12:00:24 +0000 Subject: [PATCH] 1.0.23.63: WITH-HASH-TABLE-ITERATOR lambda-list beautification * Iterator lambda-list name is NAME, not FUNCTION, which was a bit confusing since it is bound to a macro. * Thanks to Tobias Rittweiler. --- src/code/hash-table.lisp | 40 ++++++++++++++++++++-------------------- version.lisp-expr | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/code/hash-table.lisp b/src/code/hash-table.lisp index 5eb7a3c..ca66744 100644 --- a/src/code/hash-table.lisp +++ b/src/code/hash-table.lisp @@ -95,32 +95,32 @@ ;; the generational garbage collector needs to know it. (defconstant +magic-hash-vector-value+ (ash 1 (1- sb!vm:n-word-bits))) -(defmacro-mundanely with-hash-table-iterator ((function hash-table) &body body) +(defmacro-mundanely with-hash-table-iterator ((name hash-table) &body body) #!+sb-doc - "WITH-HASH-TABLE-ITERATOR ((function hash-table) &body body) + "WITH-HASH-TABLE-ITERATOR ((name 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. +Provides a method of manually looping over the elements of a hash-table. NAME +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. -Consequences are undefined if HASH-TABLE is mutated during execution -of BODY, except for changing or removing elements corresponding to the -current key. The applies to all threads, not just the curren one -- -even for synchronized hash-tables. If the table may be mutated by -another thread during iteration, use eg. SB-EXT:WITH-LOCKED-HASH-TABLE -to protect the WITH-HASH-TABLE-ITERATOR for." +Consequences are undefined if HASH-TABLE is mutated during execution of BODY, +except for changing or removing elements corresponding to the current key. The +applies to all threads, not just the curren one -- even for synchronized +hash-tables. If the table may be mutated by another thread during iteration, +use eg. SB-EXT:WITH-LOCKED-HASH-TABLE to protect the WITH-HASH-TABLE-ITERATOR +for." ;; 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 ((function (make-symbol (concatenate 'string (symbol-name name) "-FUN")))) + `(let ((,function (let* ((table ,hash-table) (length (length (hash-table-next-vector table))) (index 1)) (declare (type index/2 index)) (labels - ((,function () + ((,name () ;; (We grab the table again on each iteration just in ;; case it was rehashed by a PUTHASH.) (let ((kv-vector (hash-table-table table))) @@ -130,11 +130,11 @@ to protect the WITH-HASH-TABLE-ITERATOR for." (value (aref kv-vector (1+ (* 2 index))))) (incf index) (unless (or (eq key +empty-ht-slot+) - (eq value +empty-ht-slot+)) + (eq value +empty-ht-slot+)) (return (values t key value)))))))) - #',function)))) - (macrolet ((,function () '(funcall ,n-function))) - ,@body)))) + #',name)))) + (macrolet ((,name () '(funcall ,function))) + ,@body)))) (defmacro-mundanely with-locked-hash-table ((hash-table) &body body) #!+sb-doc diff --git a/version.lisp-expr b/version.lisp-expr index 7b9c66c..26cd26e 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.23.62" +"1.0.23.63" -- 1.7.10.4