Module Name: src
Committed By: rillig
Date: Tue Aug 23 19:22:02 UTC 2022
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: parse-var.exp parse-var.mk
var-eval-short.exp varmod-defined.exp varmod-loop.exp
varmod-loop.mk varname-dot-suffixes.exp
Log Message:
make: revert parsing of modifier parts (since 2022-08-08)
The modifier ':@var@body@' parses the body in parse-only mode and later
uses Var_Subst on it, in which each literal '$' must be written as '$$'.
Trying to parse the loop body using Var_Parse treated the text
'$${var:-0}' as a single '$' followed by the expression '${var:-0}',
wrongly complaining about the 'Unknown modifier "-0"'.
Found by sjg.
To generate a diff of this commit:
cvs rdiff -u -r1.1028 -r1.1029 src/usr.bin/make/var.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/parse-var.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/parse-var.mk \
src/usr.bin/make/unit-tests/varname-dot-suffixes.exp
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/var-eval-short.exp \
src/usr.bin/make/unit-tests/varmod-loop.mk
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/varmod-defined.exp
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/varmod-loop.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
