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

* encoding.c (Init_Encoding): new instance method Encoding#names,

Browse Source 
returns its name and alias names.

* encoding.c (enc_names): defined for Encoding#names.

* encoding.c (enc_names_i): defined for enc_names.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19722 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2008-10-09 02:52:39 +00:00
parent f59b1dfbfb
commit 517a1c3406
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Thu Oct 9 11:29:33 2008 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (Init_Encoding): new instance method Encoding#names,
returns its name and alias names.
* encoding.c (enc_names): defined for Encoding#names.
* encoding.c (enc_names_i): defined for enc_names.
Thu Oct 9 08:47:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* thread.c (rb_thread_wait_fd_rw): should not block by select if

30
encoding.c
View File

@ -823,6 +823,35 @@ enc_name(VALUE self)
return rb_usascii_str_new2(rb_enc_name((rb_encoding*)DATA_PTR(self)));
}
static int
enc_names_i(st_data_t name, st_data_t idx, st_data_t ary)
{
if ((int)idx == FIX2INT(rb_ary_entry(ary, 0))) {
VALUE str = rb_usascii_str_new2((char *)name);
OBJ_FREEZE(str);
rb_ary_push(ary, str);
}
return ST_CONTINUE;
}
/*
* call-seq:
* enc.names => array
*
* Returns the list of name and aliases of the encoding.
*
* Encoding::WINDOWS_31J.names => ["Windows-31J", "CP932", "csWindows31J"]
*/
static VALUE
enc_names(VALUE self)
{
VALUE ary = rb_ary_new2(0);
rb_ary_push(ary, INT2FIX(rb_to_encoding_index(self)));
st_foreach(enc_table.names, enc_names_i, (st_data_t)ary);
rb_ary_shift(ary);
return ary;
}
/*
* call-seq:
* Encoding.list => [enc1, enc2, ...]
@ -1250,6 +1279,7 @@ Init_Encoding(void)
rb_define_method(rb_cEncoding, "to_s", enc_name, 0);
rb_define_method(rb_cEncoding, "inspect", enc_inspect, 0);
rb_define_method(rb_cEncoding, "name", enc_name, 0);
rb_define_method(rb_cEncoding, "names", enc_names, 0);
rb_define_method(rb_cEncoding, "dummy?", enc_dummy_p, 0);
rb_define_singleton_method(rb_cEncoding, "list", enc_list, 0);
rb_define_singleton_method(rb_cEncoding, "name_list", rb_enc_name_list, 0);