summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-02 14:04:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-02 14:04:19 +0000
commit20254d4e133331e69e6aa7514e1e72ad7d14d496 (patch)
treed6c7ebd1cdcec0584f110441545d80855d3b7f18 /re.c
parent10c4364287e67e8d74d28f90c72b667aa8d8be3b (diff)
* re.c (rb_reg_search): MatchData must be rb_cMatch. (ruby-bugs-ja:PR#319)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/re.c b/re.c
index 8383ab6..3f76b5e 100644
--- a/re.c
+++ b/re.c
@@ -237,10 +237,9 @@ rb_reg_expr_str(str, s, len)
p = s;
while (p<pend) {
if (*p == '\\') {
- rb_str_buf_cat(str, p, 1);
- p++;
- rb_str_buf_cat(str, p, mbclen(*p));
- p += mbclen(*p);
+ int n = mbclen(p[1]) + 1;
+ rb_str_buf_cat(str, p, n);
+ p += n;
continue;
}
else if (*p == '/') {
@@ -251,7 +250,6 @@ rb_reg_expr_str(str, s, len)
else if (ismbchar(*p)) {
rb_str_buf_cat(str, p, mbclen(*p));
p += mbclen(*p);
- need_escape = 1;
continue;
}
else if (ISPRINT(*p)) {
@@ -725,7 +723,7 @@ rb_reg_search(re, str, pos, reverse)
match = rb_backref_get();
if (NIL_P(match) || FL_TEST(match, MATCH_BUSY)) {
- match = match_alloc(rb_obj_class(re));
+ match = match_alloc(rb_cMatch);
}
else {
if (rb_safe_level() >= 3)