 @@ -1,93 +1,94 @@
-# $NetBSD: dir.mk,v 1.7 2020/10/31 21:30:03 rillig Exp $
+# $NetBSD: dir.mk,v 1.8 2020/11/03 18:42:33 rillig Exp $
+#
 # Tests for dir.c.
 .MAKEFLAGS: -m /		# hide /usr/share/mk from the debug log
 # Dependency lines may use braces for expansion.
 # See DirExpandCurly for the implementation.
 all: {one,two,three}
 # XXX: The above dependency line is parsed as a single node named
 # "{one,two,three}".  There are no individual targets "one", "two", "three"
 # yet.  The node exists but is not a target since it never appeared
 # on the left-hand side of a dependency operator.  However, it is listed
 # in .ALLTARGETS (which lists all nodes, not only targets).
 .if target(one)
 .  error
 .endif
 .if target({one,two,three})
 .  error
 .endif
 .if ${.ALLTARGETS:M{one,two,three}} != "{one,two,three}"
 .  error
 .endif
 one:
 	: 1
 two:
 	: 2
 three:
 	: 3
 # The braces may start in the middle of a word.
 all: f{our,ive}
 four:
 	: 4
 five:
 	: 5
 six:
 	: 6
 # Nested braces work as expected since 2020-07-31 19:06 UTC.
 # They had been broken at least since 2003-01-01, probably even longer.
 all: {{thi,fou}r,fif}teen
 thirteen:
 	: 13
 fourteen:
 	: 14
 fifteen:
 	: 15
 # There may be multiple brace groups side by side.
 all: {pre-,}{patch,configure}
 pre-patch patch pre-configure configure:
 	: $@
 # Empty pieces are allowed in the braces.
 all: {fetch,extract}{,-post}
 fetch fetch-post extract extract-post:
 	: $@
 # The expansions may have duplicates.
-# These are merged together because of the dependency line.
+# When the source of the dependency line is expanded later, each of the
 # expanded words will be the same.
 all: dup-{1,1,1,1,1,1,1}
 dup-1:
 	: $@
 # Other than in Bash, the braces are also expanded if there is no comma.
 all: {{{{{{{{{{single-word}}}}}}}}}}
 single-word:
 	: $@
 # Demonstrate debug logging for filename expansion, especially curly braces.
 .MAKEFLAGS: -dd
 # The below line does not call Dir_Expand yet.
 # It is expanded only when necessary, that is, when the 'debug' target is
 # indeed made.
 debug: {{thi,fou}r,fif}twen
 # Therefore, keep the debug logging active.
 .PHONY: one two three four five six
 .PHONY: thirteen fourteen fifteen
 .PHONY: single-word
 .PHONY: pre-patch patch pre-configure configure
 .PHONY: fetch fetch-post extract extract-post
 .PHONY: dup-1 single-word
 .PHONY: all

 @@ -1,48 +1,47 @@
-# $NetBSD: modts.mk,v 1.7 2020/10/24 08:50:17 rillig Exp $
+# $NetBSD: modts.mk,v 1.8 2020/11/03 18:42:33 rillig Exp $
-LIST=	one two three
+LIST=	one two three four five six
 LIST+=	four five six
 FU_mod-ts=	a / b / cool
 AAA=	a a a
 B.aaa=	Baaa
 all:   mod-ts mod-ts-space
 # Use print or printf iff they are builtin.
 # XXX note that this causes problems, when make decides
 # there is no need to use a shell, so avoid where possible.
 .if ${type print 2> /dev/null || echo:L:sh:Mbuiltin} != ""
 PRINT=	print -r --
 .elif ${type printf 2> /dev/null || echo:L:sh:Mbuiltin} != ""
 PRINT=	printf '%s\n'
 .else
 PRINT=	echo
 .endif
 mod-ts:
 	@${PRINT} 'LIST:tx="${LIST:tx}"'
 	@${PRINT} 'LIST:ts/x:tu="${LIST:ts\X:tu}"'
 	@${PRINT} 'FU_$@="${FU_${@:ts}:ts}"'
 	@${PRINT} 'FU_$@:ts:T="${FU_${@:ts}:ts:T}" == cool?'
 	@${PRINT} 'B.$${AAA:ts}="${B.${AAA:ts}}" == Baaa?'
 mod-ts-space:
 	# After the :ts modifier, the whole string is interpreted as a single
 	# word since all spaces have been replaced with x.
 	@${PRINT} ':ts :S => '${aa bb aa bb aa bb:L:tsx:S,b,B,:Q}
 	# The :ts modifier also applies to word separators that are added
 	# afterwards.
 	@${PRINT} ':ts :S space    => '${a ababa c:L:tsx:S,b, ,g:Q}
 	@${PRINT} ':ts :S space :M => '${a ababa c:L:tsx:S,b, ,g:M*:Q}
 	# Not all modifiers behave this way though.  Some of them always use
 	# a space as word separator instead of the :ts separator.
 	# This seems like an oversight during implementation.
 	@${PRINT} ':ts :S       => '${a ababa c:L:tsx:S,b, ,g:Q}
 	@${PRINT} ':ts :S :@    => '${a ababa c:L:tsx:S,b, ,g:@v@${v}@:Q}
 	# A final :M* modifier applies the :ts separator again, though.
 	@${PRINT} ':ts :S :@ :M => '${a ababa c:L:tsx:S,b, ,g:@v@${v}@:M*:Q}

 @@ -1,92 +1,92 @@
