Module Name: src
Committed By: rillig
Date: Thu Jul 23 19:46:55 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: modmisc.exp modmisc.mk
Log Message:
make(1): demonstrate wrong error message about missing delimiter
The current practice of setting st->delim at the beginning of each
modifier and resetting it again at the end produces too many error
messages. In this case, there is no missing delimiter.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/unit-tests/modmisc.exp
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/modmisc.mk
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/unit-tests/modmisc.exp
diff -u src/usr.bin/make/unit-tests/modmisc.exp:1.25 src/usr.bin/make/unit-tests/modmisc.exp:1.26
--- src/usr.bin/make/unit-tests/modmisc.exp:1.25 Tue Jul 21 23:19:46 2020
+++ src/usr.bin/make/unit-tests/modmisc.exp Thu Jul 23 19:46:55 2020
@@ -73,6 +73,9 @@ make: No subexpression \2
mod-C-limits:22-missing:1 6
mod-C-limits:22-ok:1 33 556
mod-C-limits:capture:ihgfedcbaabcdefghijABCDEFGHIJa0a1a2rest
+make: RE substitution error: (details omitted)
+make: Unclosed substitution for UNDEF (, missing)
+mod-C-errors:
mod-assign: first=1.
mod-assign: last=3.
mod-assign: appended=1 2 3.
Index: src/usr.bin/make/unit-tests/modmisc.mk
diff -u src/usr.bin/make/unit-tests/modmisc.mk:1.20 src/usr.bin/make/unit-tests/modmisc.mk:1.21
--- src/usr.bin/make/unit-tests/modmisc.mk:1.20 Tue Jul 21 23:19:46 2020
+++ src/usr.bin/make/unit-tests/modmisc.mk Thu Jul 23 19:46:55 2020
@@ -1,4 +1,4 @@
-# $Id: modmisc.mk,v 1.20 2020/07/21 23:19:46 rillig Exp $
+# $Id: modmisc.mk,v 1.21 2020/07/23 19:46:55 rillig Exp $
#
# miscellaneous modifier tests
@@ -19,6 +19,7 @@ all: modvar modvarloop modsysv mod-HTE e
all: mod-S mod-C mod-at-varname mod-at-resolve mod-at-dollar
all: mod-subst-dollar mod-loop-dollar
all: mod-C-limits
+all: mod-C-errors
all: mod-assign
all: mod-assign-nested
all: mod-tu-space
@@ -153,6 +154,9 @@ mod-C-limits:
# which is more than enough for daily use.
@echo $@:capture:${:UabcdefghijABCDEFGHIJrest:C,(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.),\9\8\7\6\5\4\3\2\1\0\10\11\12,}
+mod-C-errors:
+ @echo $@: ${UNDEF:Uvalue:C,[,,}
+
# Just a bit of basic code coverage for the obscure ::= assignment modifiers.
mod-assign:
@echo $@: ${1 2 3:L:@i@${FIRST::?=$i}@} first=${FIRST}.
