diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-07 05:29:20 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-07 05:29:20 +0000 |
commit | ad40f8a268634ff94f2dad1412233a4b1f3751c5 (patch) | |
tree | e426a2cfcb4292d70b12b62a2f175cfc5f7123e9 | |
parent | bdb4fa708465479259cbe2f0215376f6252b7773 (diff) |
* st.c (st_foreach): should not yield same pair when checking
after unpacking.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/-test-/st/numhash/extconf.rb | 1 | ||||
-rw-r--r-- | ext/-test-/st/numhash/numhash.c | 63 | ||||
-rw-r--r-- | st.c | 21 | ||||
-rw-r--r-- | test/-ext-/st/test_numhash.rb | 21 | ||||
-rw-r--r-- | version.h | 2 |
6 files changed, 103 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Tue Feb 7 14:29:16 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * st.c (st_foreach): should not yield same pair when checking + after unpacking. + Tue Feb 7 14:03:45 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com> * lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even diff --git a/ext/-test-/st/numhash/extconf.rb b/ext/-test-/st/numhash/extconf.rb new file mode 100644 index 0000000000..867fd75d2a --- /dev/null +++ b/ext/-test-/st/numhash/extconf.rb @@ -0,0 +1 @@ +create_makefile("-test-/st/numhash") diff --git a/ext/-test-/st/numhash/numhash.c b/ext/-test-/st/numhash/numhash.c new file mode 100644 index 0000000000..3659100613 --- /dev/null +++ b/ext/-test-/st/numhash/numhash.c @@ -0,0 +1,63 @@ +#include <ruby.h> +#include <ruby/st.h> + +static VALUE +numhash_alloc(VALUE klass) +{ + return Data_Wrap_Struct(klass, 0, 0, 0); +} + +static VALUE +numhash_init(VALUE self) +{ + st_table *tbl = (st_table *)DATA_PTR(self); + if (tbl) st_free_table(tbl); + DATA_PTR(self) = st_init_numtable(); + return self; +} + +static VALUE +numhash_aref(VALUE self, VALUE key) +{ + st_data_t data; + if (!SPECIAL_CONST_P(key)) rb_raise(rb_eArgError, "not a special const"); + if (st_lookup((st_table *)DATA_PTR(self), (st_data_t)key, &data)) + return (VALUE)data; + return Qnil; +} + +static VALUE +numhash_aset(VALUE self, VALUE key, VALUE data) +{ + if (!SPECIAL_CONST_P(key)) rb_raise(rb_eArgError, "not a special const"); + if (!SPECIAL_CONST_P(data)) rb_raise(rb_eArgError, "not a special const"); + st_insert((st_table *)DATA_PTR(self), (st_data_t)key, (st_data_t)data); + return self; +} + +static int +numhash_i(st_data_t key, st_data_t value, st_data_t arg, int error) +{ + VALUE ret; + if (key == 0 && value == 0 && error == 1) rb_raise(rb_eRuntimeError, "numhash modified"); + ret = rb_yield_values(3, (VALUE)key, (VALUE)value, (VALUE)arg); + if (ret == Qtrue) return ST_CHECK; + return ST_CONTINUE; +} + +static VALUE +numhash_each(VALUE self) +{ + return st_foreach((st_table *)DATA_PTR(self), numhash_i, self) ? Qtrue : Qfalse; +} + +void +Init_numhash(void) +{ + VALUE st = rb_define_class_under(rb_define_module("Bug"), "StNumHash", rb_cData); + rb_define_alloc_func(st, numhash_alloc); + rb_define_method(st, "initialize", numhash_init, 0); + rb_define_method(st, "[]", numhash_aref, 1); + rb_define_method(st, "[]=", numhash_aset, 2); + rb_define_method(st, "each", numhash_each, 0); +} @@ -745,7 +745,14 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) key = (st_data_t)table->bins[i*2]; val = (st_data_t)table->bins[i*2+1]; retval = (*func)(key, val, arg); - if (!table->entries_packed) goto unpacked; + if (!table->entries_packed) { + FIND_ENTRY(table, ptr, key, i); + if (retval == ST_CHECK) { + if (!ptr) goto deleted; + goto unpacked_continue; + } + goto unpacked; + } switch (retval) { case ST_CHECK: /* check if hash is modified during iteration */ for (j = 0; j < table->num_entries; j++) { @@ -753,9 +760,7 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) break; } if (j == table->num_entries) { - /* call func with error notice */ - retval = (*func)(0, 0, arg, 1); - return 1; + goto deleted; } /* fall through */ case ST_CONTINUE: @@ -771,11 +776,6 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) } } return 0; - unpacked: - ptr = table->head; - while (i-- > 0) { - if (!(ptr = ptr->fore)) return 0; - } } else { ptr = table->head; @@ -785,10 +785,12 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) do { i = ptr->hash % table->num_bins; retval = (*func)(ptr->key, ptr->record, arg); + unpacked: switch (retval) { case ST_CHECK: /* check if hash is modified during iteration */ for (tmp = table->bins[i]; tmp != ptr; tmp = tmp->next) { if (!tmp) { + deleted: /* call func with error notice */ retval = (*func)(0, 0, arg, 1); return 1; @@ -796,6 +798,7 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) } /* fall through */ case ST_CONTINUE: + unpacked_continue: ptr = ptr->fore; break; case ST_STOP: diff --git a/test/-ext-/st/test_numhash.rb b/test/-ext-/st/test_numhash.rb new file mode 100644 index 0000000000..9ec072e1a5 --- /dev/null +++ b/test/-ext-/st/test_numhash.rb @@ -0,0 +1,21 @@ +require 'test/unit' +require "-test-/st/numhash" + +class Bug::StNumHash + class Test_NumHash < Test::Unit::TestCase + def setup + @tbl = Bug::StNumHash.new + 5.times {|i| @tbl[i] = i} + end + + def test_check + keys = [] + @tbl.each do |k, v, t| + keys << k + t[5] = 5 if k == 3 + true + end + assert_equal([*0..5], keys) + end + end +end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 49 +#define RUBY_PATCHLEVEL 50 #define RUBY_RELEASE_DATE "2012-02-07" #define RUBY_RELEASE_YEAR 2012 |