-# $NetBSD: modmisc.mk,v 1.49 2020/10/24 08:50:17 rillig Exp $
+# $NetBSD: modmisc.mk,v 1.50 2020/11/03 18:42:33 rillig Exp $
+#
 # miscellaneous modifier tests
 # do not put any dirs in this list which exist on some
 # but not all target systems - an exists() check is below.
 path=		:/bin:/tmp::/:.:/no/such/dir:.
 # strip cwd from path.
 MOD_NODOT=	S/:/ /g:N.:ts:
 # and decorate, note that $'s need to be doubled. Also note that
 # the modifier_variable can be used with other modifiers.
 MOD_NODOTX=	S/:/ /g:N.:@d@'$$d'@
 # another mod - pretend it is more interesting
 MOD_HOMES=	S,/home/,/homes/,
 MOD_OPT=	@d@$${exists($$d):?$$d:$${d:S,/usr,/opt,}}@
 MOD_SEP=	S,:, ,g
 all:	modvar modvarloop modsysv emptyvar undefvar
 all:	mod-quote
 all:	mod-break-many-words
 # See also sysv.mk.
 modsysv:
 	@echo "The answer is ${libfoo.a:L:libfoo.a=42}"
 # Demonstrates modifiers that are given indirectly from a variable.
 modvar:
 	@echo "path='${path}'"
 	@echo "path='${path:${MOD_NODOT}}'"
 	@echo "path='${path:S,home,homes,:${MOD_NODOT}}'"
 	@echo "path=${path:${MOD_NODOTX}:ts:}"
 	@echo "path=${path:${MOD_HOMES}:${MOD_NODOTX}:ts:}"
 .for d in ${path:${MOD_SEP}:N.} /usr/xbin
 path_$d?=	${d:${MOD_OPT}:${MOD_HOMES}}/
 paths+=		${d:${MOD_OPT}:${MOD_HOMES}}
 .endfor
 modvarloop:
 	@echo "path_/usr/xbin=${path_/usr/xbin}"
 	@echo "paths=${paths}"
 	@echo "PATHS=${paths:tu}"
 # When a modifier is applied to the "" variable, the result is discarded.
 emptyvar:
 	@echo S:${:S,^$,empty,}
 	@echo C:${:C,^$,empty,}
 	@echo @:${:@var@${var}@}
 # The :U modifier turns even the "" variable into something that has a value.
-# The resulting variable is empty, but is still considered to contain a
+# The value of the resulting expression is empty, but is still considered to
-# single empty word. This word can be accessed by the :S and :C modifiers,
+# contain a single empty word. This word can be accessed by the :S and :C
-# but not by the :@ modifier since it explicitly skips empty words.
+# modifiers, but not by the :@ modifier since it explicitly skips empty words.
 undefvar:
 	@echo S:${:U:S,^$,empty,}
 	@echo C:${:U:C,^$,empty,}
 	@echo @:${:U:@var@empty@}
 mod-quote:
 	@echo $@: new${.newline:Q}${.newline:Q}line
 # Cover the bmake_realloc in brk_string.
 mod-break-many-words:
 	@echo $@: ${UNDEF:U:range=500:[#]}
 # To apply a modifier indirectly via another variable, the whole
-# modifier must be put into a single variable.
+# modifier must be put into a single variable expression.
 .if ${value:L:${:US}${:U,value,replacement,}} != "S,value,replacement,}"
 .  warning unexpected
 .endif
 # Adding another level of indirection (the 2 nested :U expressions) helps.
 .if ${value:L:${:U${:US}${:U,value,replacement,}}} != "replacement"
 .  warning unexpected
 .endif
 # Multiple indirect modifiers can be applied one after another as long as
 # they are separated with colons.
 .if ${value:L:${:US,a,A,}:${:US,e,E,}} != "vAluE"
 .  warning unexpected
 .endif
 # An indirect variable that evaluates to the empty string is allowed though.
 # This makes it possible to define conditional modifiers, like this:
+#
 # M.little-endian=	S,1234,4321,
 # M.big-endian=		# none
 .if ${value:L:${:Dempty}S,a,A,} != "vAlue"
 .  warning unexpected
 .endif

 @@ -1,28 +1,37 @@
-# $NetBSD: varmod-exclam-shell.mk,v 1.3 2020/10/24 08:46:08 rillig Exp $
+# $NetBSD: varmod-exclam-shell.mk,v 1.4 2020/11/03 18:42:33 rillig Exp $
+#
-# Tests for the :!cmd! variable modifier.
+# Tests for the :!cmd! variable modifier, which evaluates the modifier
 # argument, independent of the value or the name of the original variable.
 .if ${:!echo hello | tr 'l' 'l'!} != "hello"
-.  warning unexpected
+.  error
 .endif
 # The output is truncated at the first null byte.
 # Cmd_Exec returns only a string pointer without length information.
 # Truncating the output is not necessarily intended but may also be a side
 # effect from the implementation.  Having null bytes in the output of a
 # shell command is so unusual that it doesn't matter in practice.
 .if ${:!echo hello | tr 'l' '\0'!} != "he"
-.  warning unexpected
+.  error
 .endif
 # The newline at the end of the output is stripped.
 .if ${:!echo!} != ""
-.  warning A newline at the end of the output must be stripped.
+.  error
 .endif
 # Only the final newline of the output is stripped.  All other newlines are
 # converted to spaces.
 .if ${:!echo;echo!} != " "
-.  warning Only a single newline at the end of the output is stripped.
+.  error
 .endif
 # Each newline in the output is converted to a space, except for the newline
 # at the end of the output, which is stripped.
 .if ${:!echo;echo;echo;echo!} != "   "
-.  warning Other newlines in the output are converted to spaces.
+.  error
 .endif
 all:
 	@:;