From 5bb7c8612fc0904070aa9cfad096e3c462877903 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 21 Dec 2007 07:52:49 +0000 Subject: [PATCH] * encoding.c (Init_Encoding): use enc_name as to_s. (enc_inspect): renamed from enc_to_s. add "#" at beginning. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ encoding.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 296a2874dd..14da83e5bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Dec 21 16:50:43 2007 Tanaka Akira + + * 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 * ext/nkf/nkf-utf8/config.h (MIME_DECODE_DEFAULT, X0201_DEFAULT): diff --git a/encoding.c b/encoding.c index db384f57b0..32117239ce 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);