aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1686: "*" of "*{" is recognized as multipy operator

Browse Source 
Problem:    "*" of "*{" is recognized as multipy operator. (Yasuhiro Matsumoto)
Solution:   Check for the "{".
This commit is contained in:
Bram Moolenaar 2019-07-14 13:41:34 +02:00
parent a099da3572
commit 2898ebb44c
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eval.c
View File

@ -4266,7 +4266,7 @@ eval6(
for (;;) for (;;)
{ {
op = **arg; op = **arg;
if (op != '*' && op != '/' && op != '%') if ((op != '*' || (*arg)[1] == '{') && op != '/' && op != '%')
break; break;
if (evaluate) if (evaluate)

1
src/testdir/test_listdict.vim
View File

@ -282,6 +282,7 @@ endfunc
func Test_dict_literal_keys() func Test_dict_literal_keys()
call assert_equal({'one': 1, 'two2': 2, '3three': 3, '44': 4}, *{one: 1, two2: 2, 3three: 3, 44: 4},) call assert_equal({'one': 1, 'two2': 2, '3three': 3, '44': 4}, *{one: 1, two2: 2, 3three: 3, 44: 4},)
call assert_equal('2 3', trim(execute('echo 2 *{blue: 3}.blue')))
endfunc endfunc
" Nasty: deepcopy() dict that refers to itself (fails when noref used) " Nasty: deepcopy() dict that refers to itself (fails when noref used)

2
src/version.c
View File

@ -777,6 +777,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 */
/**/
1686,
/**/ /**/
1685, 1685,
/**/ /**/