kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* string.c (str_strlen): use search_nonascii() for performance.

Browse source 
* string.c (str_nth): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-02-15 08:14:40 +00:00
parent 878bbd1199
commit 8b09f7015a
3 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Feb 15 17:12:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (str_strlen): use search_nonascii() for performance.
* string.c (str_nth): ditto.
Fri Feb 15 16:22:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (open_key_args): allow specifying both :mode and :encoding.

4
encoding.c
View file

@ -645,8 +645,8 @@ rb_enc_check(VALUE str1, VALUE str2)
rb_encoding *enc = rb_enc_compatible(str1, str2);
if (!enc)
rb_raise(rb_eArgError, "character encodings differ: %s and %s",
rb_enc_name(rb_enc_get(str1)),
rb_enc_name(rb_enc_get(str2)));
rb_enc_name(rb_enc_get(str1)),
rb_enc_name(rb_enc_get(str2)));
return enc;
}

35
string.c
View file

@ -591,11 +591,21 @@ rb_str_init(int argc, VALUE *argv, VALUE str)
static long
str_strlen(VALUE str, rb_encoding *enc)
{
long len;
long len = 0;
const char *p, *e;
if (single_byte_optimizable(str)) return RSTRING_LEN(str);
if (!enc) enc = STR_ENC_GET(str);
len = rb_enc_strlen(RSTRING_PTR(str), RSTRING_END(str), enc);
p = RSTRING_PTR(str);
e = RSTRING_END(str);
if (rb_enc_asciicompat(enc)) {
const char *p2 = search_nonascii(p, e);
if (!p2) return RSTRING_LEN(str);
len = p2 - p;
p = p2;
}
len += rb_enc_strlen(p, e, enc);
if (len < 0) {
rb_raise(rb_eArgError, "invalid mbstring sequence");
}
@ -886,8 +896,17 @@ str_nth(const char *p, const char *e, int nth, rb_encoding *enc, int singlebyte)
{
if (singlebyte)
p += nth;
else
else {
if (rb_enc_asciicompat(enc)) {
const char *p2 = search_nonascii(p, e);
if (!p2 || p + nth < p2)
return (char*)p + nth;
nth -= p2 - p;
p = p2;
}
p = rb_enc_nth(p, e, nth, enc);
}
if (!p) return 0;
if (p > e) p = e;
return (char *)p;
@ -2805,14 +2824,12 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
enc = rb_enc_compatible(str, repl);
if (!enc) {
rb_encoding *str_enc = STR_ENC_GET(str);
if (coderange_scan(RSTRING_PTR(str), BEG(0), str_enc) !=
ENC_CODERANGE_7BIT ||
if (coderange_scan(RSTRING_PTR(str), BEG(0), str_enc) != ENC_CODERANGE_7BIT ||
coderange_scan(RSTRING_PTR(str)+END(0),
RSTRING_LEN(str)-END(0), str_enc) !=
ENC_CODERANGE_7BIT) {
RSTRING_LEN(str)-END(0), str_enc) != ENC_CODERANGE_7BIT) {
rb_raise(rb_eArgError, "character encodings differ: %s and %s",
rb_enc_name(str_enc),
rb_enc_name(STR_ENC_GET(repl)));
rb_enc_name(str_enc),
rb_enc_name(STR_ENC_GET(repl)));
}
enc = STR_ENC_GET(repl);
}