diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-05-04 14:03:32 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2023-05-04 14:44:38 +0800 |
| commit | f4043e290e10007e51596a489a5ef444e28e5de8 (patch) | |
| tree | 015dbc091376d4eda280d2a5fc3c6d2fcb0ef4ac /src/nvim/eval | |
| parent | 1659cd15bebfd8553bb91f24d833789451705b03 (diff) | |
| download | rneovim-f4043e290e10007e51596a489a5ef444e28e5de8.tar.gz rneovim-f4043e290e10007e51596a489a5ef444e28e5de8.tar.bz2 rneovim-f4043e290e10007e51596a489a5ef444e28e5de8.zip | |
vim-patch:8.2.1463: Vim9: list slice not supported yet
Problem: Vim9: list slice not supported yet.
Solution: Add support for list slicing.
https://github.com/vim/vim/commit/ed5918771fcf9877d8445e74c62ab1ce6b8e28c1
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/eval')
| -rw-r--r-- | src/nvim/eval/typval.c | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index 297adf7f9c..ba1d60959a 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -765,7 +765,7 @@ int tv_list_concat(list_T *const l1, list_T *const l2, typval_T *const tv) return OK; } -list_T *tv_list_slice(list_T *ol, int n1, int n2) +static list_T *tv_list_slice(list_T *ol, int n1, int n2) { list_T *l = tv_list_alloc(n2 - n1 + 1); listitem_T *item = tv_list_find(ol, n1); @@ -776,6 +776,50 @@ list_T *tv_list_slice(list_T *ol, int n1, int n2) return l; } +int tv_list_slice_or_index(list_T *list, bool range, int n1_arg, int n2_arg, typval_T *rettv, + bool verbose) +{ + int len = tv_list_len(rettv->vval.v_list); + int n1 = n1_arg; + int n2 = n2_arg; + + if (n1 < 0) { + n1 = len + n1; + } + if (n1 < 0 || n1 >= len) { + // For a range we allow invalid values and return an empty + // list. A list index out of range is an error. + if (!range) { + if (verbose) { + semsg(_(e_listidx), (int64_t)n1); + } + return FAIL; + } + n1 = len; + } + if (range) { + if (n2 < 0) { + n2 = len + n2; + } else if (n2 >= len) { + n2 = len - 1; + } + if (n2 < 0 || n2 + 1 < n1) { + n2 = -1; + } + list_T *l = tv_list_slice(rettv->vval.v_list, n1, n2); + tv_clear(rettv); + tv_list_set_ret(rettv, l); + } else { + // copy the item to "var1" to avoid that freeing the list makes it + // invalid. + typval_T var1; + tv_copy(TV_LIST_ITEM_TV(tv_list_find(rettv->vval.v_list, (int)n1)), &var1); + tv_clear(rettv); + *rettv = var1; + } + return OK; +} + typedef struct { char *s; char *tofree; |