diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | array.c | 22 | ||||
| -rw-r--r-- | test/ruby/test_array.rb | 11 |
3 files changed, 39 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Sun Dec 8 13:59:38 2013 Kazuki Tsujimoto <kazuki@callcc.net> + + * array.c (rb_ary_shuffle_bang, rb_ary_sample): check + unknown keywords. + + * test/ruby/test_array.rb (test_shuffle, test_sample): tests for + the above. + Sun Dec 8 13:01:11 2013 Aman Gupta <ruby@tmm1.net> * vm.c (ruby_vm_stat): add RubyVM.stat() for access to internal cache @@ -4431,9 +4431,18 @@ rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary) { VALUE opts, randgen = rb_cRandom; long i, len; + static ID keyword_ids[1]; + + if (!keyword_ids[0]) { + keyword_ids[0] = rb_intern("random"); + } if (OPTHASH_GIVEN_P(opts)) { - randgen = rb_hash_lookup2(opts, sym_random, randgen); + VALUE random; + rb_get_kwargs(opts, keyword_ids, 0, 1, &random); + if (random != Qundef) { + randgen = random; + } } rb_check_arity(argc, 0, 0); rb_ary_modify(ary); @@ -4509,9 +4518,18 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary) VALUE opts, randgen = rb_cRandom; long n, len, i, j, k, idx[10]; long rnds[numberof(idx)]; + static ID keyword_ids[1]; + + if (!keyword_ids[0]) { + keyword_ids[0] = rb_intern("random"); + } if (OPTHASH_GIVEN_P(opts)) { - randgen = rb_hash_lookup2(opts, sym_random, randgen); + VALUE random; + rb_get_kwargs(opts, keyword_ids, 0, 1, &random); + if (random != Qundef) { + randgen = random; + } } len = RARRAY_LEN(ary); if (argc == 0) { diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 1c2adf852b..1f434e37fa 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -2085,6 +2085,13 @@ class TestArray < Test::Unit::TestCase 100.times do assert_equal([0, 1, 2].shuffle, [0, 1, 2].shuffle(random: gen)) end + + assert_raise_with_message(ArgumentError, /unknown keyword/) do + [0, 1, 2].shuffle(xawqij: "a") + end + assert_raise_with_message(ArgumentError, /unknown keyword/) do + [0, 1, 2].shuffle!(xawqij: "a") + end end def test_shuffle_random @@ -2158,6 +2165,10 @@ class TestArray < Test::Unit::TestCase assert_equal(a.sample(n), a.sample(n, random: gen), "#{i}/#{n}") end end + + assert_raise_with_message(ArgumentError, /unknown keyword/) do + [0, 1, 2].sample(xawqij: "a") + end end def test_sample_random |