diff options
| -rw-r--r-- | hash.c | 14 | ||||
| -rw-r--r-- | test/ruby/test_hash.rb | 7 |
2 files changed, 16 insertions, 5 deletions
@@ -2787,17 +2787,23 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash) { VALUE ary; + rb_check_arity(argc, 0, 1); + if (argc) { - int level = NUM2INT(*argv); + int level = NUM2INT(argv[0]); + if (level == 0) return rb_hash_to_a(hash); ary = rb_ary_new_capa(RHASH_SIZE(hash) * 2); rb_hash_foreach(hash, flatten_i, ary); - if (level - 1 > 0) { - *argv = INT2FIX(level - 1); - rb_funcallv(ary, id_flatten_bang, argc, argv); + level--; + + if (level > 0) { + VALUE ary_flatten_level = INT2FIX(level); + rb_funcallv(ary, id_flatten_bang, 1, &ary_flatten_level); } else if (level < 0) { + /* flatten recursively */ rb_funcallv(ary, id_flatten_bang, 0, 0); } } diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 01b4f3a67d..813afaeee0 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1118,7 +1118,12 @@ class TestHash < Test::Unit::TestCase assert_equal([1, "one", 2, 2, "two", 3, 3, ["three"]], a.flatten(2)) assert_equal([1, "one", 2, 2, "two", 3, 3, "three"], a.flatten(3)) assert_equal([1, "one", 2, 2, "two", 3, 3, "three"], a.flatten(-1)) - assert_raise(TypeError){ a.flatten(Object) } + assert_raise(TypeError){ a.flatten(nil) } + end + + def test_flatten_arity + a = @cls[1=> "one", 2 => [2,"two"], 3 => [3, ["three"]]] + assert_raise(ArgumentError){ a.flatten(1, 2) } end def test_callcc |