Permalink
Browse files

patch 8.0.0623: error for invalid regexp is not very informative

Problem:    The message "Invalid range" is used for multiple errors.
Solution:   Add two more specific error messages. (Itchyny, Ken Hamada)
  • Loading branch information...
brammool committed Jun 5, 2017
1 parent c5e2b04 commit 966e58e413ffa88af8d748e697aa2999571fcd7b
Showing with 25 additions and 4 deletions.
  1. +5 −3 src/regexp.c
  2. +1 −1 src/regexp_nfa.c
  3. +17 −0 src/testdir/test_regexp_utf8.vim
  4. +2 −0 src/version.c
View
@@ -358,6 +358,8 @@ static char_u *regprop(char_u *);
static int re_mult_next(char *what);
static char_u e_missingbracket[] = N_("E769: Missing ] after %s[");
static char_u e_reverse_range[] = N_("E944: Reverse range in character class");
static char_u e_large_class[] = N_("E945: Range too large in character class");
static char_u e_unmatchedpp[] = N_("E53: Unmatched %s%%(");
static char_u e_unmatchedp[] = N_("E54: Unmatched %s(");
static char_u e_unmatchedpar[] = N_("E55: Unmatched %s)");
@@ -2426,14 +2428,14 @@ regatom(int *flagp)
endc = coll_get_char();
if (startc > endc)
EMSG_RET_NULL(_(e_invrange));
EMSG_RET_NULL(_(e_reverse_range));
#ifdef FEAT_MBYTE
if (has_mbyte && ((*mb_char2len)(startc) > 1
|| (*mb_char2len)(endc) > 1))
{
/* Limit to a range of 256 chars */
/* Limit to a range of 256 chars. */
if (endc > startc + 256)
EMSG_RET_NULL(_(e_invrange));
EMSG_RET_NULL(_(e_large_class));
while (++startc <= endc)
regmbc(startc);
}
View
@@ -1853,7 +1853,7 @@ nfa_regatom(void)
endc = startc;
startc = oldstartc;
if (startc > endc)
EMSG_RET_FAIL(_(e_invrange));
EMSG_RET_FAIL(_(e_reverse_range));
if (endc > startc + 2)
{
@@ -137,3 +137,20 @@ func Test_classes_re2()
call s:classes_test()
set re=0
endfunc
func Test_reversed_range()
for re in range(0, 2)
exe 'set re=' . re
call assert_fails('call match("abc def", "[c-a]")', 'E944:')
endfor
set re=0
endfunc
func Test_large_class()
set re=1
call assert_fails('call match("abc def", "[\u3000-\u4000]")', 'E945:')
set re=2
call assert_equal(0, 'abc def' =~# '[\u3000-\u4000]')
call assert_equal(1, "\u3042" =~# '[\u3000-\u4000]')
set re=0
endfunc
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
623,
/**/
622,
/**/

0 comments on commit 966e58e

Please sign in to comment.