kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* object.c (rb_Hash): trivial optimization.

Browse source 
* test/ruby/test_object.rb (TestObject#test_convert_hash): fix
  arguments order.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34368 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-01-24 04:29:07 +00:00
parent 498838c662
commit d03199b6d6
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
object.c
View file

@ -2600,7 +2600,7 @@ rb_Hash(VALUE val)
if (NIL_P(val)) return rb_hash_new();
VALUE tmp = rb_check_hash_type(val);
if (NIL_P(tmp)) {
if (TYPE(val) == T_ARRAY && RARRAY_LEN(val) == 0)
if (RB_TYPE_P(val, T_ARRAY) && RARRAY_LEN(val) == 0)
return rb_hash_new();
rb_raise(rb_eTypeError, "can't convert %s into Hash", rb_obj_classname(val));
}

8
test/ruby/test_object.rb
View file

@ -198,14 +198,14 @@ class TestObject < Test::Unit::TestCase
end
def test_convert_hash
assert_equal(Hash(nil), {})
assert_equal(Hash([]), {})
assert_equal(Hash(key: :value), {key: :value})
assert_equal({}, Hash(nil))
assert_equal({}, Hash([]))
assert_equal({key: :value}, Hash(key: :value))
assert_raise(TypeError) { Hash([1,2]) }
assert_raise(TypeError) { Hash(Object.new) }
o = Object.new
def o.to_hash; {a: 1, b: 2}; end
assert_equal(Hash(o), {a: 1, b: 2})
assert_equal({a: 1, b: 2}, Hash(o))
def o.to_hash; 9; end
assert_raise(TypeError) { Hash(o) }
end