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

hash.c: reword

Browse Source 
* hash.c (HAS_EXTRA_STATES, rb_hash_reject): use words
  "extra states".

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

19
hash.c
View File

@ -27,12 +27,12 @@
# endif # endif
#endif #endif
#define HAS_MISC_ATTRIBUTES(hash, klass) ( \ #define HAS_EXTRA_STATES(hash, klass) ( \
(klass = rb_obj_class(hash)) != rb_cHash || \ (klass = rb_obj_class(hash)) != rb_cHash || \
(klass = 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_MISC_ATTRIBUTES 1 #define HASH_REJECT_COPY_EXTRA_STATES 1
static VALUE rb_hash_s_try_convert(VALUE, VALUE); static VALUE rb_hash_s_try_convert(VALUE, VALUE);
@ -1133,11 +1133,11 @@ rb_hash_reject(VALUE hash)
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
if (RTEST(ruby_verbose)) { if (RTEST(ruby_verbose)) {
VALUE klass; VALUE klass;
if (HAS_MISC_ATTRIBUTES(hash, klass)) { if (HAS_EXTRA_STATES(hash, klass)) {
#if HASH_REJECT_COPY_MISC_ATTRIBUTES #if HASH_REJECT_COPY_EXTRA_STATES
rb_warn("copying unguaranteed attributes: %+"PRIsVALUE, hash); rb_warn("copying extra states: %+"PRIsVALUE, hash);
rb_warn("following atributes will not be copied in the future version:"); rb_warn("following states will not be copied in the future version:");
if (klass != rb_cHash) { if (klass) {
rb_warn(" subclass: %+"PRIsVALUE, klass); rb_warn(" subclass: %+"PRIsVALUE, klass);
} }
if (FL_TEST(hash, FL_EXIVAR)) { if (FL_TEST(hash, FL_EXIVAR)) {
@ -1153,8 +1153,7 @@ rb_hash_reject(VALUE hash)
else if (!NIL_P(RHASH_IFNONE(hash))) else if (!NIL_P(RHASH_IFNONE(hash)))
rb_warn(" default value: %+"PRIsVALUE, RHASH_IFNONE(hash)); rb_warn(" default value: %+"PRIsVALUE, RHASH_IFNONE(hash));
#else #else
rb_warn("unguaranteed attributes are not copied: %+"PRIsVALUE, hash); rb_warn("extra states are no longer copied: %+"PRIsVALUE, hash);
rb_warn("following atributes are ignored now:");
#endif #endif
} }
} }