From f262909cba89361e786a7e097908d5923fff61c3 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 20 Jul 2013 20:44:49 +0000 Subject: * hash.c (rb_hash_flatten): use NUM2INT to raise TypeError on 32bit platform. it's introduced by r42039 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ hash.c | 2 +- test/ruby/test_hash.rb | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cda44a3b24..0522ef4971 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jul 21 03:36:18 2013 NARUSE, Yui + + * 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 * common.mk (help): Fix environment variable name and argument. diff --git a/hash.c b/hash.c index 447d73feb1..3c448c0b0e 100644 --- a/hash.c +++ b/hash.c @@ -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 -- cgit v1.2.3