diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-02-17 16:30:11 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-02-17 16:30:11 +0000 |
| commit | 6296d1e60edf7ac150ee1707c14d4355f3220b88 (patch) | |
| tree | 3f3d6910c5363c12a0badf49ce3e72ee59802440 /src/vim9execute.c | |
| parent | ea5c898b5fb60828b0223f258910f84f5c645e63 (diff) | |
| download | vim-git-6296d1e60edf7ac150ee1707c14d4355f3220b88.tar.gz | |
patch 8.2.4409: Vim9: some code not covered by testsv8.2.4409
Problem: Vim9: some code not covered by tests.
Solution: Add a few more tests. Fix reported line number.
Diffstat (limited to 'src/vim9execute.c')
| -rw-r--r-- | src/vim9execute.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/vim9execute.c b/src/vim9execute.c index 1c5dd74da..317d1c317 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -1998,12 +1998,12 @@ execute_unletindex(isn_T *iptr, ectx_T *ectx) // Stack contains: // -2 index // -1 dict or list + SOURCING_LNUM = iptr->isn_lnum; if (tv_dest->v_type == VAR_DICT) { // unlet a dict item, index must be a string if (tv_idx->v_type != VAR_STRING && tv_idx->v_type != VAR_NUMBER) { - SOURCING_LNUM = iptr->isn_lnum; semsg(_(e_expected_str_but_got_str), vartype_name(VAR_STRING), vartype_name(tv_idx->v_type)); @@ -2020,7 +2020,6 @@ execute_unletindex(isn_T *iptr, ectx_T *ectx) status = FAIL; else { - SOURCING_LNUM = iptr->isn_lnum; if (tv_idx->v_type == VAR_STRING) { key = tv_idx->vval.v_string; @@ -2053,7 +2052,6 @@ execute_unletindex(isn_T *iptr, ectx_T *ectx) else if (tv_dest->v_type == VAR_LIST) { // unlet a List item, index must be a number - SOURCING_LNUM = iptr->isn_lnum; if (check_for_number(tv_idx) == FAIL) { status = FAIL; @@ -2072,7 +2070,6 @@ execute_unletindex(isn_T *iptr, ectx_T *ectx) if (li == NULL) { - SOURCING_LNUM = iptr->isn_lnum; semsg(_(e_list_index_out_of_range_nr), n); status = FAIL; } @@ -2133,7 +2130,11 @@ execute_unletrange(isn_T *iptr, ectx_T *ectx) li = list_find_index(l, &n1); if (li == NULL) + { + semsg(_(e_list_index_out_of_range_nr), + (long)tv_idx1->vval.v_number); status = FAIL; + } else { if (n1 < 0) @@ -2143,7 +2144,10 @@ execute_unletrange(isn_T *iptr, ectx_T *ectx) listitem_T *li2 = list_find(l, n2); if (li2 == NULL) + { + semsg(_(e_list_index_out_of_range_nr), n2); status = FAIL; + } else n2 = list_idx_of_item(l, li2); } |