 @@ -1,14 +1,14 @@
-/*	$NetBSD: for.c,v 1.156 2022/01/07 20:09:58 rillig Exp $	*/
+/*	$NetBSD: for.c,v 1.157 2022/01/07 20:15:10 rillig Exp $	*/
 /*
  * Copyright (c) 1992, 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.
 @@ -48,63 +48,62 @@
  * body is scanned for variable expressions, and those that match the
  * variable names are replaced with expressions of the form ${:U...}.  After
  * that, the body is treated like a file from an .include directive.
+ *
  * Interface:
  *	For_Eval	Evaluate the loop in the passed line.
+ *
  *	For_Run		Run accumulated loop
  */
 #include "make.h"
 /*	"@(#)for.c	8.1 (Berkeley) 6/6/93"	*/
-MAKE_RCSID("$NetBSD: for.c,v 1.156 2022/01/07 20:09:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.157 2022/01/07 20:15:10 rillig Exp $");
 typedef struct ForLoop {
 	Buffer body;		/* Unexpanded body of the loop */
 	Vector /* of 'char *' */ vars; /* Iteration variables */
 	SubstringWords items;	/* Substitution items */
 	Buffer body;		/* Unexpanded body of the loop */
 	unsigned int nextItem;	/* Where to continue iterating */
 } ForLoop;
 static ForLoop *accumFor;	/* Loop being accumulated */
 static ForLoop *
 ForLoop_New(void)
+{
 	ForLoop *f = bmake_malloc(sizeof *f);
 	Buf_Init(&f->body);
 	Vector_Init(&f->vars, sizeof(char *));
 	SubstringWords_Init(&f->items);
 	Buf_Init(&f->body);
 	f->nextItem = 0;
 	return f;
+}
 static void
 ForLoop_Free(ForLoop *f)
+{
 	Buf_Done(&f->body);
 	while (f->vars.len > 0)
 		free(*(char **)Vector_Pop(&f->vars));
 	Vector_Done(&f->vars);
 	SubstringWords_Free(f->items);
 	Buf_Done(&f->body);
 	free(f);
+}
 static bool
 ForLoop_ParseVarnames(ForLoop *f, const char **pp)
