1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hash.c: reduce warning

Browse Source 
* hash.c (HAS_EXTRA_STATES): warn extra states only when something
  differ.  [ruby-core:59254] [Bug #9275]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-23 06:53:51 +00:00
parent 21e74f5481
commit c25c84777c
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Dec 23 15:53:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (HAS_EXTRA_STATES): warn extra states only when something
differ. [ruby-core:59254] [Bug #9275]
Mon Dec 23 12:42:13 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> Mon Dec 23 12:42:13 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* array.c: Have to_h raise on elements that are not key-value pairs * array.c: Have to_h raise on elements that are not key-value pairs

15
hash.c
View File

@ -28,12 +28,23 @@
#endif #endif
#define HAS_EXTRA_STATES(hash, klass) ( \ #define HAS_EXTRA_STATES(hash, klass) ( \
(klass = rb_obj_class(hash)) != rb_cHash || \ (klass = has_extra_methods(rb_obj_class(hash))) != 0 || \
(klass = 0, \
FL_TEST((hash), FL_EXIVAR|FL_TAINT|HASH_PROC_DEFAULT) || \ FL_TEST((hash), FL_EXIVAR|FL_TAINT|HASH_PROC_DEFAULT) || \
!NIL_P(RHASH_IFNONE(hash)))) !NIL_P(RHASH_IFNONE(hash))))
#define HASH_REJECT_COPY_EXTRA_STATES 1 #define HASH_REJECT_COPY_EXTRA_STATES 1
static VALUE
has_extra_methods(VALUE klass)
{
const VALUE base = rb_cHash;
VALUE c = klass;
while (c != base) {
st_table *mtbl = RCLASS_M_TBL(c);
if (mtbl && mtbl->num_entries) return klass;
}
return 0;
}
static VALUE rb_hash_s_try_convert(VALUE, VALUE); static VALUE rb_hash_s_try_convert(VALUE, VALUE);
/* /*

17
test/ruby/test_hash.rb
View File

@ -558,12 +558,22 @@ class TestHash < Test::Unit::TestCase
assert_equal(h3, h.reject {|k,v| v }) assert_equal(h3, h.reject {|k,v| v })
assert_equal(base, h) assert_equal(base, h)
return unless RUBY_VERSION > "2.1.0" unless RUBY_VERSION > "2.1.0"
if @cls == Hash
assert_empty(EnvUtil.verbose_warning {h.reject {false}})
bug9275 = '[ruby-core:59254] [Bug #9275]'
c = Class.new(Hash)
assert_empty(EnvUtil.verbose_warning {c.new.reject {false}}, bug9275)
else
assert_match(/extra states/, EnvUtil.verbose_warning {h.reject {false}})
end
return
end
h.instance_variable_set(:@foo, :foo) h.instance_variable_set(:@foo, :foo)
h.default = 42 h.default = 42
h.taint h.taint
h = h.reject {false} h = EnvUtil.suppress_warning {h.reject {false}}
assert_instance_of(Hash, h) assert_instance_of(Hash, h)
assert_not_predicate(h, :tainted?) assert_not_predicate(h, :tainted?)
assert_nil(h.default) assert_nil(h.default)
@ -1219,6 +1229,9 @@ class TestHash < Test::Unit::TestCase
class TestSubHash < TestHash class TestSubHash < TestHash
class SubHash < Hash class SubHash < Hash
def reject(*)
super
end
end end
def setup def setup