aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.0055

Browse Source
This commit is contained in:
Bram Moolenaar
2005-03-04 23:39:37 +00:00
parent 7383034c0a
commit 19a09a1893
39 changed files with 5044 additions and 3475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/regexp.c
View File

@@ -100,10 +100,10 @@
*
* +----------------------+
* V |
* <aa>\+ BRANCH <aa> --> BRANCH --> BACK BRANCH --> NOTHING --> END
* | | ^ ^
* | +----------+ |
* +-------------------------------------------------+
* <aa>\+ BRANCH <aa> --> BRANCH --> BACKP BRANCH --> NOTHING --> END
* | | ^ ^
* | +-----------+ |
* +--------------------------------------------------+
*
*
* +-------------------------+
@@ -229,6 +229,8 @@
#define RE_COL 205 /* nr cmp Match column number */
#define RE_VCOL 206 /* nr cmp Match virtual column number */
#define BACKP 207 /* Like BACK but for \+ */
/*
* Magic characters have a special meaning, they don't match literally.
* Magic characters are negative. This separates them from literal characters
@@ -281,6 +283,8 @@ toggle_Magic(x)
* BACK Normal "next" pointers all implicitly point forward; BACK
* exists to make loop structures possible.
*
* BACKP Like BACK, but used for \+. Doesn't check for an empty match.
*
* STAR,PLUS '=', and complex '*' and '+', are implemented as circular
* BRANCH structures using BACK. Simple cases (one character
* per match) are implemented with STAR and PLUS for speed
@@ -1448,7 +1452,7 @@ regpiece(flagp)
/* Emit x+ as x(&|), where & means "self". */
next = regnode(BRANCH); /* Either */
regtail(ret, next);
regtail(regnode(BACK), ret); /* loop back */
regtail(regnode(BACKP), ret); /* loop back */
regtail(next, regnode(BRANCH)); /* or */
regtail(ret, regnode(NOTHING)); /* null. */
}
@@ -2483,7 +2487,7 @@ regtail(p, val)
scan = temp;
}
if (OP(scan) == BACK)
if (OP(scan) == BACK || OP(scan) == BACKP)
offset = (int)(scan - val);
else
offset = (int)(val - scan);
@@ -4092,6 +4096,9 @@ regmatch(scan, startp)
return FALSE;
break;
case BACKP:
break;
case MOPEN + 0: /* Match start: \zs */
case MOPEN + 1: /* \( */
case MOPEN + 2:
@@ -4356,6 +4363,10 @@ regmatch(scan, startp)
{
if (OP(next) != BRANCH) /* No choice. */
next = OPERAND(scan); /* Avoid recursion. */
else if (startp != NULL && OP(OPERAND(scan)) == BACKP
&& reg_save_equal(startp))
/* \+ with something empty before it */
return FALSE;
else
{
regsave_T save;
@@ -5134,7 +5145,7 @@ regnext(p)
if (offset == 0)
return NULL;
if (OP(p) == BACK)
if (OP(p) == BACK || OP(p) == BACKP)
return p - offset;
else
return p + offset;
@@ -5604,6 +5615,9 @@ regprop(op)
case BACK:
p = "BACK";
break;
case BACKP:
p = "BACKP";
break;
case END:
p = "END";
break;