Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make: in debug log, add space between scope and...
details: https://anonhg.NetBSD.org/src/rev/501be264add1
branches: trunk
changeset: 961001:501be264add1
user: rillig <rillig%NetBSD.org@localhost>
date: Mon Apr 05 13:35:41 2021 +0000
description:
make: in debug log, add space between scope and variable name
Without this space, the debug log looked more like line noise, even
though the only punctuation was a single innocent ':'. From a make
user's perspective, the variable name is a word of its own and should
not be visually glued to its namespace.
diffstat:
usr.bin/make/unit-tests/deptgt-makeflags.exp | 8 +++---
usr.bin/make/unit-tests/directive-export-impl.exp | 12 +++++-----
usr.bin/make/unit-tests/directive-unexport-env.exp | 10 ++++----
usr.bin/make/unit-tests/directive.exp | 8 +++---
usr.bin/make/unit-tests/opt-debug.exp | 6 ++--
usr.bin/make/unit-tests/var-eval-short.exp | 6 ++--
usr.bin/make/unit-tests/var-op-append.exp | 6 ++--
usr.bin/make/unit-tests/vardebug.exp | 24 +++++++++++-----------
usr.bin/make/unit-tests/varmod-assign.exp | 12 +++++-----
usr.bin/make/unit-tests/varmod-defined.exp | 16 +++++++-------
usr.bin/make/unit-tests/varmod-indirect.exp | 14 ++++++------
usr.bin/make/unit-tests/varmod-match-escape.exp | 8 +++---
usr.bin/make/unit-tests/varname-dot-shell.exp | 14 ++++++------
usr.bin/make/unit-tests/varname-empty.exp | 20 +++++++++---------
usr.bin/make/unit-tests/varname.exp | 16 +++++++-------
usr.bin/make/var.c | 14 ++++++------
16 files changed, 97 insertions(+), 97 deletions(-)
diffs (truncated from 506 to 300 lines):
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/deptgt-makeflags.exp
--- a/usr.bin/make/unit-tests/deptgt-makeflags.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/deptgt-makeflags.exp Mon Apr 05 13:35:41 2021 +0000
@@ -1,10 +1,10 @@
Global:delete DOLLAR (not found)
-Command:DOLLAR = $$$$
-Global:.MAKEOVERRIDES = VAR DOLLAR
+Command: DOLLAR = $$$$
+Global: .MAKEOVERRIDES = VAR DOLLAR
CondParser_Eval: ${DOLLAR} != "\$\$"
Var_Parse: ${DOLLAR} != "\$\$" (eval-defined)
lhs = "$$", rhs = "$$", op = !=
-Global:.MAKEFLAGS = -r -k -D VAR -D VAR -d cv -d
-Global:.MAKEFLAGS = -r -k -D VAR -D VAR -d cv -d 0
+Global: .MAKEFLAGS = -r -k -D VAR -D VAR -d cv -d
+Global: .MAKEFLAGS = -r -k -D VAR -D VAR -d cv -d 0
make: Unterminated quoted string [make VAR=initial UNBALANCED=']
exit status 0
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/directive-export-impl.exp
--- a/usr.bin/make/unit-tests/directive-export-impl.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/directive-export-impl.exp Mon Apr 05 13:35:41 2021 +0000
@@ -1,7 +1,7 @@
ParseReadLine (21): 'UT_VAR= <${REF}>'
-Global:UT_VAR = <${REF}>
+Global: UT_VAR = <${REF}>
ParseReadLine (28): '.export UT_VAR'
-Global:.MAKE.EXPORTED = UT_VAR
+Global: .MAKE.EXPORTED = UT_VAR
ParseReadLine (32): ': ${UT_VAR:N*}'
Var_Parse: ${UT_VAR:N*} (eval-defined)
Var_Parse: ${REF}> (eval-defined)
@@ -32,7 +32,7 @@
Result of ${UT_VAR:N*} is "" (eval-defined, regular)
ParseDependency(: )
ParseReadLine (54): 'REF= defined'
-Global:REF = defined
+Global: REF = defined
CondParser_Eval: ${:!echo "\$UT_VAR"!} != "<defined>"
Var_Parse: ${:!echo "\$UT_VAR"!} != "<defined>" (eval-defined)
Evaluating modifier ${:!...} on value "" (eval-defined, undefined)
@@ -48,9 +48,9 @@
lhs = "<defined>", rhs = "<defined>", op = !=
ParseReadLine (62): 'all:'
ParseDependency(all:)
-Global:.ALLTARGETS = all
+Global: .ALLTARGETS = all
ParseReadLine (63): '.MAKEFLAGS: -d0'
ParseDependency(.MAKEFLAGS: -d0)
-Global:.MAKEFLAGS = -r -k -d cpv -d
-Global:.MAKEFLAGS = -r -k -d cpv -d 0
+Global: .MAKEFLAGS = -r -k -d cpv -d
+Global: .MAKEFLAGS = -r -k -d cpv -d 0
exit status 0
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/directive-unexport-env.exp
--- a/usr.bin/make/unit-tests/directive-unexport-env.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/directive-unexport-env.exp Mon Apr 05 13:35:41 2021 +0000
@@ -1,8 +1,8 @@
make: "directive-unexport-env.mk" line 13: Unknown directive "unexport-en"
make: "directive-unexport-env.mk" line 15: Unknown directive "unexport-environment"
-Global:UT_EXPORTED = value
-Global:UT_UNEXPORTED = value
-Global:.MAKE.EXPORTED = UT_EXPORTED
+Global: UT_EXPORTED = value
+Global: UT_UNEXPORTED = value
+Global: .MAKE.EXPORTED = UT_EXPORTED
make: "directive-unexport-env.mk" line 21: The directive .unexport-env does not take arguments
Var_Parse: ${.MAKE.EXPORTED:O:u} (eval)
Evaluating modifier ${.MAKE.EXPORTED:O} on value "UT_EXPORTED"
@@ -11,8 +11,8 @@
Result of ${.MAKE.EXPORTED:u} is "UT_EXPORTED" (eval, regular)
Unexporting "UT_EXPORTED"
Global:delete .MAKE.EXPORTED
-Global:.MAKEFLAGS = -r -k -d v -d
-Global:.MAKEFLAGS = -r -k -d v -d 0
+Global: .MAKEFLAGS = -r -k -d v -d
+Global: .MAKEFLAGS = -r -k -d v -d 0
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/directive.exp
--- a/usr.bin/make/unit-tests/directive.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/directive.exp Mon Apr 05 13:35:41 2021 +0000
@@ -2,11 +2,11 @@
make: "directive.mk" line 10: Unknown directive "indented"
make: "directive.mk" line 11: Unknown directive "indented"
make: "directive.mk" line 15: Unknown directive "info"
-Global:.info =
-Global:.info = value
+Global: .info =
+Global: .info = value
make: "directive.mk" line 26: := value
-Global:.MAKEFLAGS = -r -k -d v -d
-Global:.MAKEFLAGS = -r -k -d v -d 0
+Global: .MAKEFLAGS = -r -k -d v -d
+Global: .MAKEFLAGS = -r -k -d v -d 0
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/opt-debug.exp
--- a/usr.bin/make/unit-tests/opt-debug.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/opt-debug.exp Mon Apr 05 13:35:41 2021 +0000
@@ -1,4 +1,4 @@
-Global:VAR = value
-Global:.MAKEFLAGS = -r -k -d v -d
-Global:.MAKEFLAGS = -r -k -d v -d 0
+Global: VAR = value
+Global: .MAKEFLAGS = -r -k -d v -d
+Global: .MAKEFLAGS = -r -k -d v -d 0
exit status 0
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/var-eval-short.exp
--- a/usr.bin/make/unit-tests/var-eval-short.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/var-eval-short.exp Mon Apr 05 13:35:41 2021 +0000
@@ -11,7 +11,7 @@
Modifier part: "${FAIL}else"
Result of ${0:?${FAIL}then:${FAIL}else} is "" (parse-only, defined)
ParseReadLine (158): 'DEFINED= defined'
-Global:DEFINED = defined
+Global: DEFINED = defined
CondParser_Eval: 0 && ${DEFINED:L:?${FAIL}then:${FAIL}else}
Var_Parse: ${DEFINED:L:?${FAIL}then:${FAIL}else} (parse-only)
Parsing modifier ${DEFINED:L}
@@ -22,8 +22,8 @@
Result of ${DEFINED:?${FAIL}then:${FAIL}else} is "defined" (parse-only, regular)
ParseReadLine (161): '.MAKEFLAGS: -d0'
ParseDependency(.MAKEFLAGS: -d0)
-Global:.MAKEFLAGS = -r -k -d cpv -d
-Global:.MAKEFLAGS = -r -k -d cpv -d 0
+Global: .MAKEFLAGS = -r -k -d cpv -d
+Global: .MAKEFLAGS = -r -k -d cpv -d 0
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/var-op-append.exp
--- a/usr.bin/make/unit-tests/var-op-append.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/var-op-append.exp Mon Apr 05 13:35:41 2021 +0000
@@ -1,7 +1,7 @@
Var_Parse: ${:U\$\$\$\$\$\$\$\$} (eval)
Evaluating modifier ${:U...} on value "" (eval, undefined)
Result of ${:U\$\$\$\$\$\$\$\$} is "$$$$$$$$" (eval, defined)
-Global:VAR.$$$$$$$$ = dollars
-Global:.MAKEFLAGS = -r -k -d v -d
-Global:.MAKEFLAGS = -r -k -d v -d 0
+Global: VAR.$$$$$$$$ = dollars
+Global: .MAKEFLAGS = -r -k -d v -d
+Global: .MAKEFLAGS = -r -k -d v -d 0
exit status 0
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/vardebug.exp
--- a/usr.bin/make/unit-tests/vardebug.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/vardebug.exp Mon Apr 05 13:35:41 2021 +0000
@@ -1,8 +1,8 @@
Global:delete FROM_CMDLINE (not found)
-Command:FROM_CMDLINE =
-Global:.MAKEOVERRIDES = FROM_CMDLINE
-Global:VAR = added
-Global:VAR = overwritten
+Command: FROM_CMDLINE =
+Global: .MAKEOVERRIDES = FROM_CMDLINE
+Global: VAR = added
+Global: VAR = overwritten
Global:delete VAR
Global:delete VAR (not found)
Var_Parse: ${:U} (eval)
@@ -13,10 +13,10 @@
Evaluating modifier ${:U} on value "" (eval, undefined)
Result of ${:U} is "" (eval, defined)
Var_Append("${:U}", "empty name", ...) name expands to empty string - ignored
-Global:FROM_CMDLINE = overwritten ignored!
-Global:VAR = 1
-Global:VAR = 1 2
-Global:VAR = 1 2 3
+Global: FROM_CMDLINE = overwritten ignored!
+Global: VAR = 1
+Global: VAR = 1 2
+Global: VAR = 1 2 3
Var_Parse: ${VAR:M[2]} (eval-defined)
Evaluating modifier ${VAR:M...} on value "1 2 3"
Pattern for ':M' is "[2]"
@@ -72,10 +72,10 @@
Var_Parse: ${UNDEFINED} (eval-defined)
make: "vardebug.mk" line 53: Malformed conditional (${UNDEFINED})
Global:delete .SHELL (not found)
-Command:.SHELL = </path/to/shell>
-Command:.SHELL = overwritten ignored (read-only)
-Global:.MAKEFLAGS = -r -k -d v -d
-Global:.MAKEFLAGS = -r -k -d v -d 0
+Command: .SHELL = </path/to/shell>
+Command: .SHELL = overwritten ignored (read-only)
+Global: .MAKEFLAGS = -r -k -d v -d
+Global: .MAKEFLAGS = -r -k -d v -d 0
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/varmod-assign.exp
--- a/usr.bin/make/unit-tests/varmod-assign.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/varmod-assign.exp Mon Apr 05 13:35:41 2021 +0000
@@ -1,17 +1,17 @@
-Global:param = twice
-Global:VARNAME = VAR.$${param}
+Global: param = twice
+Global: VARNAME = VAR.$${param}
Var_Parse: ${VARNAME} (eval)
-Global:VAR.${param} = initial-value
+Global: VAR.${param} = initial-value
Var_Parse: ${${VARNAME}::=assigned-value} (eval-defined)
Var_Parse: ${VARNAME}::=assigned-value} (eval-defined)
Evaluating modifier ${VAR.${param}::...} on value "initial-value"
Modifier part: "assigned-value"
-Global:VAR.${param} = assigned-value
+Global: VAR.${param} = assigned-value
Result of ${VAR.${param}::=assigned-value} is "" (eval-defined, regular)
Var_Parse: ${${VARNAME}} != "assigned-value" (eval-defined)
Var_Parse: ${VARNAME}} != "assigned-value" (eval-defined)
-Global:.MAKEFLAGS = -r -k -d v -d
-Global:.MAKEFLAGS = -r -k -d v -d 0
+Global: .MAKEFLAGS = -r -k -d v -d
+Global: .MAKEFLAGS = -r -k -d v -d 0
mod-assign: first=1.
mod-assign: last=3.
mod-assign: appended=1 2 3.
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/varmod-defined.exp
--- a/usr.bin/make/unit-tests/varmod-defined.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/varmod-defined.exp Mon Apr 05 13:35:41 2021 +0000
@@ -1,23 +1,23 @@
-Global:8_DOLLARS = $$$$$$$$
-Global:VAR =
+Global: 8_DOLLARS = $$$$$$$$
+Global: VAR =
Var_Parse: ${8_DOLLARS} (eval-keep-dollar-and-undefined)
-Global:VAR = $$$$$$$$
+Global: VAR = $$$$$$$$
Var_Parse: ${VAR:D${8_DOLLARS}} (eval-keep-dollar-and-undefined)
Evaluating modifier ${VAR:D...} on value "$$$$$$$$" (eval-keep-dollar-and-undefined, regular)
Var_Parse: ${8_DOLLARS}} (eval-keep-dollar-and-undefined)
Result of ${VAR:D${8_DOLLARS}} is "$$$$$$$$" (eval-keep-dollar-and-undefined, regular)
-Global:VAR = $$$$$$$$
+Global: VAR = $$$$$$$$
Var_Parse: ${VAR:@var@${8_DOLLARS}@} (eval-keep-dollar-and-undefined)
Evaluating modifier ${VAR:@...} on value "$$$$$$$$" (eval-keep-dollar-and-undefined, regular)
Modifier part: "var"
Modifier part: "${8_DOLLARS}"
ModifyWords: split "$$$$$$$$" into 1 words
-Global:var = $$$$$$$$
+Global: var = $$$$$$$$
Var_Parse: ${8_DOLLARS} (eval-keep-undefined)
ModifyWord_Loop: in "$$$$$$$$", replace "var" with "${8_DOLLARS}" to "$$$$"
Global:delete var
Result of ${VAR:@var@${8_DOLLARS}@} is "$$$$" (eval-keep-dollar-and-undefined, regular)
-Global:VAR = $$$$
-Global:.MAKEFLAGS = -r -k -d v -d
-Global:.MAKEFLAGS = -r -k -d v -d 0
+Global: VAR = $$$$
+Global: .MAKEFLAGS = -r -k -d v -d
+Global: .MAKEFLAGS = -r -k -d v -d 0
exit status 0
diff -r db071b07a6e7 -r 501be264add1 usr.bin/make/unit-tests/varmod-indirect.exp
--- a/usr.bin/make/unit-tests/varmod-indirect.exp Mon Apr 05 13:27:30 2021 +0000
+++ b/usr.bin/make/unit-tests/varmod-indirect.exp Mon Apr 05 13:35:41 2021 +0000
@@ -11,9 +11,9 @@
make: "varmod-indirect.mk" line 157: before
make: "varmod-indirect.mk" line 157: after
ParseReadLine (166): '_:= before ${UNDEF} after'
-Global:_ =
+Global: _ =
Var_Parse: ${UNDEF} after (eval-keep-dollar-and-undefined)
-Global:_ = before ${UNDEF} after
+Global: _ = before ${UNDEF} after
ParseReadLine (169): '_:= before ${UNDEF:${:US,a,a,}} after'
Var_Parse: ${UNDEF:${:US,a,a,}} after (eval-keep-dollar-and-undefined)
Var_Parse: ${:US,a,a,}} after (eval-keep-dollar-and-undefined)
@@ -28,7 +28,7 @@
Var_Parse: ${:US,a,a,}} after (eval-keep-dollar-and-undefined)
Evaluating modifier ${:U...} on value "" (eval-keep-dollar-and-undefined, undefined)
Result of ${:US,a,a,} is "S,a,a," (eval-keep-dollar-and-undefined, defined)
-Global:_ = before ${UNDEF:S,a,a,} after
+Global: _ = before ${UNDEF:S,a,a,} after
ParseReadLine (179): '_:= before ${UNDEF:${:U}} after'
Var_Parse: ${UNDEF:${:U}} after (eval-keep-dollar-and-undefined)
Var_Parse: ${:U}} after (eval-keep-dollar-and-undefined)
@@ -38,7 +38,7 @@
Var_Parse: ${:U}} after (eval-keep-dollar-and-undefined)
Evaluating modifier ${:U} on value "" (eval-keep-dollar-and-undefined, undefined)
Result of ${:U} is "" (eval-keep-dollar-and-undefined, defined)
-Global:_ = before ${UNDEF:} after
+Global: _ = before ${UNDEF:} after
ParseReadLine (184): '_:= before ${UNDEF:${:UZ}} after'
Var_Parse: ${UNDEF:${:UZ}} after (eval-keep-dollar-and-undefined)
Var_Parse: ${:UZ}} after (eval-keep-dollar-and-undefined)
@@ -51,11 +51,11 @@
Var_Parse: ${:UZ}} after (eval-keep-dollar-and-undefined)
Evaluating modifier ${:U...} on value "" (eval-keep-dollar-and-undefined, undefined)
Result of ${:UZ} is "Z" (eval-keep-dollar-and-undefined, defined)
-Global:_ = before ${UNDEF:Z} after
+Global: _ = before ${UNDEF:Z} after
ParseReadLine (186): '.MAKEFLAGS: -d0'
ParseDependency(.MAKEFLAGS: -d0)
-Global:.MAKEFLAGS = -r -k -d 0 -d pv -d
-Global:.MAKEFLAGS = -r -k -d 0 -d pv -d 0
+Global: .MAKEFLAGS = -r -k -d 0 -d pv -d
+Global: .MAKEFLAGS = -r -k -d 0 -d pv -d 0
make: Fatal errors encountered -- cannot continue
Home |
Main Index |
Thread Index |
Old Index