Module Name: src Committed By: rillig Date: Mon Apr 5 13:35:41 UTC 2021
Modified Files: src/usr.bin/make: var.c src/usr.bin/make/unit-tests: deptgt-makeflags.exp directive-export-impl.exp directive-unexport-env.exp directive.exp opt-debug.exp var-eval-short.exp var-op-append.exp vardebug.exp varmod-assign.exp varmod-defined.exp varmod-indirect.exp varmod-match-escape.exp varname-dot-shell.exp varname-empty.exp varname.exp Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.910 -r1.911 src/usr.bin/make/var.c cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/deptgt-makeflags.exp \ src/usr.bin/make/unit-tests/opt-debug.exp cvs rdiff -u -r1.11 -r1.12 \ src/usr.bin/make/unit-tests/directive-export-impl.exp \ src/usr.bin/make/unit-tests/varname-dot-shell.exp cvs rdiff -u -r1.9 -r1.10 \ src/usr.bin/make/unit-tests/directive-unexport-env.exp cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/directive.exp cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/var-eval-short.exp \ src/usr.bin/make/unit-tests/varmod-match-escape.exp \ src/usr.bin/make/unit-tests/varname-empty.exp cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/var-op-append.exp cvs rdiff -u -r1.22 -r1.23 src/usr.bin/make/unit-tests/vardebug.exp cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/varmod-assign.exp cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/varmod-defined.exp cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/varmod-indirect.exp cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/varname.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.910 src/usr.bin/make/var.c:1.911 --- src/usr.bin/make/var.c:1.910 Mon Apr 5 13:27:30 2021 +++ src/usr.bin/make/var.c Mon Apr 5 13:35:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.910 2021/04/05 13:27:30 rillig Exp $ */ +/* $NetBSD: var.c,v 1.911 2021/04/05 13:35:41 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.910 2021/04/05 13:27:30 rillig Exp $"); +MAKE_RCSID("$NetBSD: var.c,v 1.911 2021/04/05 13:35:41 rillig Exp $"); /* * Variables are defined using one of the VAR=value assignments. Their @@ -476,7 +476,7 @@ VarAdd(const char *name, const char *val Var *v = VarNew(FStr_InitRefer(/* aliased to */ he->key), value, false, (flags & VAR_SET_READONLY) != 0); HashEntry_Set(he, v); - DEBUG3(VAR, "%s:%s = %s\n", scope->name, name, value); + DEBUG3(VAR, "%s: %s = %s\n", scope->name, name, value); return v; } @@ -930,7 +930,7 @@ ExistsInCmdline(const char *name, const return false; if (v->fromCmd) { - DEBUG3(VAR, "%s:%s = %s ignored!\n", + DEBUG3(VAR, "%s: %s = %s ignored!\n", SCOPE_GLOBAL->name, name, val); return true; } @@ -975,14 +975,14 @@ Var_SetWithFlags(GNode *scope, const cha v = VarAdd(name, val, scope, flags); } else { if (v->readOnly && !(flags & VAR_SET_READONLY)) { - DEBUG3(VAR, "%s:%s = %s ignored (read-only)\n", + DEBUG3(VAR, "%s: %s = %s ignored (read-only)\n", scope->name, name, val); return; } Buf_Empty(&v->val); Buf_AddStr(&v->val, val); - DEBUG3(VAR, "%s:%s = %s\n", scope->name, name, val); + DEBUG3(VAR, "%s: %s = %s\n", scope->name, name, val); if (v->exported) ExportVar(name, VEM_PLAIN); } @@ -1107,7 +1107,7 @@ Var_Append(GNode *scope, const char *nam Buf_AddByte(&v->val, ' '); Buf_AddStr(&v->val, val); - DEBUG3(VAR, "%s:%s = %s\n", scope->name, name, v->val.data); + DEBUG3(VAR, "%s: %s = %s\n", scope->name, name, v->val.data); if (v->fromEnv) { /* Index: src/usr.bin/make/unit-tests/deptgt-makeflags.exp diff -u src/usr.bin/make/unit-tests/deptgt-makeflags.exp:1.4 src/usr.bin/make/unit-tests/deptgt-makeflags.exp:1.5 --- src/usr.bin/make/unit-tests/deptgt-makeflags.exp:1.4 Mon Mar 15 15:39:13 2021 +++ src/usr.bin/make/unit-tests/deptgt-makeflags.exp Mon Apr 5 13:35:41 2021 @@ -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 Index: src/usr.bin/make/unit-tests/opt-debug.exp diff -u src/usr.bin/make/unit-tests/opt-debug.exp:1.4 src/usr.bin/make/unit-tests/opt-debug.exp:1.5 --- src/usr.bin/make/unit-tests/opt-debug.exp:1.4 Mon Oct 5 19:27:48 2020 +++ src/usr.bin/make/unit-tests/opt-debug.exp Mon Apr 5 13:35:41 2021 @@ -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 Index: src/usr.bin/make/unit-tests/directive-export-impl.exp diff -u src/usr.bin/make/unit-tests/directive-export-impl.exp:1.11 src/usr.bin/make/unit-tests/directive-export-impl.exp:1.12 --- src/usr.bin/make/unit-tests/directive-export-impl.exp:1.11 Mon Apr 5 13:27:30 2021 +++ src/usr.bin/make/unit-tests/directive-export-impl.exp Mon Apr 5 13:35:41 2021 @@ -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 @@ ModifyWords: split "<>" into 1 words 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 @@ Result of ${:!echo "\$UT_VAR"!} is "<def 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 Index: src/usr.bin/make/unit-tests/varname-dot-shell.exp diff -u src/usr.bin/make/unit-tests/varname-dot-shell.exp:1.11 src/usr.bin/make/unit-tests/varname-dot-shell.exp:1.12 --- src/usr.bin/make/unit-tests/varname-dot-shell.exp:1.11 Sun Apr 4 10:13:09 2021 +++ src/usr.bin/make/unit-tests/varname-dot-shell.exp Mon Apr 5 13:35:41 2021 @@ -1,11 +1,11 @@ ParseReadLine (10): 'ORIG_SHELL:= ${.SHELL}' -Global:ORIG_SHELL = +Global: ORIG_SHELL = Var_Parse: ${.SHELL} (eval-keep-dollar-and-undefined) Global:delete .SHELL (not found) -Command:.SHELL = (details omitted) -Global:ORIG_SHELL = (details omitted) +Command: .SHELL = (details omitted) +Global: ORIG_SHELL = (details omitted) ParseReadLine (12): '.SHELL= overwritten' -Global:.SHELL = overwritten +Global: .SHELL = overwritten CondParser_Eval: ${.SHELL} != ${ORIG_SHELL} Var_Parse: ${.SHELL} != ${ORIG_SHELL} (eval-defined) Var_Parse: ${ORIG_SHELL} (eval-defined) @@ -20,13 +20,13 @@ lhs = "(details omitted)", rhs = "(detai ParseReadLine (27): '.undef .SHELL' Global:delete .SHELL ParseReadLine (28): '.SHELL= newly overwritten' -Global:.SHELL = newly overwritten +Global: .SHELL = newly overwritten CondParser_Eval: ${.SHELL} != ${ORIG_SHELL} Var_Parse: ${.SHELL} != ${ORIG_SHELL} (eval-defined) Var_Parse: ${ORIG_SHELL} (eval-defined) lhs = "(details omitted)", rhs = "(details omitted)", op = != ParseReadLine (33): '.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 Index: src/usr.bin/make/unit-tests/directive-unexport-env.exp diff -u src/usr.bin/make/unit-tests/directive-unexport-env.exp:1.9 src/usr.bin/make/unit-tests/directive-unexport-env.exp:1.10 --- src/usr.bin/make/unit-tests/directive-unexport-env.exp:1.9 Mon Apr 5 13:27:30 2021 +++ src/usr.bin/make/unit-tests/directive-unexport-env.exp Mon Apr 5 13:35:41 2021 @@ -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 @@ Evaluating modifier ${.MAKE.EXPORTED:u} 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 Index: src/usr.bin/make/unit-tests/directive.exp diff -u src/usr.bin/make/unit-tests/directive.exp:1.3 src/usr.bin/make/unit-tests/directive.exp:1.4 --- src/usr.bin/make/unit-tests/directive.exp:1.3 Sun Nov 15 11:57:00 2020 +++ src/usr.bin/make/unit-tests/directive.exp Mon Apr 5 13:35:41 2021 @@ -2,11 +2,11 @@ make: "directive.mk" line 9: Unknown dir 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 Index: src/usr.bin/make/unit-tests/var-eval-short.exp diff -u src/usr.bin/make/unit-tests/var-eval-short.exp:1.12 src/usr.bin/make/unit-tests/var-eval-short.exp:1.13 --- src/usr.bin/make/unit-tests/var-eval-short.exp:1.12 Mon Apr 5 13:14:55 2021 +++ src/usr.bin/make/unit-tests/var-eval-short.exp Mon Apr 5 13:35:41 2021 @@ -11,7 +11,7 @@ Modifier part: "${FAIL}then" 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 @@ Modifier part: "${FAIL}else" 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 Index: src/usr.bin/make/unit-tests/varmod-match-escape.exp diff -u src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.12 src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.13 --- src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.12 Mon Apr 5 13:27:30 2021 +++ src/usr.bin/make/unit-tests/varmod-match-escape.exp Mon Apr 5 13:35:41 2021 @@ -1,4 +1,4 @@ -Global:SPECIALS = \: : \\ * \* +Global: SPECIALS = \: : \\ * \* CondParser_Eval: ${SPECIALS:M${:U}\:} != ${SPECIALS:M\:${:U}} Var_Parse: ${SPECIALS:M${:U}\:} != ${SPECIALS:M\:${:U}} (eval-defined) Evaluating modifier ${SPECIALS:M...} on value "\: : \\ * \*" @@ -17,7 +17,7 @@ Pattern for ':M' is ":" ModifyWords: split "\: : \\ * \*" into 5 words Result of ${SPECIALS:M\:${:U}} is ":" (eval-defined, regular) lhs = ":", rhs = ":", op = != -Global:VALUES = : :: :\: +Global: VALUES = : :: :\: CondParser_Eval: ${VALUES:M\:${:U\:}} != ${VALUES:M${:U\:}\:} Var_Parse: ${VALUES:M\:${:U\:}} != ${VALUES:M${:U\:}\:} (eval-defined) Evaluating modifier ${VALUES:M...} on value ": :: :\:" @@ -37,8 +37,8 @@ ModifyWords: split ": :: :\:" into 3 wor Result of ${VALUES:M${:U\:}\:} is "::" (eval-defined, regular) lhs = ":", rhs = "::", op = != make: "varmod-match-escape.mk" line 42: warning: XXX: Oops -Global:.MAKEFLAGS = -r -k -d cv -d -Global:.MAKEFLAGS = -r -k -d cv -d 0 +Global: .MAKEFLAGS = -r -k -d cv -d +Global: .MAKEFLAGS = -r -k -d cv -d 0 make: "varmod-match-escape.mk" line 67: Dollar followed by nothing make: Fatal errors encountered -- cannot continue make: stopped in unit-tests Index: src/usr.bin/make/unit-tests/varname-empty.exp diff -u src/usr.bin/make/unit-tests/varname-empty.exp:1.12 src/usr.bin/make/unit-tests/varname-empty.exp:1.13 --- src/usr.bin/make/unit-tests/varname-empty.exp:1.12 Mon Apr 5 13:14:55 2021 +++ src/usr.bin/make/unit-tests/varname-empty.exp Mon Apr 5 13:35:41 2021 @@ -3,18 +3,18 @@ Evaluating modifier ${:U} on value "" (e Result of ${:U} is "" (eval, defined) Var_Set("${:U}", "cmdline-u", ...) name expands to empty string - ignored Var_Set("", "cmdline-plain", ...) name expands to empty string - ignored -Global:.CURDIR = <curdir> +Global: .CURDIR = <curdir> Var_Parse: ${MAKE_OBJDIR_CHECK_WRITABLE:U} (eval) Evaluating modifier ${MAKE_OBJDIR_CHECK_WRITABLE:U} on value "" (eval, undefined) Result of ${MAKE_OBJDIR_CHECK_WRITABLE:U} is "" (eval, defined) -Global:.OBJDIR = <curdir> +Global: .OBJDIR = <curdir> Global:delete .PATH (not found) -Global:.PATH = . -Global:.PATH = . <curdir> -Global:.TARGETS = -Internal:MAKEFILE = varname-empty.mk -Global:.MAKE.MAKEFILES = varname-empty.mk -Global:.PARSEFILE = varname-empty.mk +Global: .PATH = . +Global: .PATH = . <curdir> +Global: .TARGETS = +Internal: MAKEFILE = varname-empty.mk +Global: .MAKE.MAKEFILES = varname-empty.mk +Global: .PARSEFILE = varname-empty.mk Global:delete .INCLUDEDFROMDIR (not found) Global:delete .INCLUDEDFROMFILE (not found) Var_Set("", "default", ...) name expands to empty string - ignored @@ -40,8 +40,8 @@ Var_Append("${:U}", "appended indirectly Var_Parse: ${:Ufallback} != "fallback" (eval-defined) Evaluating modifier ${:U...} on value "" (eval-defined, undefined) Result of ${:Ufallback} is "fallback" (eval-defined, defined) -Global:.MAKEFLAGS = -r -d v -d -Global:.MAKEFLAGS = -r -d v -d 0 +Global: .MAKEFLAGS = -r -d v -d +Global: .MAKEFLAGS = -r -d v -d 0 out: fallback out: 1 2 3 exit status 0 Index: src/usr.bin/make/unit-tests/var-op-append.exp diff -u src/usr.bin/make/unit-tests/var-op-append.exp:1.8 src/usr.bin/make/unit-tests/var-op-append.exp:1.9 --- src/usr.bin/make/unit-tests/var-op-append.exp:1.8 Mon Apr 5 13:14:55 2021 +++ src/usr.bin/make/unit-tests/var-op-append.exp Mon Apr 5 13:35:41 2021 @@ -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 Index: src/usr.bin/make/unit-tests/vardebug.exp diff -u src/usr.bin/make/unit-tests/vardebug.exp:1.22 src/usr.bin/make/unit-tests/vardebug.exp:1.23 --- src/usr.bin/make/unit-tests/vardebug.exp:1.22 Mon Apr 5 13:27:30 2021 +++ src/usr.bin/make/unit-tests/vardebug.exp Mon Apr 5 13:35:41 2021 @@ -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 @@ Var_Parse: ${:U} (eval) 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 @@ make: "vardebug.mk" line 44: Malformed c 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 Index: src/usr.bin/make/unit-tests/varmod-assign.exp diff -u src/usr.bin/make/unit-tests/varmod-assign.exp:1.14 src/usr.bin/make/unit-tests/varmod-assign.exp:1.15 --- src/usr.bin/make/unit-tests/varmod-assign.exp:1.14 Mon Apr 5 13:27:30 2021 +++ src/usr.bin/make/unit-tests/varmod-assign.exp Mon Apr 5 13:35:41 2021 @@ -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. Index: src/usr.bin/make/unit-tests/varmod-defined.exp diff -u src/usr.bin/make/unit-tests/varmod-defined.exp:1.7 src/usr.bin/make/unit-tests/varmod-defined.exp:1.8 --- src/usr.bin/make/unit-tests/varmod-defined.exp:1.7 Mon Apr 5 13:14:55 2021 +++ src/usr.bin/make/unit-tests/varmod-defined.exp Mon Apr 5 13:35:41 2021 @@ -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 Index: src/usr.bin/make/unit-tests/varmod-indirect.exp diff -u src/usr.bin/make/unit-tests/varmod-indirect.exp:1.16 src/usr.bin/make/unit-tests/varmod-indirect.exp:1.17 --- src/usr.bin/make/unit-tests/varmod-indirect.exp:1.16 Mon Apr 5 13:14:55 2021 +++ src/usr.bin/make/unit-tests/varmod-indirect.exp Mon Apr 5 13:35:41 2021 @@ -11,9 +11,9 @@ make: "varmod-indirect.mk" line 156: Unk 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 @@ Result of ${UNDEF:S,a,a,} is "" (eval-ke 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 @@ Indirect modifier "" from "${:U}" 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 @@ Result of ${UNDEF:Z} is error (eval-keep 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 make: stopped in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varname.exp diff -u src/usr.bin/make/unit-tests/varname.exp:1.15 src/usr.bin/make/unit-tests/varname.exp:1.16 --- src/usr.bin/make/unit-tests/varname.exp:1.15 Mon Apr 5 13:14:55 2021 +++ src/usr.bin/make/unit-tests/varname.exp Mon Apr 5 13:35:41 2021 @@ -1,24 +1,24 @@ -Global:VAR{{{}}} = 3 braces +Global: VAR{{{}}} = 3 braces Var_Parse: ${VAR{{{}}}}" != "3 braces" (eval) -Global:VARNAME = VAR((( +Global: VARNAME = VAR((( Var_Parse: ${VARNAME} (eval) -Global:VAR((( = 3 open parentheses +Global: VAR((( = 3 open parentheses Var_Parse: ${VAR(((}}}}" != "3 open parentheses}}}" (eval) Var_Parse: ${:UVAR(((}= try1 (eval-defined) Evaluating modifier ${:U...} on value "" (eval-defined, undefined) Result of ${:UVAR(((} is "VAR(((" (eval-defined, defined) -Global:.ALLTARGETS = VAR(((=) +Global: .ALLTARGETS = VAR(((=) make: "varname.mk" line 30: No closing parenthesis in archive specification make: "varname.mk" line 30: Error in archive specification: "VAR" Var_Parse: ${:UVAR\(\(\(}= try2 (eval-defined) Evaluating modifier ${:U...} on value "" (eval-defined, undefined) Result of ${:UVAR\(\(\(} is "VAR\(\(\(" (eval-defined, defined) -Global:.ALLTARGETS = VAR(((=) VAR\(\(\(= +Global: .ALLTARGETS = VAR(((=) VAR\(\(\(= make: "varname.mk" line 35: Invalid line type Var_Parse: ${VARNAME} (eval) -Global:VAR((( = try3 -Global:.MAKEFLAGS = -r -k -d v -d -Global:.MAKEFLAGS = -r -k -d v -d 0 +Global: VAR((( = try3 +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