aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--hash.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f3fc450ef..e52e7c23b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Tue Aug 21 13:43:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Aug 21 13:46:59 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * hash.c (rb_hash_clear): use st_clear() unless iterating.
* st.c (struct st_table_entry): add new members, fore and back, to
iterate in inserted order.
diff --git a/hash.c b/hash.c
index 20bc33b878..910676f498 100644
--- a/hash.c
+++ b/hash.c
@@ -842,7 +842,10 @@ rb_hash_clear(VALUE hash)
{
rb_hash_modify(hash);
if (RHASH(hash)->tbl->num_entries > 0) {
- rb_hash_foreach(hash, clear_i, 0);
+ if (RHASH(hash)->iter_lev > 0)
+ rb_hash_foreach(hash, clear_i, 0);
+ else
+ st_clear(RHASH(hash)->tbl);
}
return hash;