diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-23 11:18:07 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-23 11:18:07 +0000 |
commit | c1d34650810cdc2285e153ec446b7a0941b0c92e (patch) | |
tree | e8fa720ef7279b9004ca1bf50d7a583553348805 /string.c | |
parent | 386aa4c0a137949df4b20148451843d53ea9b41d (diff) |
* 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
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -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; |