summaryrefslogtreecommitdiffstats
path: root/string.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-17 19:04:29 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-17 19:04:29 +0000
commitd2a4039cb42bd4a85c2f87a27cbbfbf990f63537 (patch)
tree161176e4eef5bfe5a88d0177728dcd8780899337 /string.c
parent966935629ba6c6d3bdeed4ad8d21af9f4ec2f2d9 (diff)
downloadruby-d2a4039cb42bd4a85c2f87a27cbbfbf990f63537.tar.gz
ruby-d2a4039cb42bd4a85c2f87a27cbbfbf990f63537.tar.xz
ruby-d2a4039cb42bd4a85c2f87a27cbbfbf990f63537.zip
* re.c (rb_memsearch_ss): simple shift search.
* re.c (rb_memsearch_qs): quick search. * re.c (rb_memsearch_qs_utf8): quick search for UTF-8 string. * re.c (rb_memsearch_qs_utf8_hash): hash functions for above. * re.c (rb_memsearch): use above functions. * string.c (rb_str_index): give enc to rb_memsearch. * include/ruby/intern.h (rb_memsearch): move to encoding.h. * include/ruby/encoding.h (rb_memsearch): move from intern.h. * common.mk (PREP): add dependency. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/string.c b/string.c
index deb3d150f..ecdd0cbbe 100644
--- a/string.c
+++ b/string.c
@@ -2088,7 +2088,7 @@ rb_str_index(VALUE str, VALUE sub, long offset)
len = RSTRING_LEN(str) - offset;
for (;;) {
char *t;
- pos = rb_memsearch(sptr, slen, s, len);
+ pos = rb_memsearch(sptr, slen, s, len, enc);
if (pos < 0) return pos;
t = rb_enc_right_char_head(s, s+pos, enc);
if (t == s + pos) break;