 @@ -1,14 +1,14 @@
-/*	$NetBSD: nonints.h,v 1.82 2020/07/20 19:53:40 rillig Exp $	*/
+/*	$NetBSD: nonints.h,v 1.83 2020/07/26 18:11:12 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.
 @@ -171,32 +171,29 @@ void Targ_SetMain(GNode *);
 int Targ_PrintCmd(void *, void *);
 int Targ_PrintNode(void *, void *);
 char *Targ_FmtTime(time_t);
 void Targ_PrintType(int);
 void Targ_PrintGraph(int);
 void Targ_Propagate(void);
 void Targ_Propagate_Wait(void);
 /* var.c */
 typedef enum {
     /* Treat undefined variables as errors. */
     VARE_UNDEFERR	= 0x01,
-    /* Actually evaluate the text, fully expanding variables.
+    /* Expand and evaluate variables during parsing. */
      * Without this flag, the text is only parsed but not evaluated. */
     VARE_WANTRES	= 0x02,
-    VARE_ASSIGN		= 0x04,
+    VARE_ASSIGN		= 0x04
     /* Return the literal text, without expanding variables. */
     VARE_NOSUBST	= 0x08
 } VarEvalFlags;
 void Var_Delete(const char *, GNode *);
 void Var_Set(const char *, const char *, GNode *);
 void Var_Append(const char *, const char *, GNode *);
 Boolean Var_Exists(const char *, GNode *);
 char *Var_Value(const char *, GNode *, char **);
 char *Var_Parse(const char *, GNode *, VarEvalFlags, int *, void **);
 char *Var_Subst(const char *, const char *, GNode *, VarEvalFlags);
 char *Var_GetTail(const char *);
 char *Var_GetHead(const char *);
 void Var_Init(void);
 void Var_End(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.322 2020/07/26 17:44:54 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.323 2020/07/26 18:11:12 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.322 2020/07/26 17:44:54 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.323 2020/07/26 18:11:12 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.322 2020/07/26 17:44:54 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.323 2020/07/26 18:11:12 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.
+ *
 @@ -1824,27 +1824,27 @@ ParseModifierPart(GNode *ctxt, const cha
     for (cp = *tstr; *cp != '\0' && *cp != delim; cp++) {
 	Boolean is_escaped = cp[0] == '\\' && (cp[1] == delim ||
 	    cp[1] == '\\' || cp[1] == '$' || (subst != NULL && cp[1] == '&'));
 	if (is_escaped) {
 	    Buf_AddByte(&buf, cp[1]);
 	    cp++;
 	} else if (*cp == '$') {
 	    if (cp[1] == delim) {	/* Unescaped $ at end of pattern */
 		if (out_pflags != NULL)
 		    *out_pflags |= VARP_ANCHOR_END;
 		else
 		    Buf_AddByte(&buf, *cp);
 	    } else {
-		if (!(eflags & VARE_NOSUBST)) {
+		if (eflags & VARE_WANTRES) {
 		    char   *cp2;
 		    int     len;
 		    void   *freeIt;
 		    /*
 		     * If unescaped dollar sign not before the
 		     * delimiter, assume it's a variable
 		     * substitution and recurse.
 		     */
 		    cp2 = Var_Parse(cp, ctxt, errnum | (eflags & VARE_WANTRES),
 				    &len, &freeIt);
 		    Buf_AddStr(&buf, cp2);
 		    free(freeIt);
 @@ -2065,35 +2065,35 @@ typedef struct {
     (strncmp(s, want, n) == 0 && \
      (s[n] == st->endc || s[n] == ':' || s[n] == '='))
 #define CHARMOD_MATCH(c) (c == st->endc || c == ':')
 /* :@var@...${var}...@ */
 static Boolean
 ApplyModifier_Loop(const char *mod, ApplyModifiersState *st) {
     ModifyWord_LoopArgs args;
     args.ctx = st->ctxt;
     st->cp = mod + 1;
     char delim = '@';
     args.tvar = ParseModifierPart(st->ctxt, &st->cp, delim,
-				  st->eflags | VARE_NOSUBST,
+				  st->eflags & ~VARE_WANTRES,
 				  NULL, NULL, NULL);
     if (args.tvar == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
     args.str = ParseModifierPart(st->ctxt, &st->cp, delim,
-				 st->eflags | VARE_NOSUBST,
+				 st->eflags & ~VARE_WANTRES,
 				 NULL, NULL, NULL);
     if (args.str == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
     st->termc = *st->cp;
     args.eflags = st->eflags & (VARE_UNDEFERR | VARE_WANTRES);
     int prev_sep = st->sep;
     st->sep = ' ';		/* XXX: this is inconsistent */
     st->newStr = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->nstr,
 			     ModifyWord_Loop, &args);
 @@ -2847,29 +2847,28 @@ ApplyModifier_Assign(const char *mod, Ap
     switch (op[0]) {
     case '+':
     case '?':
     case '!':
 	st->cp = mod + 3;
 	break;
     default:
 	st->cp = mod + 2;
 	break;
+    }
     char delim = st->startc == PROPEN ? PRCLOSE : BRCLOSE;
     VarEvalFlags eflags = (st->eflags & VARE_WANTRES) ? 0 : VARE_NOSUBST;
     char *val = ParseModifierPart(st->ctxt, &st->cp, delim,
-				  st->eflags | eflags, NULL, NULL, NULL);
+				  st->eflags, NULL, NULL, NULL);
     if (st->v->flags & VAR_JUNK) {
 	/* restore original name */
 	free(st->v->name);
 	st->v->name = sv_name;
+    }
     if (val == NULL) {
 	st->missing_delim = delim;
 	return 'c';
+    }
     st->termc = *--st->cp;
     if (st->eflags & VARE_WANTRES) {