From 1d86e5a9c7550945a8bbefcb321017aac875f7ff Mon Sep 17 00:00:00 2001 From: Jim Monte Date: Fri, 31 Jan 2020 01:01:17 -0500 Subject: [PATCH] fixed singluar/plural agreement in an error message generated by the let command --- src/frontend/com_let.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/frontend/com_let.c b/src/frontend/com_let.c index 2884840fe..150f13788 100644 --- a/src/frontend/com_let.c +++ b/src/frontend/com_let.c @@ -199,11 +199,14 @@ void com_let(wordlist *wl) /* Check # elem required vs available */ if (n_dst_elem != vec_src->v_length) { + const int v_length = vec_src->v_length; + const bool f_1 = v_length == 1; (void) fprintf(cp_err, "Data for an index vector must " "fit exactly. The indexed range required %d " - "elements to fill it, but there were %d " - "elements supplied.\n", - n_dst_elem, vec_src->v_length); + "element%s to fill it, but there %s %d " + "element%s supplied.\n", + n_dst_elem, n_dst_elem == 1 ? "" : "s", + f_1 ? "was" : "were", v_length, f_1 ? "" : "s"); goto quit; } }