+{
 	const char *p = *pp;
 	for (;;) {
 		size_t len;
 		cpp_skip_whitespace(&p);
 @@ -146,27 +145,27 @@ ForLoop_ParseItems(ForLoop *f, const cha
 	cpp_skip_whitespace(&p);
 	if (Var_Subst(p, SCOPE_GLOBAL, VARE_WANTRES, &items) != VPR_OK) {
 		Parse_Error(PARSE_FATAL, "Error in .for loop items");
 		return false;
+	}
 	f->items = Substring_Words(items, false);
 	free(items);
 	if (f->items.len == 1 && Substring_IsEmpty(f->items.words[0]))
 		f->items.len = 0;	/* .for var in ${:U} */
-	if (f->items.len != 0 && f->items.len % f->vars.len != 0) {
+	if (f->items.len % f->vars.len != 0) {
 		Parse_Error(PARSE_FATAL,
 		    "Wrong number of words (%u) in .for "
 		    "substitution list with %u variables",
 		    (unsigned)f->items.len, (unsigned)f->vars.len);
 		return false;
+	}
 	return true;
+}
 static bool
 IsFor(const char *p)
+{
 @@ -174,33 +173,30 @@ IsFor(const char *p)
+}
 static bool
 IsEndfor(const char *p)
+{
 	return p[0] == 'e' && strncmp(p, "endfor", 6) == 0 &&
 	       (p[6] == '\0' || ch_isspace(p[6]));
+}
 /*
  * Evaluate the for loop in the passed line. The line looks like this:
  *	.for <varname...> in <value...>
+ *
  * Input:
  *	line		Line to parse
  * Results:
- *	0: Not a .for statement, parse the line
+ *	0	not a .for directive
- *	1: We found a for loop
+ *	1	found a .for directive
- *	-1: A .for statement with a bad syntax error, discard.
+ *	-1	erroneous .for directive
  */
 int
 For_Eval(const char *line)
+{
 	ForLoop *f;
 	const char *p;
 	p = line + 1;		/* skip the '.' */
 	cpp_skip_whitespace(&p);
 	if (!IsFor(p)) {
 		if (IsEndfor(p)) {
 			Parse_Error(PARSE_FATAL, "for-less endfor");
 @@ -231,27 +227,27 @@ For_Eval(const char *line)
  * Returns false when the matching .endfor is reached.
  */
 bool
 For_Accum(const char *line, int *forLevel)
+{
 	const char *p = line;
 	if (*p == '.') {
 		p++;
 		cpp_skip_whitespace(&p);
 		if (IsEndfor(p)) {
 			DEBUG1(FOR, "For: end for %d\n", *forLevel);
-			if (--*forLevel <= 0)
+			if (--*forLevel == 0)
 				return false;
 		} else if (IsFor(p)) {
 			(*forLevel)++;
 			DEBUG1(FOR, "For: new loop %d\n", *forLevel);
+		}
+	}
 	Buf_AddStr(&accumFor->body, line);
 	Buf_AddByte(&accumFor->body, '\n');
 	return true;
+}
 @@ -299,27 +295,27 @@ NeedsEscapes(Substring value, char endc)
 		    *p == '\n')
 			return true;
+	}
 	return false;
+}
 /*
  * While expanding the body of a .for loop, write the item in the ${:U...}
  * expression, escaping characters as needed.
+ *
  * The result is later unescaped by ApplyModifier_Defined.
  */
 static void
-Buf_AddEscaped(Buffer *cmds, Substring item, char endc)
+AddEscaped(Buffer *cmds, Substring item, char endc)
+{
 	const char *p;
 	char ch;
 	if (!NeedsEscapes(item, endc)) {
 		Buf_AddBytesBetween(cmds, item.start, item.end);
 		return;
+	}
 	/*
 	 * Escape ':', '$', '\\' and 'endc' - these will be removed later by
 	 * :U processing, see ApplyModifier_Defined.
 	 */
 @@ -367,27 +363,27 @@ ForLoop_SubstVarLong(ForLoop *f, Buffer
 			p++, varname++;
 		if (*varname != '\0')
 			continue;
 		/* XXX: why test for backslash here? */
 		if (*p != ':' && *p != endc && *p != '\\')
 			continue;
 		/*
 		 * Found a variable match.  Skip over the variable name and
 		 * instead add ':U<value>' to the current body.
 		 */
 		Buf_AddBytesBetween(body, *inout_mark, start);
 		Buf_AddStr(body, ":U");
-		Buf_AddEscaped(body, f->items.words[f->nextItem + i], endc);
+		AddEscaped(body, f->items.words[f->nextItem + i], endc);
 		*inout_mark = p;
 		*pp = p;
 		return;
+	}
+}
 /*
  * When expanding the body of a .for loop, replace single-character
  * variable expressions like $i with their ${:U...} expansion.
  */
 static void
 ForLoop_SubstVarShort(ForLoop *f, Buffer *body,
 @@ -405,27 +401,27 @@ ForLoop_SubstVarShort(ForLoop *f, Buffer
 	for (i = 0; i < f->vars.len; i++) {
 		const char *varname = vars[i];
 		if (varname[0] == ch && varname[1] == '\0')
 			goto found;
+	}
 	return;
 found:
 	Buf_AddBytesBetween(body, *inout_mark, p);
 	*inout_mark = p + 1;
 	/* Replace $<ch> with ${:U<value>} */
 	Buf_AddStr(body, "{:U");
-	Buf_AddEscaped(body, f->items.words[f->nextItem + i], '}');
+	AddEscaped(body, f->items.words[f->nextItem + i], '}');
 	Buf_AddByte(body, '}');
+}
 /*
  * Compute the body for the current iteration by copying the unexpanded body,
  * replacing the expressions for the iteration variables on the way.
+ *
  * Using variable expressions ensures that the .for loop can't generate
  * syntax, and that the later parsing will still see a variable.
  * This code assumes that the variable with the empty name will never be
  * defined, see unit-tests/varname-empty.mk for more details.
+ *
  * The detection of substitutions of the loop control variables is naive.