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

* string.c (rb_str_scan): String#scan should preserve last

Browse Source 
successful match data.  [ruby-dev:35106]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-06-19 08:25:50 +00:00
parent 363b0bddde
commit 768380583a
2 changed files with 12 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 @@
Thu Jun 19 17:19:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_scan): String#scan should preserve last
successful match data. [ruby-dev:35106]
Thu Jun 19 16:49:36 2008 NAKAMURA Usaku <usa@ruby-lang.org> Thu Jun 19 16:49:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* missing/acosh.c (atanh): should set ERANGE to errno if parameter * missing/acosh.c (atanh): should set ERANGE to errno if parameter

11
string.c
View File

@ -5689,7 +5689,7 @@ rb_str_scan(VALUE str, VALUE pat)
{ {
VALUE result; VALUE result;
long start = 0; long start = 0;
VALUE match = Qnil; long last = -1, prev = 0;
char *p = RSTRING_PTR(str); long len = RSTRING_LEN(str); char *p = RSTRING_PTR(str); long len = RSTRING_LEN(str);
pat = get_pat(pat, 1); pat = get_pat(pat, 1);
@ -5697,18 +5697,21 @@ rb_str_scan(VALUE str, VALUE pat)
VALUE ary = rb_ary_new(); VALUE ary = rb_ary_new();
while (!NIL_P(result = scan_once(str, pat, &start))) { while (!NIL_P(result = scan_once(str, pat, &start))) {
match = rb_backref_get(); last = prev;
prev = start;
rb_ary_push(ary, result); rb_ary_push(ary, result);
} }
rb_backref_set(match); if (last >= 0) rb_reg_search(pat, str, last, 0);
return ary; return ary;
} }
while (!NIL_P(result = scan_once(str, pat, &start))) { while (!NIL_P(result = scan_once(str, pat, &start))) {
last = prev;
prev = start;
rb_yield(result); rb_yield(result);
str_mod_check(str, p, len); str_mod_check(str, p, len);
} }
rb_backref_set(match); if (last >= 0) rb_reg_search(pat, str, last, 0);
return str; return str;
} }