 @@ -1,14 +1,14 @@
-/*	$NetBSD: cond.c,v 1.257 2021/02/22 23:21:33 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.258 2021/03/15 11:41:07 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 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.
 @@ -85,27 +85,27 @@
  *	Cond_restore_depth
  *			Save and restore the nesting of the conditions, at
  *			the start and end of including another makefile, to
  *			ensure that in each makefile the conditional
  *			directives are well-balanced.
  */
 #include <errno.h>
 #include "make.h"
 #include "dir.h"
 /*	"@(#)cond.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: cond.c,v 1.257 2021/02/22 23:21:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.258 2021/03/15 11:41:07 rillig Exp $");
 /*
  * The parsing of conditional expressions is based on this grammar:
  *	Or -> And '||' Or
  *	Or -> And
  *	And -> Term '&&' And
  *	And -> Term
  *	Term -> Function '(' Argument ')'
  *	Term -> Leaf Operator Leaf
  *	Term -> Leaf
  *	Term -> '(' Or ')'
  *	Term -> '!' Term
  *	Leaf -> "string"
 @@ -256,27 +256,27 @@ ParseFuncArg(CondParser *par, const char
 		if ((ch == '&' || ch == '|') && paren_depth == 0)
 			break;
 		if (*p == '$') {
 			/*
 			 * Parse the variable expression and install it as
 			 * part of the argument if it's valid. We tell
 			 * Var_Parse to complain on an undefined variable,
 			 * (XXX: but Var_Parse ignores that request)
 			 * so we don't need to do it. Nor do we return an
 			 * error, though perhaps we should.
 			 */
 			VarEvalFlags eflags = doEval
 			    ? VARE_WANTRES | VARE_UNDEFERR
-			    : VARE_NONE;
+			    : VARE_PARSE_ONLY;
 			FStr nestedVal;
 			(void)Var_Parse(&p, SCOPE_CMDLINE, eflags, &nestedVal);
 			/* TODO: handle errors */
 			Buf_AddStr(&argBuf, nestedVal.str);
 			FStr_Done(&nestedVal);
 			continue;
+		}
 		if (ch == '(')
 			paren_depth++;
 		else if (ch == ')' && --paren_depth < 0)
 			break;
 		Buf_AddByte(&argBuf, *p);
 		p++;
 @@ -412,27 +412,27 @@ is_separator(char ch)
 static Boolean
 CondParser_StringExpr(CondParser *par, const char *start,
 		      Boolean const doEval, Boolean const quoted,
 		      Buffer *buf, FStr *const inout_str)
