patch 8.2.2466: max() and min() can give many error messages
Problem: Max() and min() can give many error messages.
Solution: Bail out at the first error. (closes #1039, closes #7778)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 0b4b502..f15139f 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -6769,12 +6769,16 @@
if (li != NULL)
{
n = tv_get_number_chk(&li->li_tv, &error);
+ if (error)
+ return; // type error; errmsg already given
for (;;)
{
li = li->li_next;
if (li == NULL)
break;
i = tv_get_number_chk(&li->li_tv, &error);
+ if (error)
+ return; // type error; errmsg already given
if (domax ? i > n : i < n)
n = i;
}
@@ -6799,6 +6803,8 @@
{
--todo;
i = tv_get_number_chk(&HI2DI(hi)->di_tv, &error);
+ if (error)
+ return; // type error; errmsg already given
if (first)
{
n = i;
@@ -6812,7 +6818,8 @@
}
else
semsg(_(e_listdictarg), domax ? "max()" : "min()");
- rettv->vval.v_number = error ? 0 : n;
+
+ rettv->vval.v_number = n;
}
/*