[ruby-dev:19528] String#index with offset

なかだです。

"hello".index("l", 3)が0を返します。それとrb_memsearch()もlong
を返すようにしたほうがいいような気がします。引数もlongだし。


Index: intern.h
===================================================================
RCS file: /cvs/ruby/src/ruby/intern.h,v
retrieving revision 1.110
diff -u -2 -p -r1.110 intern.h
--- intern.h	3 Feb 2003 05:34:14 -0000	1.110
+++ intern.h	7 Feb 2003 05:40:52 -0000
@@ -331,5 +331,5 @@ VALUE rb_length_by_each _((VALUE));
 int rb_memcmp _((char*,char*,long));
 int rb_memcicmp _((char*,char*,long));
-int rb_memsearch _((char*,long,char*,long));
+long rb_memsearch _((char*,long,char*,long));
 VALUE rb_reg_nth_defined _((int, VALUE));
 VALUE rb_reg_nth_match _((int, VALUE));
Index: re.c
===================================================================
RCS file: /cvs/ruby/src/ruby/re.c,v
retrieving revision 1.98
diff -u -2 -p -r1.98 re.c
--- re.c	6 Feb 2003 10:06:47 -0000	1.98
+++ re.c	7 Feb 2003 05:40:34 -0000
@@ -97,5 +97,5 @@ rb_memcmp(p1, p2, len)
 }
 
-int
+long
 rb_memsearch(x0, m, y0, n)
     char *x0, *y0;
Index: string.c
===================================================================
RCS file: /cvs/ruby/src/ruby/string.c,v
retrieving revision 1.140
diff -u -2 -p -w -r1.140 string.c
--- string.c	6 Feb 2003 08:25:12 -0000	1.140
+++ string.c	7 Feb 2003 05:41:45 -0000
@@ -840,4 +840,6 @@ rb_str_index(str, sub, offset)
     long offset;
 {
+    long pos;
+
     if (offset < 0) {
 	offset += RSTRING(str)->len;
@@ -846,6 +848,8 @@ rb_str_index(str, sub, offset)
     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;
 }
 


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