diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 07:52:49 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 07:52:49 +0000 |
| commit | 66facfbb2cd351b6be9dd20349237533c7bed950 (patch) | |
| tree | cfdd2090302897dc2ed21b6616169193e6f6095c | |
| parent | 152534a51e40fc6d5661cf85c1d34c9c3390cbd0 (diff) | |
| download | ruby-66facfbb2cd351b6be9dd20349237533c7bed950.tar.gz ruby-66facfbb2cd351b6be9dd20349237533c7bed950.tar.xz ruby-66facfbb2cd351b6be9dd20349237533c7bed950.zip | |
* encoding.c (Init_Encoding): use enc_name as to_s.
(enc_inspect): renamed from enc_to_s. add "#" at beginning.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | encoding.c | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Fri Dec 21 16:50:43 2007 Tanaka Akira <akr@fsij.org> + + * encoding.c (Init_Encoding): use enc_name as to_s. + (enc_inspect): renamed from enc_to_s. add "#" at beginning. + Fri Dec 21 16:37:43 2007 NARUSE, Yui <naruse@ruby-lang.org> * ext/nkf/nkf-utf8/config.h (MIME_DECODE_DEFAULT, X0201_DEFAULT): diff --git a/encoding.c b/encoding.c index db384f57b..32117239c 100644 --- a/encoding.c +++ b/encoding.c @@ -629,9 +629,9 @@ rb_enc_tolower(int c, rb_encoding *enc) } static VALUE -enc_to_s(VALUE self) +enc_inspect(VALUE self) { - return rb_sprintf("<%s:%s>", rb_obj_classname(self), + return rb_sprintf("#<%s:%s>", rb_obj_classname(self), rb_enc_name((rb_encoding*)DATA_PTR(self))); } @@ -811,8 +811,8 @@ Init_Encoding(void) rb_cEncoding = rb_define_class("Encoding", rb_cObject); rb_undef_alloc_func(rb_cEncoding); - rb_define_method(rb_cEncoding, "to_s", enc_to_s, 0); - rb_define_method(rb_cEncoding, "inspect", enc_to_s, 0); + 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, "based_encoding", enc_based_encoding, 0); rb_define_singleton_method(rb_cEncoding, "list", enc_list, 0); |