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 #9366)
diff --git a/src/typval.c b/src/typval.c
index 09381f2..7716873 100644
--- a/src/typval.c
+++ b/src/typval.c
@@ -663,6 +663,23 @@
}
/*
+ * 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 @@
&& 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 @@
{
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;