From 52f9c1d2e173f07302ec263bf0026ded739a2d7f Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 3 Jan 2008 17:48:06 +0000 Subject: * re.c (rb_reg_search): iterate onig_match for reverse mode. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ re.c | 31 +++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03c60f91e5..8092f884fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jan 4 02:47:06 2008 Tanaka Akira + + * re.c (rb_reg_search): iterate onig_match for reverse mode. + Fri Jan 4 01:20:21 2008 Nobuyoshi Nakada * win32.h: only VC6 needs extern "C++" for math.h. [ruby-talk:285660] diff --git a/re.c b/re.c index 7924b2e82d..35ad59b1a3 100644 --- a/re.c +++ b/re.c @@ -1036,6 +1036,7 @@ rb_reg_search(VALUE re, VALUE str, int pos, int reverse) VALUE match; static struct re_registers regs; int range; + rb_encoding *enc = rb_enc_get(str); if (pos > RSTRING_LEN(str) || pos < 0) { rb_backref_set(Qnil); @@ -1045,19 +1046,33 @@ rb_reg_search(VALUE re, VALUE str, int pos, int reverse) rb_reg_prepare_re(re, str); if (reverse) { - range = -pos; + char *p = RSTRING_PTR(str) + pos; + while (1) { + result = onig_match(RREGEXP(re)->ptr, + (UChar*)(RSTRING_PTR(str)), + ((UChar*)(RSTRING_PTR(str)) + RSTRING_LEN(str)), + (UChar*)p, + ®s, + ONIG_OPTION_NONE); + if (result != ONIG_MISMATCH) { + result = p - RSTRING_PTR(str); + break; + } + if (RSTRING_PTR(str) == p) + break; + p = rb_enc_prev_char(RSTRING_PTR(str), p, enc); + } } else { range = RSTRING_LEN(str) - pos; + result = onig_search(RREGEXP(re)->ptr, + (UChar*)(RSTRING_PTR(str)), + ((UChar*)(RSTRING_PTR(str)) + RSTRING_LEN(str)), + ((UChar*)(RSTRING_PTR(str)) + pos), + ((UChar*)(RSTRING_PTR(str)) + pos + range), + ®s, ONIG_OPTION_NONE); } - result = onig_search(RREGEXP(re)->ptr, - (UChar*)(RSTRING_PTR(str)), - ((UChar*)(RSTRING_PTR(str)) + RSTRING_LEN(str)), - ((UChar*)(RSTRING_PTR(str)) + pos), - ((UChar*)(RSTRING_PTR(str)) + pos + range), - ®s, ONIG_OPTION_NONE); - if (result < 0) { if (result == ONIG_MISMATCH) { rb_backref_set(Qnil); -- cgit v1.2.3