diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 16:06:26 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 16:06:26 +0000 |
commit | 3aff54f55b5bbd2c2b2575946e2ae8e5fd91e4bb (patch) | |
tree | 2712adb9558b3074907d44bb3c76a40f74d1619d | |
parent | 1c95a727236683606898184a6369305eb530ffbe (diff) | |
download | ruby-3aff54f55b5bbd2c2b2575946e2ae8e5fd91e4bb.tar.gz ruby-3aff54f55b5bbd2c2b2575946e2ae8e5fd91e4bb.tar.xz ruby-3aff54f55b5bbd2c2b2575946e2ae8e5fd91e4bb.zip |
merges r24637 from trunk into ruby_1_9_1.
--
* st.c (st_delete_safe): deals with packed entries.
[ruby-core:25080]
* st.c (st_cleanup_safe): ditto. [ruby-core:25081]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | st.c | 28 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 36 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Mon Aug 24 16:35:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * st.c (st_delete_safe): deals with packed entries. + [ruby-core:25080] + + * st.c (st_cleanup_safe): ditto. [ruby-core:25081] + Sun Aug 23 00:56:13 2009 Tanaka Akira <akr@fsij.org> * thread.c (rb_thread_schedule): don't recur infinitely. @@ -573,6 +573,19 @@ st_delete_safe(register st_table *table, register st_data_t *key, st_data_t *val unsigned int hash_val; register st_table_entry *ptr; + if (table->entries_packed) { + st_index_t i; + for (i = 0; i < table->num_entries; i++) { + if ((st_data_t)table->bins[i*2] == *key) { + if (value != 0) *value = (st_data_t)table->bins[i*2+1]; + table->bins[i*2] = (void *)never; + return 1; + } + } + if (value != 0) *value = 0; + return 0; + } + hash_val = do_hash_bin(*key, table); ptr = table->bins[hash_val]; @@ -596,6 +609,21 @@ st_cleanup_safe(st_table *table, st_data_t never) st_table_entry *ptr, **last, *tmp; int i; + if (table->entries_packed) { + st_index_t i = 0, j = 0; + while ((st_data_t)table->bins[i*2] != never) { + if (i++ == table->num_entries) return; + } + for (j = i; ++i < table->num_entries;) { + if ((st_data_t)table->bins[i*2] == never) continue; + table->bins[j*2] = table->bins[i*2]; + table->bins[j*2+1] = table->bins[i*2+1]; + j++; + } + table->num_entries = j; + return; + } + for (i = 0; i < table->num_bins; i++) { ptr = *(last = &table->bins[i]); while (ptr != 0) { @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 302 +#define RUBY_PATCHLEVEL 303 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |