From 47548dd33e4cb2cd747f746262a4777bd214e485 Mon Sep 17 00:00:00 2001 From: ksaito Date: Thu, 4 Nov 2004 14:57:11 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ regexec.c | 9 +-------- regint.h | 25 ------------------------- regparse.c | 5 +---- 4 files changed, 7 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8cacbab8c..24cb39e31e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 4 23:54:21 2004 Kazuo Saito + + * regexec.c, regparse.c, regint.h: fixed conflicts between + vendor branch. + Thu Nov 4 23:41:55 2004 Kazuo Saito * ascii.c, euc_jp.c, oniggnu.h, oniguruma.h, regcomp.c, diff --git a/regexec.c b/regexec.c index d5dba2124c..594c173a83 100644 --- a/regexec.c +++ b/regexec.c @@ -274,7 +274,7 @@ onig_region_copy(OnigRegion* to, OnigRegion* from) /** stack **/ #define INVALID_STACK_INDEX -1 -typedef long StackIndex; +typedef int StackIndex; typedef struct _StackType { unsigned int type; @@ -2351,13 +2351,6 @@ match_at(regex_t* reg, UChar* str, UChar* end, UChar* sstart, goto repeat_inc_ng; break; - case OP_REPEAT_INC_NG_SG: STAT_OP_IN(OP_REPEAT_INC_NG_SG); - GET_MEMNUM_INC(mem, p); /* mem: OP_REPEAT ID */ - STACK_GET_REPEAT(mem, stkp); - si = GET_STACK_INDEX(stkp); - goto repeat_inc_ng; - break; - case OP_PUSH_POS: STAT_OP_IN(OP_PUSH_POS); STACK_PUSH_POS(s, sprev); STAT_OP_OUT; diff --git a/regint.h b/regint.h index f0977ff1f3..ce4fbfb12d 100644 --- a/regint.h +++ b/regint.h @@ -705,31 +705,6 @@ typedef short int MemNumType; ONIG_SYN_CONTEXT_INVALID_REPEAT_OPS | ONIG_SYN_ALLOW_INVALID_INTERVAL | \ ONIG_SYN_BACKSLASH_ESCAPE_IN_CC | ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC ) -#define SYN_POSIX_COMMON_OP \ - ( ONIG_SYN_OP_DOT_ANYCHAR | ONIG_SYN_OP_POSIX_BRACKET | \ - ONIG_SYN_OP_DECIMAL_BACKREF | \ - ONIG_SYN_OP_BRACKET_CC | ONIG_SYN_OP_ASTERISK_ZERO_INF | \ - ONIG_SYN_OP_LINE_ANCHOR | \ - ONIG_SYN_OP_ESC_CONTROL_CHARS ) - -#define SYN_GNU_REGEX_OP \ - ( ONIG_SYN_OP_DOT_ANYCHAR | ONIG_SYN_OP_BRACKET_CC | \ - ONIG_SYN_OP_POSIX_BRACKET | ONIG_SYN_OP_DECIMAL_BACKREF | \ - ONIG_SYN_OP_BRACE_INTERVAL | ONIG_SYN_OP_LPAREN_SUBEXP | \ - ONIG_SYN_OP_VBAR_ALT | \ - ONIG_SYN_OP_ASTERISK_ZERO_INF | ONIG_SYN_OP_PLUS_ONE_INF | \ - ONIG_SYN_OP_QMARK_ZERO_ONE | \ - ONIG_SYN_OP_ESC_AZ_BUF_ANCHOR | ONIG_SYN_OP_ESC_CAPITAL_G_BEGIN_ANCHOR | \ - ONIG_SYN_OP_ESC_W_WORD | \ - ONIG_SYN_OP_ESC_B_WORD_BOUND | ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END | \ - ONIG_SYN_OP_ESC_S_WHITE_SPACE | ONIG_SYN_OP_ESC_D_DIGIT | \ - ONIG_SYN_OP_LINE_ANCHOR ) - -#define SYN_GNU_REGEX_BV \ - ( ONIG_SYN_CONTEXT_INDEP_ANCHORS | ONIG_SYN_CONTEXT_INDEP_REPEAT_OPS | \ - ONIG_SYN_CONTEXT_INVALID_REPEAT_OPS | ONIG_SYN_ALLOW_INVALID_INTERVAL | \ - ONIG_SYN_BACKSLASH_ESCAPE_IN_CC | ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC ) - #ifdef ONIG_DEBUG 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;