From c37ac7ba91f5944adef234683617aa5681b8f97b Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 18 Apr 2014 06:43:08 +0000 Subject: * string.c (str_strlen): use enc_strlen if the coderange is known. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 45c95d0931..5b5a24f4d0 100644 --- a/string.c +++ b/string.c @@ -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); } +/* To get strlen with cr + * Note that given cr is not used. + */ long 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; } -/* enc must be compatible with str's enc */ +/* enc must be str's enc or rb_enc_check(str, str2) */ static long str_strlen(VALUE str, rb_encoding *enc) { const char *p, *e; - long n; int cr; if (single_byte_optimizable(str)) return RSTRING_LEN(str); @@ -1257,11 +1259,14 @@ str_strlen(VALUE str, rb_encoding *enc) e = RSTRING_END(str); cr = ENC_CODERANGE(str); - n = rb_enc_strlen_cr(p, e, enc, &cr); - if (cr) { - ENC_CODERANGE_SET(str, cr); + if (cr == ENC_CODERANGE_UNKNOWN) { + long n = rb_enc_strlen_cr(p, e, enc, &cr); + if (cr) ENC_CODERANGE_SET(str, cr); + return n; + } + else { + return enc_strlen(p, e, enc, cr); } - return n; } long -- cgit v1.2.3