Mercurial > vim
diff src/typval.c @ 26638:6fd15d82e898 v8.2.3848
patch 8.2.3848: cannot use reduce() for a string
Commit: https://github.com/vim/vim/commit/0ccb5842f5fb103763d106c7aa364d758343c35a
Author: rbtnn <naru123456789@gmail.com>
Date: Sat Dec 18 18:33:46 2021 +0000
patch 8.2.3848: cannot use reduce() for a string
Problem: Cannot use reduce() for a string.
Solution: Make reduce() work with a string. (Naruhiko Nishino, closes https://github.com/vim/vim/issues/9366)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 18 Dec 2021 19:45:03 +0100 |
| parents | a28f91b893b2 |
| children | 2fc1e528e0e1 |
line wrap: on
line diff
--- a/src/typval.c +++ b/src/typval.c @@ -663,6 +663,23 @@ check_for_string_or_list_arg(typval_T *a } /* + * Give an error and return FAIL unless "args[idx]" is a string, a list or a + * blob. + */ + int +check_for_string_or_list_or_blob_arg(typval_T *args, int idx) +{ + if (args[idx].v_type != VAR_STRING + && args[idx].v_type != VAR_LIST + && args[idx].v_type != VAR_BLOB) + { + semsg(_(e_string_list_or_blob_required_for_argument_nr), idx + 1); + return FAIL; + } + return OK; +} + +/* * Check for an optional string or list argument at 'idx' */ int @@ -697,10 +714,7 @@ check_for_string_or_number_or_list_arg(t && args[idx].v_type != VAR_NUMBER && args[idx].v_type != VAR_LIST) { - if (idx >= 0) - semsg(_(e_string_number_or_list_required_for_argument_nr), idx + 1); - else - emsg(_(e_stringreq)); + semsg(_(e_string_number_or_list_required_for_argument_nr), idx + 1); return FAIL; } return OK; @@ -742,10 +756,7 @@ check_for_list_or_blob_arg(typval_T *arg { if (args[idx].v_type != VAR_LIST && args[idx].v_type != VAR_BLOB) { - if (idx >= 0) - semsg(_(e_list_or_blob_required_for_argument_nr), idx + 1); - else - emsg(_(e_listreq)); + semsg(_(e_list_or_blob_required_for_argument_nr), idx + 1); return FAIL; } return OK;