 @@ -1,14 +1,14 @@
-.\"	$NetBSD: make.1,v 1.288 2020/08/22 19:30:58 sjg Exp $
+.\"	$NetBSD: make.1,v 1.289 2020/08/28 17:15:04 rillig Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -19,27 +19,27 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd August 22, 2020
+.Dd August 28, 2020
 .Dt MAKE 1
 .Os
 .Sh NAME
 .Nm make
 .Nd maintain program dependencies
 .Sh SYNOPSIS
 .Nm
 .Op Fl BeikNnqrstWwX
 .Op Fl C Ar directory
 .Op Fl D Ar variable
 .Op Fl d Ar flags
 .Op Fl f Ar makefile
 .Op Fl I Ar directory
 @@ -1300,35 +1300,35 @@ See also
 Causes the value to be treated as a sequence of
 words delimited by white space.
 See also
 .Ql Cm \&:[@] .
 .Sm off
 .It Cm \&:S No \&/ Ar old_string No \&/ Ar new_string No \&/ Op Cm 1gW
 .Sm on
 Modifies the first occurrence of
 .Ar old_string
 in each word of the variable's value, replacing it with
 .Ar new_string .
 If a
 .Ql g
-is appended to the last slash of the pattern, all occurrences
+is appended to the last delimiter of the pattern, all occurrences
 in each word are replaced.
 If a
 .Ql 1
-is appended to the last slash of the pattern, only the first occurrence
+is appended to the last delimiter of the pattern, only the first occurrence
 is affected.
 If a
 .Ql W
