kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* regexec.c, regparse.c, regint.h: fixed conflicts between vendor branch.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ksaito 2004-11-04 14:57:11 +00:00
parent 82cb9eaa3b
commit 47548dd33e
4 changed files with 7 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

9
regexec.c
View file

@ -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;