[src/trunk]: src/usr.bin/make make: use correct plural form in debug message

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c9b164f05350
branches:  trunk
changeset: 1026379:c9b164f05350
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Nov 20 17:51:48 2021 +0000

description:
make: use correct plural form in debug message

diffstat:

 usr.bin/make/unit-tests/directive-export-impl.exp |  4 ++--
 usr.bin/make/unit-tests/vardebug.exp              |  4 ++--
 usr.bin/make/unit-tests/varmod-defined.exp        |  2 +-
 usr.bin/make/unit-tests/varmod-indirect.exp       |  2 +-
 usr.bin/make/var.c                                |  8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diffs (91 lines):

diff -r cf4e9bcba880 -r c9b164f05350 usr.bin/make/unit-tests/directive-export-impl.exp
--- a/usr.bin/make/unit-tests/directive-export-impl.exp Sat Nov 20 17:47:33 2021 +0000
+++ b/usr.bin/make/unit-tests/directive-export-impl.exp Sat Nov 20 17:51:48 2021 +0000
@@ -7,7 +7,7 @@
 Var_Parse: ${REF}> (eval-defined)
 Evaluating modifier ${UT_VAR:N...} on value "<>"
 Pattern for ':N' is "*"
-ModifyWords: split "<>" into 1 words
+ModifyWords: split "<>" into 1 word
 Result of ${UT_VAR:N*} is ""
 ParseDependency(: )
 CondParser_Eval: ${:!echo "\$UT_VAR"!} != "<>"
@@ -28,7 +28,7 @@
 Var_Parse: ${REF}> (eval-defined)
 Evaluating modifier ${UT_VAR:N...} on value "<>"
 Pattern for ':N' is "*"
-ModifyWords: split "<>" into 1 words
+ModifyWords: split "<>" into 1 word
 Result of ${UT_VAR:N*} is ""
 ParseDependency(: )
 ParseReadLine (54): 'REF=              defined'
diff -r cf4e9bcba880 -r c9b164f05350 usr.bin/make/unit-tests/vardebug.exp
--- a/usr.bin/make/unit-tests/vardebug.exp      Sat Nov 20 17:47:33 2021 +0000
+++ b/usr.bin/make/unit-tests/vardebug.exp      Sat Nov 20 17:51:48 2021 +0000
@@ -43,11 +43,11 @@
 Indirect modifier "M*e" from "${:UM*e}"
 Evaluating modifier ${:M...} on value "value" (eval-defined, defined)
 Pattern for ':M' is "*e"
-ModifyWords: split "value" into 1 words
+ModifyWords: split "value" into 1 word
 Result of ${:M*e} is "value" (eval-defined, defined)
 Evaluating modifier ${:M...} on value "value" (eval-defined, defined)
 Pattern for ':M' is "valu[e]"
-ModifyWords: split "value" into 1 words
+ModifyWords: split "value" into 1 word
 Result of ${:Mvalu[e]} is "value" (eval-defined, defined)
 Global:delete VAR
 Var_Parse: ${:Uvariable:unknown} (eval-defined)
diff -r cf4e9bcba880 -r c9b164f05350 usr.bin/make/unit-tests/varmod-defined.exp
--- a/usr.bin/make/unit-tests/varmod-defined.exp        Sat Nov 20 17:47:33 2021 +0000
+++ b/usr.bin/make/unit-tests/varmod-defined.exp        Sat Nov 20 17:51:48 2021 +0000
@@ -11,7 +11,7 @@
 Evaluating modifier ${VAR:@...} on value "$$$$$$$$" (eval-keep-dollar-and-undefined, regular)
 Modifier part: "var"
 Modifier part: "${8_DOLLARS}"
-ModifyWords: split "$$$$$$$$" into 1 words
+ModifyWords: split "$$$$$$$$" into 1 word
 Global: var = $$$$$$$$
 Var_Parse: ${8_DOLLARS} (eval-keep-undefined)
 ModifyWord_Loop: in "$$$$$$$$", replace "var" with "${8_DOLLARS}" to "$$$$"
diff -r cf4e9bcba880 -r c9b164f05350 usr.bin/make/unit-tests/varmod-indirect.exp
--- a/usr.bin/make/unit-tests/varmod-indirect.exp       Sat Nov 20 17:47:33 2021 +0000
+++ b/usr.bin/make/unit-tests/varmod-indirect.exp       Sat Nov 20 17:51:48 2021 +0000
@@ -20,7 +20,7 @@
 Evaluating modifier ${UNDEF:S...} on value "" (eval-keep-dollar-and-undefined, undefined)
 Modifier part: "a"
 Modifier part: "a"
-ModifyWords: split "" into 1 words
+ModifyWords: split "" into 1 word
 Result of ${UNDEF:S,a,a,} is "" (eval-keep-dollar-and-undefined, undefined)
 Global: _ = before ${UNDEF:S,a,a,} after
 ParseReadLine (179): '_:=      before ${UNDEF:${:U}} after'
diff -r cf4e9bcba880 -r c9b164f05350 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sat Nov 20 17:47:33 2021 +0000
+++ b/usr.bin/make/var.c        Sat Nov 20 17:51:48 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.953 2021/10/17 18:40:14 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.954 2021/11/20 17:51:48 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.953 2021/10/17 18:40:14 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.954 2021/11/20 17:51:48 rillig Exp $");
 
 /*
  * Variables are defined using one of the VAR=value assignments.  Their
@@ -2399,8 +2399,8 @@
 
        words = Substring_Words(val, false);
 
-       DEBUG2(VAR, "ModifyWords: split \"%s\" into %u words\n",
-           val, (unsigned)words.len);
+       DEBUG3(VAR, "ModifyWords: split \"%s\" into %u %s\n",
+           val, (unsigned)words.len, words.len != 1 ? "words" : "word");
 
        SepBuf_Init(&result, ch->sep);
        for (i = 0; i < words.len; i++) {