* 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

1 files changed, 1 insertions, 8 deletions

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;