 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.353 2020/07/28 17:18:40 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.354 2020/07/29 19:48:33 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * 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.
 @@ -59,34 +59,34 @@
  * 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.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.353 2020/07/28 17:18:40 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.354 2020/07/29 19:48:33 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.353 2020/07/28 17:18:40 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.354 2020/07/29 19:48:33 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * var.c --
  *	Variable-handling functions
+ *
  * Interface:
  *	Var_Set		    Set the value of a variable in the given
  *			    context. The variable is created if it doesn't
  *			    yet exist.
+ *
 @@ -2513,27 +2513,27 @@ ApplyModifier_Regex(const char *mod, App
 #endif
 static void
 ModifyWord_Copy(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
+{
     SepBuf_AddStr(buf, word);
+}
 /* :ts<separator> */
 static Boolean
 ApplyModifier_ToSep(const char *sep, ApplyModifiersState *st)
+{
     if (sep[0] != st->endc && (sep[1] == st->endc || sep[1] == ':')) {
-	/* ":ts<unrecognised><endc>" or ":ts<unrecognised>:" */
+	/* ":ts<any><endc>" or ":ts<any>:" */
 	st->sep = sep[0];
 	st->next = sep + 1;
     } else if (sep[0] == st->endc || sep[0] == ':') {
 	/* ":ts<endc>" or ":ts:" */
 	st->sep = '\0';		/* no separator */
 	st->next = sep;
     } else if (sep[0] == '\\') {
 	const char *xp = sep + 1;
 	int base = 8;		/* assume octal */
 	switch (sep[1]) {
 	case 'n':
 	    st->sep = '\n';

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.75 2020/07/28 22:44:44 rillig Exp $
+# $NetBSD: Makefile,v 1.76 2020/07/29 19:48:33 rillig Exp $
+#
 # Unit tests for make(1)
+#
 # The main targets are:
+#
 # all:
 #	run all the tests
 # test:
 #	run 'all', and compare to expected results
 # accept:
 #	move generated output to expected results
+#
 # Settable variables
 @@ -84,26 +84,27 @@ ENV.envfirst=		FROM_ENV=value-from-env
 ENV.export=		-i PATH=${PATH:Q}
 ENV.varmisc=		FROM_ENV=env
 ENV.varmisc+=		FROM_ENV_BEFORE=env
 ENV.varmisc+=		FROM_ENV_AFTER=env
 # Override make flags for some of the tests; default is -k.
 FLAGS.doterror=		# none
 FLAGS.envfirst=		-e
 FLAGS.export=		-r
 FLAGS.order=		-j1
 FLAGS.vardebug=		-k -dv FROM_CMDLINE=
 # Some tests need extra post-processing.
 SED_CMDS.moderrs+=	-e 's,\(substitution error:\).*,\1 (details omitted),'
 SED_CMDS.modmisc+=	-e 's,\(substitution error:\).*,\1 (details omitted),'
 SED_CMDS.varshell+=	-e 's,^[a-z]*sh: ,,'
 SED_CMDS.varshell+=	-e '/command/s,No such.*,not found,'
 # Some tests need an additional round of postprocessing.
 POSTPROC.vardebug=	${TOOL_SED} -n -e '/:RELEVANT = yes/,/:RELEVANT = no/p'
 # End of the configuration section.
 .MAIN: all
 UNIT_TESTS:=	${.PARSEDIR}
 .PATH: ${UNIT_TESTS}

 @@ -52,14 +52,86 @@ TheVariable
 make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier S
 : TheVariable
 make: Unclosed substitution for VAR (, missing)
 :
 make: Unclosed substitution for VAR (, missing)
 :
 make: Unclosed substitution for VAR (, missing)
 make: Unclosed substitution for VAR (, missing)
 make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier S
 TheVariable
 TheVariable
 mod-regex-delimiter:
 make: RE substitution error: (details omitted)
 make: Unclosed substitution for VAR (, missing)
 echo
 make: Unclosed substitution for VAR (, missing)
 make: Unclosed substitution for VAR (, missing)
 make: Unclosed substitution for VAR (, missing)
 make: Unclosed substitution for VAR (, missing)
 make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier C
 TheVariable
 TheVariable
 make: RE substitution error: (details omitted)
 :
 make: Unclosed substitution for VAR (, missing)
 :
 make: Unclosed substitution for VAR (, missing)
 :
 make: Unclosed substitution for VAR (, missing)
 make: Unclosed substitution for VAR (, missing)
 make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier C
 TheVariable
 TheVariable
 mod-ts-parse:
 112358132134
 15152535558513521534
 make: Bad modifier `:ts\65oct' for FIB
 oct}
 make: Bad modifier `:tsxy' for FIB
 xy}
 mod-t-parse:
 make: Bad modifier `:txy' for FIB
 y}
 make: Bad modifier `:t' for FIB
 make: Bad modifier `:t' for FIB
 M*}
 mod-ifelse-parse:
 make: Unclosed substitution for FIB (: missing)
 make: Unclosed substitution for FIB (: missing)
 make: Unclosed substitution for FIB (} missing)
 make: Unclosed substitution for FIB (} missing)
 then
 mod-assign-parse:
 make: Unknown modifier ':'
 make: Unclosed substitution for ASSIGN (} missing)
 mod-remember-parse:
 1 2 3 5 8 13 21 34
 make: Unknown modifier '_'
 mod-sysv-parse:
 make: Unknown modifier '3'
 make: Unclosed variable specification (expecting '}') for "FIB" (value "") modifier 3
 make: Unknown modifier '3'
 make: Unclosed variable specification (expecting '}') for "FIB" (value "") modifier 3
 make: Unknown modifier '3'
 make: Unclosed variable specification (expecting '}') for "FIB" (value "") modifier 3
 1 2 x3 5 8 1x3 21 34
 exit status 0

 @@ -1,28 +1,37 @@
-# $Id: moderrs.mk,v 1.6 2020/07/29 18:48:47 rillig Exp $
+# $Id: moderrs.mk,v 1.7 2020/07/29 19:48:33 rillig Exp $
+#
 # various modifier error tests
 VAR=TheVariable
 # incase we have to change it ;-)
 MOD_UNKN=Z
 MOD_TERM=S,V,v
 MOD_S:= ${MOD_TERM},
 FIB=	1 1 2 3 5 8 13 21 34
 all:	modunkn modunknV varterm vartermV modtermV modloop
 all:	modloop-close
 all:	modwords
 all:	modexclam
 all:	mod-subst-delimiter
 all:	mod-regex-delimiter
 all:	mod-ts-parse
 all:	mod-t-parse
 all:	mod-ifelse-parse
 all:	mod-assign-parse
 all:	mod-remember-parse
 all:	mod-sysv-parse
 modunkn:
 	@echo "Expect: Unknown modifier 'Z'"
 	@echo "VAR:Z=${VAR:Z}"
 modunknV:
 	@echo "Expect: Unknown modifier 'Z'"
 	@echo "VAR:${MOD_UNKN}=${VAR:${MOD_UNKN}}"
 varterm:
 	@echo "Expect: Unclosed variable specification for VAR"
 	@echo VAR:S,V,v,=${VAR:S,V,v,
 @@ -89,13 +98,72 @@ mod-subst-delimiter:
 	@echo ${VAR:S,
 	@echo ${VAR:S,from
 	@echo ${VAR:S,from,
 	@echo ${VAR:S,from,to
 	@echo ${VAR:S,from,to,
 	@echo ${VAR:S,from,to,}
 	@echo 1: ${VAR:S
 	@echo 2: ${VAR:S,
 	@echo 3: ${VAR:S,from
 	@echo ${VAR:S,from,
 	@echo ${VAR:S,from,to
 	@echo ${VAR:S,from,to,
 	@echo ${VAR:S,from,to,}
 # XXX: Where does the "echo" in the output of "${VAR:C" come from?
 mod-regex-delimiter:
 	@echo $@:
 	@echo ${VAR:C
 	@echo ${VAR:C,
 	@echo ${VAR:C,from
 	@echo ${VAR:C,from,
 	@echo ${VAR:C,from,to
 	@echo ${VAR:C,from,to,
 	@echo ${VAR:C,from,to,}
 	@echo 1: ${VAR:C
 	@echo 2: ${VAR:C,
 	@echo 3: ${VAR:C,from
 	@echo ${VAR:C,from,
 	@echo ${VAR:C,from,to
 	@echo ${VAR:C,from,to,
 	@echo ${VAR:C,from,to,}
 mod-ts-parse:
 	@echo $@:
 	@echo ${FIB:ts}
 	@echo ${FIB:ts\65}	# octal 065 == U+0035 == '5'
 	@echo ${FIB:ts\65oct}	# bad modifier
 	@echo ${FIB:tsxy}	# modifier too long
 mod-t-parse:
 	@echo $@:
 	@echo ${FIB:txy}
 	@echo ${FIB:t}
 	@echo ${FIB:t:M*}
 mod-ifelse-parse:
 	@echo $@:
 	@echo ${FIB:?
 	@echo ${FIB:?then
 	@echo ${FIB:?then:
 	@echo ${FIB:?then:else
 	@echo ${FIB:?then:else}
 mod-assign-parse:
 	@echo $@:
 	@echo ${ASSIGN::x}	# 'x' is an unknown assignment operator
 # disabled for now; segfaults on NetBSD-8.0-x86_64 in Var_Parse line 3636:
 # *lengthPtr = tstr - str + (*tstr ? 1 : 0);
 #	@echo ${::=value}	# trying to set the empty variable
 	@echo ${ASSIGN::=value	# missing closing brace
 mod-remember-parse:
 	@echo $@:
 	@echo ${FIB:_}		# ok
 	@echo ${FIB:__}		# modifier name too long
 mod-sysv-parse:
 	@echo $@:
 	@echo ${FIB:3
 	@echo ${FIB:3=
 	@echo ${FIB:3=x3
 	@echo ${FIB:3=x3}	# ok