diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-09-09 17:18:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-09-09 17:18:49 +0200 |
| commit | fb031407304b82b49f6f367bfba31f602837fc49 (patch) | |
| tree | 6e1803ed2f3399b5de86ae3aeef54af32b250992 /src/regexp.c | |
| parent | 371932a7754453b5a3adbd41959056fc9a45a9fd (diff) | |
| download | vim-git-fb031407304b82b49f6f367bfba31f602837fc49.tar.gz | |
updated for version 7.4.437v7.4.437
Problem: New and old regexp engine are not consistent.
Solution: Also give an error for "\ze*" for the old regexp engine.
Diffstat (limited to 'src/regexp.c')
| -rw-r--r-- | src/regexp.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/regexp.c b/src/regexp.c index dcb9a3b4e..f19e13971 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -358,6 +358,8 @@ static void regdump __ARGS((char_u *, bt_regprog_T *)); static char_u *regprop __ARGS((char_u *)); #endif +static int re_mult_next __ARGS((char *what)); + static char_u e_missingbracket[] = N_("E769: Missing ] after %s["); static char_u e_unmatchedpp[] = N_("E53: Unmatched %s%%("); static char_u e_unmatchedp[] = N_("E54: Unmatched %s("); @@ -2166,9 +2168,13 @@ regatom(flagp) #endif case 's': ret = regnode(MOPEN + 0); + if (re_mult_next("\\zs") == FAIL) + return NULL; break; case 'e': ret = regnode(MCLOSE + 0); + if (re_mult_next("\\ze") == FAIL) + return NULL; break; default: EMSG_RET_NULL(_("E68: Invalid character after \\z")); @@ -7005,6 +7011,18 @@ regprop(op) } #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 static void mb_decompose __ARGS((int c, int *c1, int *c2, int *c3)); |