 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.382 2020/08/01 16:27:03 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.383 2020/08/01 17:29:00 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.382 2020/08/01 16:27:03 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.383 2020/08/01 17:29:00 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.382 2020/08/01 16:27:03 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.383 2020/08/01 17:29:00 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.
+ *
 @@ -2998,47 +2998,47 @@ ApplyModifier_SysV(const char *mod, Appl
  *			space-separated words.
  *			(Mnemonic: many small 'w'ords.)
  *	  :[index]	Select a single word from the value.
  *	  :[start..end]	Select multiple words from the value.
  *	  :[*] or :[0]	Select the entire value, as a single
  *			word.  Equivalent to :tW.
  *	  :[@]		Select the entire value, as multiple
  *			words.	Undoes the effect of :[*].
  *			Equivalent to :tw.
  *	  :[#]		Returns the number of words in the value.
+ *
  *	  :?<true-value>:<false-value>
  *			If the variable evaluates to true, return
- *			true value, else return the second value.
+ *			true-value, else return false-value.
- *    	  :lhs=rhs  	Like :S, but the rhs goes to the end of
+ *    	  :lhs=rhs  	Similar to :S, but the rhs goes to the end of
- *    			the invocation.
+ *    			the invocation, including any ':'.
  *	  :sh		Treat the current value as a command
  *			to be run, new value is its output.
  * The following added so we can handle ODE makefiles.
  *	  :@<tmpvar>@<newval>@
- *			Assign a temporary local variable <tmpvar>
+ *			Assign a temporary global variable <tmpvar>
  *			to the current value of each word in turn
  *			and replace each word with the result of
  *			evaluating <newval>
  *	  :D<newval>	Use <newval> as value if variable defined
  *	  :U<newval>	Use <newval> as value if variable undefined
  *	  :L		Use the name of the variable as the value.
  *	  :P		Use the path of the node that has the same
  *			name as the variable as the value.  This
  *			basically includes an implied :L so that
  *			the common method of refering to the path
  *			of your dependent 'x' in a rule is to use
  *			the form '${x:P}'.
- *	  :!<cmd>!	Run cmd much the same as :sh run's the
+ *	  :!<cmd>!	Run cmd much the same as :sh runs the
  *			current value of the variable.
  * Assignment operators (see ApplyModifier_Assign).
  */
 static char *
 ApplyModifiers(
     const char **pp,		/* the parsing position, updated upon return */
     char *val,			/* the current value of the variable */
     int const startc,		/* '(' or '{' or '\0' */
     int const endc,		/* ')' or '}' or '\0' */
     Var * const v,		/* the variable may have its flags changed */
     GNode * const ctxt,		/* for looking up and modifying variables */
     VarEvalFlags const eflags,
     void ** const freePtr	/* free this after using the return value */
 @@ -3100,27 +3100,27 @@ ApplyModifiers(
 		Error("Unclosed variable specification after complex "
 		    "modifier (expecting '%c') for %s", st.endc, st.v->name);
 		goto out;
+	    }
 	    continue;
+	}
     apply_mods:
 	if (DEBUG(VAR)) {
 	    fprintf(debug_file, "Applying[%s] :%c to \"%s\"\n", st.v->name,
 		*p, st.val);
+	}
 	st.newVal = var_Error;		/* default value, in case of errors */
 	st.next = NULL; /* fail fast if an ApplyModifier forgets to set this */
-	ApplyModifierResult res = 0;
+	ApplyModifierResult res = AMR_BAD;	/* just a safe fallback */
 	char modifier = *p;
 	switch (modifier) {
 	case ':':
 	    res = ApplyModifier_Assign(p, &st);
 	    break;
 	case '@':
 	    res = ApplyModifier_Loop(p, &st);
 	    break;
 	case '_':
 	    res = ApplyModifier_Remember(p, &st);
 	    break;
 	case 'D':
 	case 'U':