thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.437

Browse Source 
Problem:    New and old regexp engine are not consistent.
Solution:   Also give an error for "\ze*" for the old regexp engine.
This commit is contained in:
Bram Moolenaar
2014-09-09 17:18:49 +02:00
parent 371932a775
commit fb03140730
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/regexp.c
View File

@@ -358,6 +358,8 @@ static void regdump __ARGS((char_u *, bt_regprog_T *));
static char_u *regprop __ARGS((char_u *)); static char_u *regprop __ARGS((char_u *));
#endif #endif
static int re_mult_next __ARGS((char *what));
static char_u e_missingbracket[] = N_("E769: Missing ] after %s["); static char_u e_missingbracket[] = N_("E769: Missing ] after %s[");
static char_u e_unmatchedpp[] = N_("E53: Unmatched %s%%("); static char_u e_unmatchedpp[] = N_("E53: Unmatched %s%%(");
static char_u e_unmatchedp[] = N_("E54: Unmatched %s("); static char_u e_unmatchedp[] = N_("E54: Unmatched %s(");
@@ -2166,9 +2168,13 @@ regatom(flagp)
#endif #endif
case 's': ret = regnode(MOPEN + 0); case 's': ret = regnode(MOPEN + 0);
if (re_mult_next("\\zs") == FAIL)
return NULL;
break; break;
case 'e': ret = regnode(MCLOSE + 0); case 'e': ret = regnode(MCLOSE + 0);
if (re_mult_next("\\ze") == FAIL)
return NULL;
break; break;
default: EMSG_RET_NULL(_("E68: Invalid character after \\z")); default: EMSG_RET_NULL(_("E68: Invalid character after \\z"));
@@ -7005,6 +7011,18 @@ regprop(op)
} }
#endif /* DEBUG */ #endif /* DEBUG */
/*
* Used in a place where no * or \+ can follow.
*/
static int
re_mult_next(what)
char *what;
{
if (re_multi_type(peekchr()) == MULTI_MULT)
EMSG2_RET_FAIL(_("E888: (NFA regexp) cannot repeat %s"), what);
return OK;
}
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
static void mb_decompose __ARGS((int c, int *c1, int *c2, int *c3)); static void mb_decompose __ARGS((int c, int *c1, int *c2, int *c3));

13
src/regexp_nfa.c
View File

@@ -291,7 +291,6 @@ static int nfa_regpiece __ARGS((void));
static int nfa_regconcat __ARGS((void)); static int nfa_regconcat __ARGS((void));
static int nfa_regbranch __ARGS((void)); static int nfa_regbranch __ARGS((void));
static int nfa_reg __ARGS((int paren)); static int nfa_reg __ARGS((int paren));
static int re_mult_next __ARGS((char *what));
#ifdef DEBUG #ifdef DEBUG
static void nfa_set_code __ARGS((int c)); static void nfa_set_code __ARGS((int c));
static void nfa_postfix_dump __ARGS((char_u *expr, int retval)); static void nfa_postfix_dump __ARGS((char_u *expr, int retval));
@@ -2281,18 +2280,6 @@ nfa_reg(paren)
return OK; return OK;
} }
/*
* Used in a place where no * or \+ can follow.
*/
static int
re_mult_next(what)
char *what;
{
if (re_multi_type(peekchr()) == MULTI_MULT)
EMSG2_RET_FAIL(_("E888: (NFA regexp) cannot repeat %s"), what);
return OK;
}
#ifdef DEBUG #ifdef DEBUG
static char_u code[50]; static char_u code[50];

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
437,
/**/ /**/
436, 436,
/**/ /**/