diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-07 06:35:26 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-07 06:35:26 +0000 |
commit | 34033db665f806bf37f142171c391c739a9f5409 (patch) | |
tree | 5bd0f9b6b7c7697c69357d142c28049747eb21ba /string.c | |
parent | b89cbf192b09dcdd6df6256a0c8d61e17664e2ad (diff) |
* intern.h, re.c (rb_memsearch): returns long.
* string.c (rb_str_index): should return offset position.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -839,14 +839,18 @@ rb_str_index(str, sub, offset) VALUE str, sub; long offset; { + long pos; + if (offset < 0) { offset += RSTRING(str)->len; if (offset < 0) return -1; } if (RSTRING(str)->len - offset < RSTRING(sub)->len) return -1; if (RSTRING(sub)->len == 0) return offset; - return rb_memsearch(RSTRING(sub)->ptr, RSTRING(sub)->len, + pos = rb_memsearch(RSTRING(sub)->ptr, RSTRING(sub)->len, RSTRING(str)->ptr+offset, RSTRING(str)->len-offset); + if (pos < 0) return pos; + return pos + offset; } static VALUE |