-is appended to the last slash of the pattern,
+is appended to the last delimiter of the pattern,
 then the value is treated as a single word
 (possibly containing embedded white space).
 If
 .Ar old_string
 begins with a caret
 .Pq Ql ^ ,
 .Ar old_string
 is anchored at the beginning of each word.
 If
 .Ar old_string
 ends with a dollar sign
 .Pq Ql \&$ ,
 it is anchored at the end of each word.
 @@ -1377,33 +1377,26 @@ Normally, the first occurrence of the pa
 in each word of the value is substituted with
 .Ar replacement .
 The
 .Ql 1
 modifier causes the substitution to apply to at most one word; the
 .Ql g
 modifier causes the substitution to apply to as many instances of the
 search pattern
 .Ar pattern
 as occur in the word or words it is found in; the
 .Ql W
 modifier causes the value to be treated as a single word
 (possibly containing embedded white space).
 Note that
 .Ql 1
 and
 .Ql g
 are orthogonal; the former specifies whether multiple words are
 potentially affected, the latter whether multiple substitutions can
 potentially occur within each affected word.
 .Pp
 As for the
 .Cm \&:S
 modifier, the
 .Ar pattern
 and
 .Ar replacement
 are subjected to variable expansion before being parsed as
 regular expressions.
 .It Cm \&:T
 Replaces each word in the variable with its last path component.
 .It Cm \&:u
 Removes adjacent duplicate words (like

 @@ -1,30 +1,87 @@
-# $NetBSD: varmod-subst-regex.mk,v 1.2 2020/08/16 12:30:45 rillig Exp $
+# $NetBSD: varmod-subst-regex.mk,v 1.3 2020/08/28 17:15:04 rillig Exp $
+#
 # Tests for the :C,from,to, variable modifier.
-all: mod-regex
+all: mod-regex-compile-error
 all: mod-regex-limits
 all: mod-regex-errors
-mod-regex:
+# The variable expression expands to 4 words.  Of these words, none matches
-	@echo $@:
+# the regular expression "a b" since these words don't contain any
-	@echo :${:Ua b b c:C,a b,,:Q}:
+# whitespace.
-	@echo :${:Ua b b c:C,a b,,1:Q}:
+.if ${:Ua b b c:C,a b,,} != "a b b c"
-	@echo :${:Ua b b c:C,a b,,W:Q}:
+.error
-	@echo :${:Uword1 word2:C,****,____,g:C,word,____,:Q}:
+.endif
 	@echo :${:Ua b b c:C,b,,g:Q}:
 	@echo :${:U1 2 3 1 2 3:C,1 2,___,Wg:C,_,x,:Q}:
 # Using the '1' modifier does not change anything.  The '1' modifier just
 # means to apply at most 1 replacement in the whole variable expression.
 .if ${:Ua b b c:C,a b,,1} != "a b b c"
 .error
 .endif
 # The 'W' modifier treats the whole variable value as a single big word,
 # containing whitespace.  This big word matches the regular expression,
 # therefore it gets replaced.  Whitespace is preserved after replacing.
 .if ${:Ua b b c:C,a b,,W} != " b c"
 .error
 .endif
 # The 'g' modifier does not have any effect here since each of the words
 # contains the character 'b' a single time.
 .if ${:Ua b b c:C,b,,g} != "a c"
 .error
 .endif
 # The first :C modifier has the 'W' modifier, which makes the whole
 # expression a single word.  The 'g' modifier then replaces all occurrences
 # of "1 2" with "___".  The 'W' modifier only applies to this single :C
 # modifier.  This is demonstrated by the :C modifier that follows.  If the
 # 'W' modifier would be preserved, only a single underscore would have been
 # replaced with an 'x'.
 .if ${:U1 2 3 1 2 3:C,1 2,___,Wg:C,_,x,} != "x__ 3 x__ 3"
 .error
 .endif
 # The regular expression does not match in the first word.
 # It matches once in the second word, and the \0\0 doubles that word.
 # In the third word, the regular expression matches as early as possible,
 # and since the matches must not overlap, the next possible match would
 # start at the 6, but at that point, there is only one character left,
 # and that cannot match the regular expression "..".  Therefore only the
 # "45" is doubled in the result.
 .if ${:U1 23 456:C,..,\0\0,} != "1 2323 45456"
 .error
 .endif
 # The modifier '1' applies the replacement at most once, across the whole
 # variable value, no matter whether it is a single big word or many small
 # words.
+#
 # Up to 2020-08-28, the manual page said that the modifiers '1' and 'g'
 # were orthogonal, which was wrong.
 .if ${:U12345 12345:C,.,\0\0,1} != "112345 12345"
 .error
 .endif
 # Multiple asterisks form an invalid regular expression.  This produces an
 # error message and (as of 2020-08-28) stops parsing in the middle of the
 # variable expression.  The unparsed part of the expression is then copied
 # verbatim to the output, which is unexpected and can lead to strange shell
 # commands being run.
 mod-regex-compile-error:
 	@echo $@: ${:Uword1 word2:C,****,____,g:C,word,____,:Q}.
 # These tests generate error messages but as of 2020-08-28 just continue
 # parsing and execution as if nothing bad had happened.
 mod-regex-limits:
 	@echo $@:00-ok:${:U1 23 456:C,..,\0\0,:Q}
 	@echo $@:11-missing:${:U1 23 456:C,..,\1\1,:Q}
 	@echo $@:11-ok:${:U1 23 456:C,(.).,\1\1,:Q}
 	@echo $@:22-missing:${:U1 23 456:C,..,\2\2,:Q}
 	@echo $@:22-missing:${:U1 23 456:C,(.).,\2\2,:Q}
 	@echo $@:22-ok:${:U1 23 456:C,(.)(.),\2\2,:Q}
 	# The :C modifier only handles single-digit capturing groups,
 	# 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-regex-errors:
 	@echo $@: ${UNDEF:Uvalue:C,[,,}

 @@ -1,22 +1,15 @@
 mod-regex:
 :a b b c:
 :a b b c:
 : b c:
 make: Regex compilation error: (details omitted)
-:C,word,____,:Q}:
+mod-regex-compile-error: C,word,____,:Q}.
 :a c:
 :x__ 3 x__ 3:
 mod-regex-limits:00-ok:1 2323 45456
 make: No subexpression \1
 make: No subexpression \1
 make: No subexpression \1
 make: No subexpression \1
 mod-regex-limits:11-missing:1 6
 mod-regex-limits:11-ok:1 22 446
 make: No subexpression \2
 make: No subexpression \2
 make: No subexpression \2
 make: No subexpression \2
 mod-regex-limits:22-missing:1 6
 make: No subexpression \2
 make: No subexpression \2