diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 8 | ||||
| -rw-r--r-- | vm.c | 12 |
3 files changed, 9 insertions, 16 deletions
@@ -1,4 +1,7 @@ -Sat Oct 11 13:46:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Oct 11 13:46:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm.c (kwmerge_i): override existing keys by new keys. + [ruby-core:65368] [Bug #10315] * parse.y (assocs): concatenate splatted literal hashes. the former key has precedence even if duplicated literal keys diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 013d9dcac3..5a7d2f8a62 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -109,12 +109,12 @@ class TestSyntax < Test::Unit::TestCase def o.kw(k1: 1, k2: 2) [k1, k2] end h = {k1: 11, k2: 12} assert_equal([11, 12], o.kw(**h)) - assert_equal([11, 22], o.kw(k2: 22, **h)) - assert_equal([11, 12], o.kw(**h, **{k2: 22})) - assert_equal([11, 22], o.kw(**{k2: 22}, **h)) + assert_equal([11, 12], o.kw(k2: 22, **h)) + assert_equal([11, 22], o.kw(**h, **{k2: 22})) + assert_equal([11, 12], o.kw(**{k2: 22}, **h)) bug10315 = '[ruby-core:65368] [Bug #10315]' - assert_equal([22, 2], o.kw(**{k1: 22}, **{k1: 23}), bug10315) + assert_equal([23, 2], o.kw(**{k1: 22}, **{k1: 23}), bug10315) h = {k3: 31} assert_raise(ArgumentError) {o.kw(**h)} @@ -2343,20 +2343,10 @@ m_core_hash_merge_ptr(int argc, VALUE *argv, VALUE recv) } static int -kwmerge_ii(st_data_t *key, st_data_t *value, st_data_t arg, int existing) -{ - if (existing) return ST_STOP; - *value = arg; - return ST_CONTINUE; -} - -static int kwmerge_i(VALUE key, VALUE value, VALUE hash) { if (!SYMBOL_P(key)) Check_Type(key, T_SYMBOL); - if (st_update(RHASH_TBL_RAW(hash), key, kwmerge_ii, (st_data_t)value) == 0) { /* !existing */ - RB_OBJ_WRITTEN(hash, Qundef, value); - } + rb_hash_aset(hash, key, value); return ST_CONTINUE; } |