From c1d34650810cdc2285e153ec446b7a0941b0c92e Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 23 Feb 2008 11:18:07 +0000 Subject: * string.c (str_sublen): removed. * string.c (rb_str_reverse, rb_str_reverse_bang): use single_byte_optimizable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ string.c | 18 ++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49c420ea3d..ad35bd0983 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Feb 23 20:16:05 2008 NARUSE, Yui + + * string.c (str_sublen): removed. + + * string.c (rb_str_reverse, rb_str_reverse_bang): use + single_byte_optimizable. + Sat Feb 23 19:25:18 2008 NARUSE, Yui * string.c (rb_enc_cr_str_copy_for_substr): renamed from diff --git a/string.c b/string.c index d798e00e1a..596459d919 100644 --- a/string.c +++ b/string.c @@ -1165,23 +1165,17 @@ str_utf8_offset(const char *p, const char *e, int nth) } #endif -static long -str_sublen(VALUE str, long pos, rb_encoding *enc) +long +rb_str_sublen(VALUE str, long pos) { - if (rb_enc_mbmaxlen(enc) == 1 || pos < 0) + if (single_byte_optimizable(str) || pos < 0) return pos; else { char *p = RSTRING_PTR(str); - return rb_enc_strlen(p, p + pos, enc); + return rb_enc_strlen(p, p + pos, STR_ENC_GET(str)); } } -int -rb_str_sublen(VALUE str, int len) -{ - return str_sublen(str, len, STR_ENC_GET(str)); -} - VALUE rb_str_subseq(VALUE str, long beg, long len) { @@ -3480,7 +3474,7 @@ rb_str_reverse(VALUE str) p = RSTRING_END(obj); if (RSTRING_LEN(str) > 1) { - if (rb_enc_mbmaxlen(enc) == 1) { + if (single_byte_optimizable(str)) { while (s < e) { *--p = *s++; } @@ -3521,7 +3515,7 @@ rb_str_reverse_bang(VALUE str) s = RSTRING_PTR(str); e = RSTRING_END(str) - 1; - if (rb_enc_mbmaxlen(enc) == 1) { + if (single_byte_optimizable(str)) { while (s < e) { c = *s; *s++ = *e; -- cgit v1.2.3