summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-14 01:11:05 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-14 01:11:05 +0000
commite4606db2d5315f5dba524672fed412b380954ba9 (patch)
treee05950f77743d2145ab7f80f5901eb7235d26dc9
parentdd058fa6afd41eec823f493c44c8acf776e58e65 (diff)
downloadruby-e4606db2d5315f5dba524672fed412b380954ba9.tar.gz
ruby-e4606db2d5315f5dba524672fed412b380954ba9.tar.xz
ruby-e4606db2d5315f5dba524672fed412b380954ba9.zip
* string.c (rb_str_inspect): use rb_enc_mbc_to_codepoint
because we already knew char is found and got length. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--string.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 93eb62d87..f988ad517 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 14 10:08:19 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * string.c (rb_str_inspect): use rb_enc_mbc_to_codepoint
+ because we already knew char is found and got length.
+
Mon Sep 14 09:59:03 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/ruby.h (NUM2INT, NUM2LL, INT2NUM, UINT2NUM),
diff --git a/string.c b/string.c
index aa36c37d7..9aea029fe 100644
--- a/string.c
+++ b/string.c
@@ -4278,8 +4278,7 @@ rb_str_inspect(VALUE str)
goto escape_codepoint;
}
n = MBCLEN_CHARFOUND_LEN(n);
-
- c = rb_enc_codepoint_len(p, pend, &n, enc);
+ c = rb_enc_mbc_to_codepoint(p, pend, enc);
p += n;
if (c == '"'|| c == '\\' ||
(c == '#' &&