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

encoding.c: is_obj_encoding

Browse Source 
* encoding.c (is_obj_encoding): new macro to check if obj is an
  Encoding.  obj can be any type while is_data_encoding expects T_DATA
  only.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-07-25 08:21:23 +00:00
parent 84d473b750
commit 6c00e17706
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Jul 25 17:21:21 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (is_obj_encoding): new macro to check if obj is an
Encoding. obj can be any type while is_data_encoding expects T_DATA
only.
Thu Jul 25 17:17:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jul 25 17:17:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_expand_path_internal): should clear coderange after * file.c (rb_file_expand_path_internal): should clear coderange after

5
encoding.c
View File

@ -73,6 +73,7 @@ static const rb_data_type_t encoding_data_type = {
}; };
#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)
#define is_obj_encoding(obj) (RB_TYPE_P((obj), T_DATA) && is_data_encoding(obj))
static VALUE static VALUE
enc_new(rb_encoding *encoding) enc_new(rb_encoding *encoding)
@ -121,7 +122,7 @@ check_encoding(rb_encoding *enc)
static int static int
enc_check_encoding(VALUE obj) enc_check_encoding(VALUE obj)
{ {
if (!RB_TYPE_P(obj, T_DATA) || !is_data_encoding(obj)) { if (!is_obj_encoding(obj)) {
return -1; return -1;
} }
return check_encoding(RDATA(obj)->data); return check_encoding(RDATA(obj)->data);
@ -1143,7 +1144,7 @@ static VALUE
enc_find(VALUE klass, VALUE enc) enc_find(VALUE klass, VALUE enc)
{ {
int idx; int idx;
if (RB_TYPE_P(enc, T_DATA) && is_data_encoding(enc)) if (is_obj_encoding(enc))
return enc; return enc;
idx = str_to_encindex(enc); idx = str_to_encindex(enc);
if (idx == UNSPECIFIED_ENCODING) return Qnil; if (idx == UNSPECIFIED_ENCODING) return Qnil;