* encoding.c (is_data_encoding): fix condition.
* encoding.c (enc_capable): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9a28cb243c
commit
8b83fc2704
@ -1,3 +1,9 @@
|
|||||||
|
Wed Aug 12 07:38:12 2009 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
|
* encoding.c (is_data_encoding): fix condition.
|
||||||
|
|
||||||
|
* encoding.c (enc_capable): ditto.
|
||||||
|
|
||||||
Tue Aug 11 23:12:31 2009 Tadayoshi Funaba <tadf@dotrb.org>
|
Tue Aug 11 23:12:31 2009 Tadayoshi Funaba <tadf@dotrb.org>
|
||||||
|
|
||||||
* lib/date.rb (complete_frags): Monday must be suitable for %W's
|
* lib/date.rb (complete_frags): Monday must be suitable for %W's
|
||||||
|
@ -62,7 +62,7 @@ static const rb_data_type_t encoding_data_type = {
|
|||||||
"encoding", 0, 0, enc_memsize,
|
"encoding", 0, 0, enc_memsize,
|
||||||
};
|
};
|
||||||
|
|
||||||
#define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) != &encoding_data_type)
|
#define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type)
|
||||||
|
|
||||||
static VALUE
|
static VALUE
|
||||||
enc_new(rb_encoding *encoding)
|
enc_new(rb_encoding *encoding)
|
||||||
@ -585,7 +585,7 @@ enc_capable(VALUE obj)
|
|||||||
case T_FILE:
|
case T_FILE:
|
||||||
return TRUE;
|
return TRUE;
|
||||||
case T_DATA:
|
case T_DATA:
|
||||||
if (!is_data_encoding(obj)) return TRUE;
|
if (is_data_encoding(obj)) return TRUE;
|
||||||
default:
|
default:
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user