summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-04 01:24:12 (GMT)
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-04 01:24:12 (GMT)
commit22e7258275966b89b0bf2462179f99c7a8feb34a (patch)
tree77cf55b70d4eb8ff88b6927f89ac73f9f224a4e3
parented74723af4d28193f72242d4e6bc51a542aad118 (diff)
* re.c (rb_reg_search): avoid inner loop for reverse search.
* regexec.c: unset USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE which is turned on since oniguruma 5.9.1. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--re.c36
-rw-r--r--regexec.c2
3 files changed, 17 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 57067dc..3bdb865 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jan 4 10:22:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * re.c (rb_reg_search): avoid inner loop for reverse search.
+
+ * regexec.c: unset USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
+ which is turned on since oniguruma 5.9.1.
+
Fri Jan 4 02:53:31 2008 Tanaka Akira <akr@fsij.org>
* enc/euc_jp.c: remove eucjp_ prefix. breakpoint can be specified as
diff --git a/re.c b/re.c
index 35ad59b..3764d75 100644
--- a/re.c
+++ b/re.c
@@ -1035,7 +1035,7 @@ rb_reg_search(VALUE re, VALUE str, int pos, int reverse)
int result;
VALUE match;
static struct re_registers regs;
- int range;
+ char *range = RSTRING_PTR(str);
rb_encoding *enc = rb_enc_get(str);
if (pos > RSTRING_LEN(str) || pos < 0) {
@@ -1045,33 +1045,15 @@ rb_reg_search(VALUE re, VALUE str, int pos, int reverse)
rb_reg_prepare_re(re, str);
- if (reverse) {
- 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,
- &regs,
- 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),
- &regs, ONIG_OPTION_NONE);
+ if (!reverse) {
+ range += RSTRING_LEN(str);
}
+ result = onig_search(RREGEXP(re)->ptr,
+ (UChar*)(RSTRING_PTR(str)),
+ ((UChar*)(RSTRING_PTR(str)) + RSTRING_LEN(str)),
+ ((UChar*)(RSTRING_PTR(str)) + pos),
+ ((UChar*)range),
+ &regs, ONIG_OPTION_NONE);
if (result < 0) {
if (result == ONIG_MISMATCH) {
diff --git a/regexec.c b/regexec.c
index be33989..47fd671 100644
--- a/regexec.c
+++ b/regexec.c
@@ -29,7 +29,7 @@
#include "regint.h"
-#define USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
+/* #define USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE */
#ifdef USE_CRNL_AS_LINE_TERMINATOR
#define ONIGENC_IS_MBC_CRNL(enc,p,end) \