diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-21 20:08:03 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-21 20:08:03 +0000 |
commit | 3ee7fcc76364021b3bbc52fcc72845d81b14d375 (patch) | |
tree | 839de0ad5cc78f63ecb2586dfa3c80fe0793600e /string.c | |
parent | 1b4d0c76de494b8bdbcf83db6f0d0950d4ccc64a (diff) |
* string.c (rb_str_count): optimized for 1byte string count by
avoiding tr_setup_table().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 24 |
1 files changed, 18 insertions, 6 deletions
@@ -5380,19 +5380,31 @@ rb_str_count(int argc, VALUE *argv, VALUE str) rb_raise(rb_eArgError, "wrong number of arguments"); } for (i=0; i<argc; i++) { - VALUE s = argv[i]; + VALUE tstr = argv[i]; + unsigned char c; - StringValue(s); - enc = rb_enc_check(str, s); - tr_setup_table(s, table, i==0, &del, &nodel, enc); + StringValue(tstr); + enc = rb_enc_check(str, tstr); + if (argc == 1 && RSTRING_LEN(tstr) == 1 && rb_enc_asciicompat(enc) && + (c = RSTRING_PTR(tstr)[0]) < 0x80 && !is_broken_string(str)) { + int n = 0; + + s = RSTRING_PTR(str); + if (!s || RSTRING_LEN(str) == 0) return INT2FIX(0); + send = RSTRING_END(str); + while (s < send) { + if (*(unsigned char*)s++ == c) n++; + } + return INT2NUM(n); + } + tr_setup_table(tstr, table, i==0, &del, &nodel, enc); } s = RSTRING_PTR(str); if (!s || RSTRING_LEN(str) == 0) return INT2FIX(0); send = RSTRING_END(str); - i = 0; ascompat = rb_enc_asciicompat(enc); - + i = 0; while (s < send) { unsigned int c; int clen; |