1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* re.c (rb_reg_match): should calculate offset by converted

Browse Source 
operand.  [ruby-cvs:21416]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-10 10:03:48 +00:00
parent 32bfc874fa
commit f6a9c859be
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Dec 10 19:02:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (rb_reg_match): should calculate offset by converted
operand. [ruby-cvs:21416]
Mon Dec 10 18:28:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org> Mon Dec 10 18:28:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/uri/common.rb (URI::REGEXP::PATTERN): typo in REG_NAME * lib/uri/common.rb (URI::REGEXP::PATTERN): typo in REG_NAME

10
re.c
View File

@ -2124,13 +2124,15 @@ reg_operand(VALUE s, int check)
} }
static long static long
rb_reg_match_pos(VALUE re, VALUE str, long pos) reg_match_pos(VALUE re, VALUE *strp, long pos)
{ {
VALUE str = *strp;
if (NIL_P(str)) { if (NIL_P(str)) {
rb_backref_set(Qnil); rb_backref_set(Qnil);
return -1; return -1;
} }
str = reg_operand(str, Qtrue); *strp = str = reg_operand(str, Qtrue);
if (pos != 0) { if (pos != 0) {
if (pos < 0) { if (pos < 0) {
pos += RSTRING_LEN(str); pos += RSTRING_LEN(str);
@ -2156,7 +2158,7 @@ rb_reg_match_pos(VALUE re, VALUE str, long pos)
VALUE VALUE
rb_reg_match(VALUE re, VALUE str) rb_reg_match(VALUE re, VALUE str)
{ {
long pos = rb_reg_match_pos(re, str, 0); long pos = reg_match_pos(re, &str, 0);
if (pos < 0) return Qnil; if (pos < 0) return Qnil;
pos = rb_str_sublen(str, pos); pos = rb_str_sublen(str, pos);
return LONG2FIX(pos); return LONG2FIX(pos);
@ -2270,7 +2272,7 @@ rb_reg_match_m(int argc, VALUE *argv, VALUE re)
pos = 0; pos = 0;
} }
pos = rb_reg_match_pos(re, str, pos); pos = reg_match_pos(re, &str, pos);
if (pos < 0) { if (pos < 0) {
rb_backref_set(Qnil); rb_backref_set(Qnil);
return Qnil; return Qnil;