Changeset 324

Timestamp:

Jan 17, 2004, 7:55:05 PM (21 years ago)

Author:

Gary Byers

Message:

WITH-HASH-TABLE-ITERATOR allows declarations.

File:

• trunk/ccl/lib/macros.lisp (modified) (1 diff)

trunk/ccl/lib/macros.lisp

@@ -2322 +2322 @@
      nil))
 
-(defmacro with-hash-table-iterator ((mname hash-table) &body body)
+(defmacro with-hash-table-iterator ((mname hash-table) &body body &environment env)
   (let ((state (gensym)))
-    `(let ((,state (vector nil nil ,hash-table nil nil)))
-       (declare (dynamic-extent ,state))
-       (unwind-protect
-         (macrolet ((,mname () `(do-hash-table-iteration ,',state)))
-           (start-hash-table-iterator ,state)
-           ,@body)
-         (finish-hash-table-iterator ,state)))))
+    (multiple-value-bind (body decls) (parse-body body env)
+      `(let ((,state (vector nil nil ,hash-table nil nil)))
+        (declare (dynamic-extent ,state))
+        (unwind-protect
+             (macrolet ((,mname () `(do-hash-table-iteration ,',state)))
+               (start-hash-table-iterator ,state)
+               (locally ,@decls ,@body))
+          (finish-hash-table-iterator ,state))))))
 
 (eval-when (compile load eval)