diff options
| author | ksaito <ksaito@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 14:57:11 +0000 |
|---|---|---|
| committer | ksaito <ksaito@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 14:57:11 +0000 |
| commit | 47548dd33e4cb2cd747f746262a4777bd214e485 (patch) | |
| tree | 12c581f24a20dc5083b3acb4419a697d83318391 /regparse.c | |
| parent | 82cb9eaa3bb49a77df4452cfdff18f817ecf63a6 (diff) | |
| download | ruby-47548dd33e4cb2cd747f746262a4777bd214e485.tar.gz | |
* regexec.c, regparse.c, regint.h: fixed conflicts between vendor branch.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.c')
| -rw-r--r-- | regparse.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/regparse.c b/regparse.c index b75c6951d0..e6fea8e68a 100644 --- a/regparse.c +++ b/regparse.c @@ -1911,6 +1911,7 @@ popular_qualifier_num(QualifierNode* qf) return -1; } + enum ReduceType { RQ_ASIS = 0, /* as is */ RQ_DEL = 1, /* delete parent */ @@ -2229,7 +2230,6 @@ fetch_name(UChar** src, UChar* end, UChar** rname_end, ScanEnv* env, int ref) return ONIGERR_EMPTY_GROUP_NAME; } else { - first_code = ONIGENC_MBC_TO_CODE(env->enc, p, end); PFETCH(c); first_code = c; if (c == '>') @@ -2249,7 +2249,6 @@ fetch_name(UChar** src, UChar* end, UChar** rname_end, ScanEnv* env, int ref) while (!PEND) { name_end = p; - code = ONIGENC_MBC_TO_CODE(env->enc, p, end); PFETCH(c); if (c == '>' || c == ')') break; @@ -2309,8 +2308,6 @@ fetch_name(UChar** src, UChar* end, UChar** rname_end, ScanEnv* env, int ref) if (c == '>' || c == ')') break; if (! ONIGENC_IS_CODE_DIGIT(enc, c)) r = ONIGERR_INVALID_CHAR_IN_GROUP_NAME; - - p += (len - 1); } if (c != '>') { r = ONIGERR_INVALID_GROUP_NAME; |