aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.1680: Vim9: line number for compare error is wrong

Browse Source 
Problem:    Vim9: line number for compare error is wrong.
Solution:   Set SOURCING_LNUM. (closes #6936)
This commit is contained in:
Bram Moolenaar
2020-09-14 16:50:05 +02:00
parent 3bd8de40b4
commit eb26f4331f
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/testdir/test_vim9_expr.vim
View File

@@ -481,6 +481,7 @@ def Test_expr4_equal()
set noignorecase set noignorecase
CheckDefFailure(["let x = 'a' == xxx"], 'E1001:', 1) CheckDefFailure(["let x = 'a' == xxx"], 'E1001:', 1)
CheckDefExecFailure(['let items: any', 'eval 1', 'eval 2', 'if items == []', 'endif'], 'E691:', 4)
let bb = 0z3f let bb = 0z3f
assert_equal(true, 0z3f == bb) assert_equal(true, 0z3f == bb)

2
src/version.c
View File

@@ -750,6 +750,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 */
/**/
1680,
/**/ /**/
1679, 1679,
/**/ /**/

1
src/vim9execute.c
View File

@@ -2126,6 +2126,7 @@ call_def_function(
exptype_T exptype = iptr->isn_arg.op.op_type; exptype_T exptype = iptr->isn_arg.op.op_type;
int ic = iptr->isn_arg.op.op_ic; int ic = iptr->isn_arg.op.op_ic;
SOURCING_LNUM = iptr->isn_lnum;
typval_compare(tv1, tv2, exptype, ic); typval_compare(tv1, tv2, exptype, ic);
clear_tv(tv2); clear_tv(tv2);
--ectx.ec_stack.ga_len; --ectx.ec_stack.ga_len;