Module Name: src
Committed By: rillig
Date: Sat Nov 20 17:51:48 UTC 2021
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: directive-export-impl.exp vardebug.exp
varmod-defined.exp varmod-indirect.exp
Log Message:
make: use correct plural form in debug message
To generate a diff of this commit:
cvs rdiff -u -r1.953 -r1.954 src/usr.bin/make/var.c
cvs rdiff -u -r1.13 -r1.14 \
src/usr.bin/make/unit-tests/directive-export-impl.exp
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/make/unit-tests/vardebug.exp
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/varmod-defined.exp
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/varmod-indirect.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.953 src/usr.bin/make/var.c:1.954
--- src/usr.bin/make/var.c:1.953 Sun Oct 17 18:40:14 2021
+++ src/usr.bin/make/var.c Sat Nov 20 17:51:48 2021
@@ -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 @@ ModifyWords(ModChain *ch,
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++) {
Index: src/usr.bin/make/unit-tests/directive-export-impl.exp
diff -u src/usr.bin/make/unit-tests/directive-export-impl.exp:1.13 src/usr.bin/make/unit-tests/directive-export-impl.exp:1.14
--- src/usr.bin/make/unit-tests/directive-export-impl.exp:1.13 Tue Apr 6 01:38:39 2021
+++ src/usr.bin/make/unit-tests/directive-export-impl.exp Sat Nov 20 17:51:48 2021
@@ -7,7 +7,7 @@ Var_Parse: ${UT_VAR:N*} (eval-defined)
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: ${UT_VAR:N*} (eval-defined)
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'
Index: src/usr.bin/make/unit-tests/vardebug.exp
diff -u src/usr.bin/make/unit-tests/vardebug.exp:1.26 src/usr.bin/make/unit-tests/vardebug.exp:1.27
--- src/usr.bin/make/unit-tests/vardebug.exp:1.26 Sat Apr 10 22:35:02 2021
+++ src/usr.bin/make/unit-tests/vardebug.exp Sat Nov 20 17:51:48 2021
@@ -43,11 +43,11 @@ Result of ${:Uvalue} is "value" (eval-de
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)
Index: src/usr.bin/make/unit-tests/varmod-defined.exp
diff -u src/usr.bin/make/unit-tests/varmod-defined.exp:1.8 src/usr.bin/make/unit-tests/varmod-defined.exp:1.9
--- src/usr.bin/make/unit-tests/varmod-defined.exp:1.8 Mon Apr 5 13:35:41 2021
+++ src/usr.bin/make/unit-tests/varmod-defined.exp Sat Nov 20 17:51:48 2021
@@ -11,7 +11,7 @@ Var_Parse: ${VAR:@var@${8_DOLLARS}@} (ev
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 "$$$$"
Index: src/usr.bin/make/unit-tests/varmod-indirect.exp
diff -u src/usr.bin/make/unit-tests/varmod-indirect.exp:1.18 src/usr.bin/make/unit-tests/varmod-indirect.exp:1.19
--- src/usr.bin/make/unit-tests/varmod-indirect.exp:1.18 Sat Apr 10 22:09:54 2021
+++ src/usr.bin/make/unit-tests/varmod-indirect.exp Sat Nov 20 17:51:48 2021
@@ -20,7 +20,7 @@ Indirect modifier "S,a,a," from "${:US,a
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'
