1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (str_strlen): use enc_strlen if the coderange is known.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-04-18 06:43:08 +00:00
parent 0ab9abe069
commit c37ac7ba91
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Apr 18 14:32:40 2014 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (str_strlen): use enc_strlen if the coderange is known.
Fri Apr 18 14:21:21 2014 NARUSE, Yui <naruse@ruby-lang.org> Fri Apr 18 14:21:21 2014 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (enc_strlen): move UTF-8 optimization from str_strlen to * string.c (enc_strlen): move UTF-8 optimization from str_strlen to

17
string.c
View File

@ -1187,6 +1187,9 @@ rb_enc_strlen(const char *p, const char *e, rb_encoding *enc)
return enc_strlen(p, e, enc, ENC_CODERANGE_UNKNOWN); return enc_strlen(p, e, enc, ENC_CODERANGE_UNKNOWN);
} }
/* To get strlen with cr
* Note that given cr is not used.
*/
long long
rb_enc_strlen_cr(const char *p, const char *e, rb_encoding *enc, int *cr) rb_enc_strlen_cr(const char *p, const char *e, rb_encoding *enc, int *cr)
{ {
@ -1243,12 +1246,11 @@ rb_enc_strlen_cr(const char *p, const char *e, rb_encoding *enc, int *cr)
return c; return c;
} }
/* enc must be compatible with str's enc */ /* enc must be str's enc or rb_enc_check(str, str2) */
static long static long
str_strlen(VALUE str, rb_encoding *enc) str_strlen(VALUE str, rb_encoding *enc)
{ {
const char *p, *e; const char *p, *e;
long n;
int cr; int cr;
if (single_byte_optimizable(str)) return RSTRING_LEN(str); if (single_byte_optimizable(str)) return RSTRING_LEN(str);
@ -1257,12 +1259,15 @@ str_strlen(VALUE str, rb_encoding *enc)
e = RSTRING_END(str); e = RSTRING_END(str);
cr = ENC_CODERANGE(str); cr = ENC_CODERANGE(str);
n = rb_enc_strlen_cr(p, e, enc, &cr); if (cr == ENC_CODERANGE_UNKNOWN) {
if (cr) { long n = rb_enc_strlen_cr(p, e, enc, &cr);
ENC_CODERANGE_SET(str, cr); if (cr) ENC_CODERANGE_SET(str, cr);
}
return n; return n;
} }
else {
return enc_strlen(p, e, enc, cr);
}
}
long long
rb_str_strlen(VALUE str) rb_str_strlen(VALUE str)