diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | hash.c | 2 | ||||
-rw-r--r-- | test/ruby/test_hash.rb | 9 |
3 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Jul 21 03:36:18 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * hash.c (rb_hash_flatten): use NUM2INT to raise TypeError on 32bit + platform. it's introduced by r42039 + Sun Jul 21 01:07:45 2013 Benoit Daloze <eregontp@gmail.com> * common.mk (help): Fix environment variable name and argument. @@ -2223,7 +2223,7 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash) ary = rb_ary_new_capa(RHASH_SIZE(hash) * 2); rb_hash_foreach(hash, flatten_i, ary); if (argc) { - int level = FIX2INT(*argv) - 1; + int level = NUM2INT(*argv) - 1; if (level > 0) { *argv = INT2FIX(level); rb_funcall2(ary, rb_intern("flatten!"), argc, argv); diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 75a3a396af..1baff2982c 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -879,6 +879,15 @@ class TestHash < Test::Unit::TestCase def test_flatten assert_equal([[1], [2]], {[1] => [2]}.flatten) + + a = {1=> "one", 2 => [2,"two"], 3 => [3, ["three"]]} + assert_equal([1, "one", 2, [2, "two"], 3, [3, ["three"]]], a.flatten) + assert_equal([1, "one", 2, [2, "two"], 3, [3, ["three"]]], a.flatten(-1)) + assert_equal([1, "one", 2, [2, "two"], 3, [3, ["three"]]], a.flatten(0)) + assert_equal([1, "one", 2, [2, "two"], 3, [3, ["three"]]], a.flatten(1)) + 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_raise(TypeError){ a.flatten(Object) } end def test_callcc |