summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-14 17:21:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-14 17:21:36 +0000
commit2dc7d111f8013f848ea375cc9fc77bb238dceaf6 (patch)
tree48cfa785282e2342da09649de0a7fd03bec46852
parentf2dc5f15bab9b6200b914755c40655b064153d43 (diff)
encoding.c: encoding at inspect
* encoding.c (enc_inspect): use PRIsVALUE to preserve the result encoding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--encoding.c9
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ac0b358121..ca07a9b9ab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Mon Jul 15 02:21:29 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jul 15 02:21:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * encoding.c (enc_inspect): use PRIsVALUE to preserve the result
+ encoding.
* encoding.c (enc_set_index): deal with terminator so that
rb_enc_set_index also works.
diff --git a/encoding.c b/encoding.c
index 244ef05f5e1..e1b14dcda5d 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1023,11 +1023,10 @@ rb_enc_tolower(int c, rb_encoding *enc)
static VALUE
enc_inspect(VALUE self)
{
- VALUE str = rb_sprintf("#<%s:%s%s>", rb_obj_classname(self),
- rb_enc_name((rb_encoding*)DATA_PTR(self)),
- (enc_dummy_p(self) ? " (dummy)" : ""));
- ENCODING_CODERANGE_SET(str, ENCINDEX_US_ASCII, ENC_CODERANGE_7BIT);
- return str;
+ return rb_enc_sprintf(rb_usascii_encoding(),
+ "#<%"PRIsVALUE":%s%s>", rb_obj_class(self),
+ rb_enc_name((rb_encoding*)DATA_PTR(self)),
+ (enc_dummy_p(self) ? " (dummy)" : ""));
}
/*