diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 51 | ||||
| -rw-r--r-- | src/nvim/eval.lua | 47 |
2 files changed, 76 insertions, 22 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 23ff012a9c..dab0896d75 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -108,6 +108,8 @@ static const char e_dot_can_only_be_used_on_dictionary_str[] = N_("E1203: Dot can only be used on a dictionary: %s"); static const char e_empty_function_name[] = N_("E1192: Empty function name"); +static char e_argument_of_str_must_be_list_string_dictionary_or_blob[] + = N_("E1250: Argument of %s must be a List, String, Dictionary or Blob"); static char * const namespace_char = "abglstvw"; @@ -5040,7 +5042,7 @@ static void filter_map(typval_T *argvars, typval_T *rettv, filtermap_T filtermap : N_("filter() argument"))); // map() and filter() return the first argument, also on failure. - if (filtermap != FILTERMAP_MAPNEW) { + if (filtermap != FILTERMAP_MAPNEW && argvars[0].v_type != VAR_STRING) { tv_copy(&argvars[0], rettv); } @@ -5072,8 +5074,11 @@ static void filter_map(typval_T *argvars, typval_T *rettv, filtermap_T filtermap && value_check_lock(d->dv_lock, arg_errmsg, TV_TRANSLATE))) { return; } + } else if (argvars[0].v_type == VAR_STRING) { + rettv->v_type = VAR_STRING; + rettv->vval.v_string = NULL; } else { - semsg(_(e_listdictblobarg), ermsg); + semsg(_(e_argument_of_str_must_be_list_string_dictionary_or_blob), ermsg); return; } @@ -5193,6 +5198,48 @@ static void filter_map(typval_T *argvars, typval_T *rettv, filtermap_T filtermap } idx++; } + } else if (argvars[0].v_type == VAR_STRING) { + vimvars[VV_KEY].vv_type = VAR_NUMBER; + + garray_T ga; + ga_init(&ga, (int)sizeof(char), 80); + int len; + for (const char *p = tv_get_string(&argvars[0]); *p != NUL; p += len) { + len = utfc_ptr2len(p); + + typval_T tv = { + .v_type = VAR_STRING, + .v_lock = VAR_UNLOCKED, + .vval.v_string = xstrnsave(p, (size_t)len), + }; + + vimvars[VV_KEY].vv_nr = idx; + typval_T newtv; + if (filter_map_one(&tv, expr, filtermap, &newtv, &rem) == FAIL + || did_emsg) { + tv_clear(&newtv); + tv_clear(&tv); + break; + } else if (filtermap != FILTERMAP_FILTER) { + if (newtv.v_type != VAR_STRING) { + tv_clear(&newtv); + tv_clear(&tv); + emsg(_(e_stringreq)); + break; + } else { + ga_concat(&ga, newtv.vval.v_string); + } + } else if (!rem) { + ga_concat(&ga, tv.vval.v_string); + } + + tv_clear(&newtv); + tv_clear(&tv); + + idx++; + } + ga_append(&ga, NUL); + rettv->vval.v_string = ga.ga_data; } else { assert(argvars[0].v_type == VAR_LIST); diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua index 97b10a46c0..4dbd63d131 100644 --- a/src/nvim/eval.lua +++ b/src/nvim/eval.lua @@ -2539,10 +2539,11 @@ M.funcs = { args = 2, base = 1, desc = [=[ - {expr1} must be a |List|, |Blob|, or a |Dictionary|. + {expr1} must be a |List|, |String|, |Blob| or |Dictionary|. For each item in {expr1} evaluate {expr2} and when the result - is zero remove the item from the |List| or |Dictionary|. For a - |Blob| each byte is removed. + is zero or false remove the item from the |List| or + |Dictionary|. Similarly for each byte in a |Blob| and each + character in a |String|. {expr2} must be a |string| or |Funcref|. @@ -2578,14 +2579,16 @@ M.funcs = { <If you do not use "val" you can leave it out: >vim call filter(myList, {idx -> idx % 2 == 1}) < - The operation is done in-place. If you want a |List| or - |Dictionary| to remain unmodified make a copy first: >vim + For a |List| and a |Dictionary| the operation is done + in-place. If you want it to remain unmodified make a copy + first: >vim let l = filter(copy(mylist), 'v:val =~ "KEEP"') - <Returns {expr1}, the |List|, |Blob| or |Dictionary| that was - filtered. When an error is encountered while evaluating - {expr2} no further items in {expr1} are processed. When - {expr2} is a Funcref errors inside a function are ignored, + <Returns {expr1}, the |List| or |Dictionary| that was filtered, + or a new |Blob| or |String|. + When an error is encountered while evaluating {expr2} no + further items in {expr1} are processed. + When {expr2} is a Funcref errors inside a function are ignored, unless it was defined with the "abort" flag. ]=], @@ -6050,15 +6053,18 @@ M.funcs = { args = 2, base = 1, desc = [=[ - {expr1} must be a |List|, |Blob| or |Dictionary|. - Replace each item in {expr1} with the result of evaluating - {expr2}. For a |Blob| each byte is replaced. + {expr1} must be a |List|, |String|, |Blob| or |Dictionary|. + When {expr1} is a |List|| or |Dictionary|, replace each + item in {expr1} with the result of evaluating {expr2}. + For a |Blob| each byte is replaced. + For a |String|, each character, including composing + characters, is replaced. If the item type changes you may want to use |mapnew()| to create a new List or Dictionary. - {expr2} must be a |string| or |Funcref|. + {expr2} must be a |String| or |Funcref|. - If {expr2} is a |string|, inside {expr2} |v:val| has the value + If {expr2} is a |String|, inside {expr2} |v:val| has the value of the current item. For a |Dictionary| |v:key| has the key of the current item and for a |List| |v:key| has the index of the current item. For a |Blob| |v:key| has the index of the @@ -6088,14 +6094,15 @@ M.funcs = { <If you do not use "key" you can use a short name: >vim call map(myDict, {_, val -> 'item: ' .. val}) < - The operation is done in-place. If you want a |List| or - |Dictionary| to remain unmodified make a copy first: >vim + The operation is done in-place for a |List| and |Dictionary|. + If you want it to remain unmodified make a copy first: >vim let tlist = map(copy(mylist), ' v:val .. "\t"') - <Returns {expr1}, the |List|, |Blob| or |Dictionary| that was - filtered. When an error is encountered while evaluating - {expr2} no further items in {expr1} are processed. When - {expr2} is a Funcref errors inside a function are ignored, + <Returns {expr1}, the |List| or |Dictionary| that was filtered, + or a new |Blob| or |String|. + When an error is encountered while evaluating {expr2} no + further items in {expr1} are processed. + When {expr2} is a Funcref errors inside a function are ignored, unless it was defined with the "abort" flag. ]=], |