+{
 	VarEvalFlags eflags;
 	const char *nested_p;
 	Boolean atStart;
 	VarParseResult parseResult;
 	/* if we are in quotes, an undefined variable is ok */
 	eflags = doEval && !quoted ? VARE_WANTRES | VARE_UNDEFERR
 	    : doEval ? VARE_WANTRES
-	    : VARE_NONE;
+	    : VARE_PARSE_ONLY;
 	nested_p = par->p;
 	atStart = nested_p == start;
 	parseResult = Var_Parse(&nested_p, SCOPE_CMDLINE, eflags, inout_str);
 	/* TODO: handle errors */
 	if (inout_str->str == var_Error) {
 		if (parseResult == VPR_ERR) {
 			/*
 			 * FIXME: Even if an error occurs, there is no
 			 *  guarantee that it is reported.
+			 *
 			 * See cond-token-plain.mk $$$$$$$$.
 			 */
 @@ -730,28 +730,28 @@ done_lhs:
 /*ARGSUSED*/
 static size_t
 ParseEmptyArg(CondParser *par MAKE_ATTR_UNUSED, const char **pp,
 	      Boolean doEval, const char *func MAKE_ATTR_UNUSED,
 	      char **out_arg)
+{
 	FStr val;
 	size_t magic_res;
 	/* We do all the work here and return the result as the length */
 	*out_arg = NULL;
 	(*pp)--;		/* Make (*pp)[1] point to the '('. */
-	(void)Var_Parse(pp, SCOPE_CMDLINE, doEval ? VARE_WANTRES : VARE_NONE,
+	(void)Var_Parse(pp, SCOPE_CMDLINE,
-	    &val);
+	    doEval ? VARE_WANTRES : VARE_PARSE_ONLY, &val);
 	/* TODO: handle errors */
 	/* If successful, *pp points beyond the closing ')' now. */
 	if (val.str == var_Error) {
 		FStr_Done(&val);
 		return (size_t)-1;
+	}
 	/*
 	 * A variable is empty when it just contains spaces...
 	 * 4/15/92, christos
 	 */
 	cpp_skip_whitespace(&val.str);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nonints.h,v 1.203 2021/02/14 21:32:58 rillig Exp $	*/
+/*	$NetBSD: nonints.h,v 1.204 2021/03/15 11:41:07 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.
 @@ -283,27 +283,27 @@ void Targ_PrintCmds(GNode *);
 void Targ_PrintNode(GNode *, int);
 void Targ_PrintNodes(GNodeList *, int);
 const char *Targ_FmtTime(time_t);
 void Targ_PrintType(int);
 void Targ_PrintGraph(int);
 void Targ_Propagate(void);
 const char *GNodeMade_Name(GNodeMade);
 /* var.c */
 void Var_Init(void);
 void Var_End(void);
 typedef enum VarEvalFlags {
-	VARE_NONE		= 0,
+	VARE_PARSE_ONLY		= 0,
 	/*
 	 * Expand and evaluate variables during parsing.
+	 *
 	 * TODO: Document what Var_Parse and Var_Subst return when this flag
 	 * is not set.
 	 */
 	VARE_WANTRES		= 1 << 0,
 	/*
 	 * Treat undefined variables as errors.
 	 * Must only be used in combination with VARE_WANTRES.
 	 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.550 2021/02/22 23:21:33 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.551 2021/03/15 11:41:07 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.
 @@ -99,27 +99,27 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.550 2021/02/22 23:21:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.551 2021/03/15 11:41:07 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
 	char *fname;		/* name of file (relative? absolute?) */
 	Boolean fromForLoop;	/* simulated .include by the .for loop */
 	int lineno;		/* current line number in file */
 	int first_lineno;	/* line number of start of text */
 	unsigned int cond_depth; /* 'if' nesting when file opened */
 	Boolean depending;	/* state of doing_depend on EOF */
 @@ -1032,28 +1032,28 @@ ParseDependencyTargetWord(const char **p
 		if (*cp == '$') {
 			/*
 			 * Must be a dynamic source (would have been expanded
 			 * otherwise), so call the Var module to parse the
 			 * puppy so we can safely advance beyond it.
+			 *
 			 * There should be no errors in this, as they would
 			 * have been discovered in the initial Var_Subst and
 			 * we wouldn't be here.
 			 */
 			const char *nested_p = cp;
 			FStr nested_val;
-			(void)Var_Parse(&nested_p, SCOPE_CMDLINE, VARE_NONE,
+			(void)Var_Parse(&nested_p, SCOPE_CMDLINE,
-			    &nested_val);
+			    VARE_PARSE_ONLY, &nested_val);
 			/* TODO: handle errors */
 			FStr_Done(&nested_val);
 			cp += nested_p - cp;
 		} else
 			cp++;
+	}
 	*pp = cp;
+}
 /* Handle special targets like .PATH, .DEFAULT, .BEGIN, .ORDER. */
 static void
 ParseDoDependencyTargetSpecial(ParseSpecial *inout_specType,
 @@ -1864,27 +1864,27 @@ Parse_IsVar(const char *p, VarAssign *ou
 	return FALSE;
+}
 /*
  * Check for syntax errors such as unclosed expressions or unknown modifiers.
  */
 static void
 VarCheckSyntax(VarAssignOp type, const char *uvalue, GNode *scope)
+{
 	if (opts.strict) {
 		if (type != VAR_SUBST && strchr(uvalue, '$') != NULL) {
 			char *expandedValue;
-			(void)Var_Subst(uvalue, scope, VARE_NONE,
+			(void)Var_Subst(uvalue, scope, VARE_PARSE_ONLY,
 			    &expandedValue);
 			/* TODO: handle errors */
 			free(expandedValue);
+		}
+	}
+}
 static void
 VarAssign_EvalSubst(GNode *scope, const char *name, const char *uvalue,
 		    FStr *out_avalue)
+{
 	char *evalue;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.346 2021/02/23 15:56:29 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.347 2021/03/15 11:41:07 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.
 @@ -104,27 +104,27 @@
  *	Suff_FindDeps	Find implicit sources for and the location of
  *			a target based on its suffix. Returns the
  *			bottom-most node added to the graph or NULL
  *			if the target had no implicit sources.
+ *
  *	Suff_FindPath	Return the appropriate path to search in order to
  *			find the node.
  */
 #include "make.h"
 #include "dir.h"
 /*	"@(#)suff.c	8.4 (Berkeley) 3/21/94"	*/
-MAKE_RCSID("$NetBSD: suff.c,v 1.346 2021/02/23 15:56:29 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.347 2021/03/15 11:41:07 rillig Exp $");
 typedef List SuffixList;
 typedef ListNode SuffixListNode;
 typedef List CandidateList;
 typedef ListNode CandidateListNode;
 /* The defined suffixes, such as '.c', '.o', '.l'. */
 static SuffixList sufflist = LST_INIT;
 #ifdef CLEANUP
 /* The suffixes to be cleaned up at the end. */
 static SuffixList suffClean = LST_INIT;
 #endif
 @@ -1299,27 +1299,27 @@ ExpandChildrenRegular(char *cp, GNode *p
 			 * add it, skip any further spaces.
 			 */
 			*cp++ = '\0';
 			gn = Targ_GetNode(start);
 			Lst_Append(members, gn);
 			pp_skip_hspace(&cp);
 			/* Continue at the next non-space. */
 			start = cp;
 		} else if (*cp == '$') {
 			/* Skip over the variable expression. */
 			const char *nested_p = cp;
 			FStr junk;
-			(void)Var_Parse(&nested_p, pgn, VARE_NONE, &junk);
+			(void)Var_Parse(&nested_p, pgn, VARE_PARSE_ONLY, &junk);
 			/* TODO: handle errors */
 			if (junk.str == var_Error) {
 				Parse_Error(PARSE_FATAL,
 				    "Malformed variable expression at \"%s\"",
 				    cp);
 				cp++;
 			} else {
 				cp += nested_p - cp;
+			}
 			FStr_Done(&junk);
 		} else if (cp[0] == '\\' && cp[1] != '\0') {
 			/* Escaped something -- skip over it. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.883 2021/03/14 20:23:29 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.884 2021/03/15 11:41:07 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.
 @@ -130,27 +130,27 @@
 #include <regex.h>
 #endif
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.883 2021/03/14 20:23:29 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.884 2021/03/15 11:41:07 rillig Exp $");
 typedef enum VarFlags {
 	VFL_NONE	= 0,
 	/*
 	 * The variable's value is currently being used by Var_Parse or
 	 * Var_Subst.  This marker is used to avoid endless recursion.
 	 */
 	VFL_IN_USE	= 1 << 0,
 	/*
 	 * The variable comes from the environment.
 	 * These variables are not registered in any GNode, therefore they
 @@ -2398,38 +2398,38 @@ done:
 /* :@var@...${var}...@ */
 static ApplyModifierResult
 ApplyModifier_Loop(const char **pp, ApplyModifiersState *st)
+{
 	Expr *expr = st->expr;
 	struct ModifyWord_LoopArgs args;
 	char prev_sep;
 	VarParseResult res;
 	args.scope = expr->scope;
 	(*pp)++;		/* Skip the first '@' */
-	res = ParseModifierPart(pp, '@', VARE_NONE, st, &args.tvar);
+	res = ParseModifierPart(pp, '@', VARE_PARSE_ONLY, st, &args.tvar);
 	if (res != VPR_OK)
 		return AMR_CLEANUP;
 	if (opts.strict && strchr(args.tvar, '$') != NULL) {
 		Parse_Error(PARSE_FATAL,
 		    "In the :@ modifier of \"%s\", the variable name \"%s\" "
 		    "must not contain a dollar.",
 		    expr->var->name.str, args.tvar);
 		return AMR_CLEANUP;
+	}
-	res = ParseModifierPart(pp, '@', VARE_NONE, st, &args.str);
+	res = ParseModifierPart(pp, '@', VARE_PARSE_ONLY, st, &args.str);
 	if (res != VPR_OK)
 		return AMR_CLEANUP;
 	if (!(expr->eflags & VARE_WANTRES))
 		goto done;
 	args.eflags = expr->eflags & ~(unsigned)VARE_KEEP_DOLLAR;
 	prev_sep = st->sep;
 	st->sep = ' ';		/* XXX: should be st->sep for consistency */
 	ModifyWords(st, ModifyWord_Loop, &args, st->oneBigWord);
 	st->sep = prev_sep;
 	/* XXX: Consider restoring the previous variable instead of deleting. */
 	/*
 @@ -2442,27 +2442,27 @@ done:
 	free(args.tvar);
 	free(args.str);
 	return AMR_OK;
+}
 /* :Ddefined or :Uundefined */
 static ApplyModifierResult
 ApplyModifier_Defined(const char **pp, ApplyModifiersState *st)
+{
 	Expr *expr = st->expr;
 	Buffer buf;
 	const char *p;
-	VarEvalFlags eflags = VARE_NONE;
+	VarEvalFlags eflags = VARE_PARSE_ONLY;
 	if (expr->eflags & VARE_WANTRES)
 		if ((**pp == 'D') == (expr->defined == DEF_REGULAR))
 			eflags = expr->eflags;
 	Buf_Init(&buf);
 	p = *pp + 1;
 	while (!IsDelimiter(*p, st) && *p != '\0') {
 		/* XXX: This code is similar to the one in Var_Parse.
 		 * See if the code can be merged.
 		 * See also ApplyModifier_Match and ParseModifierPart. */
 		/* Escaped delimiter or other special character */
 @@ -3282,28 +3282,28 @@ ApplyModifier_Order(const char **pp, App
 	return AMR_OK;
+}
 /* :? then : else */
 static ApplyModifierResult
 ApplyModifier_IfElse(const char **pp, ApplyModifiersState *st)
+{
 	Expr *expr = st->expr;
 	char *then_expr, *else_expr;
 	VarParseResult res;
 	Boolean value = FALSE;
-	VarEvalFlags then_eflags = VARE_NONE;
+	VarEvalFlags then_eflags = VARE_PARSE_ONLY;
-	VarEvalFlags else_eflags = VARE_NONE;
+	VarEvalFlags else_eflags = VARE_PARSE_ONLY;
 	int cond_rc = COND_PARSE;	/* anything other than COND_INVALID */
 	if (expr->eflags & VARE_WANTRES) {
 		cond_rc = Cond_EvalCondition(expr->var->name.str, &value);
 		if (cond_rc != COND_INVALID && value)
 			then_eflags = expr->eflags;
 		if (cond_rc != COND_INVALID && !value)
 			else_eflags = expr->eflags;
+	}
 	(*pp)++;			/* skip past the '?' */
 	res = ParseModifierPart(pp, ':', then_eflags, st, &then_expr);
 	if (res != VPR_OK)