 @@ -1,14 +1,14 @@
-/*	$NetBSD: for.c,v 1.136 2021/01/25 19:05:39 rillig Exp $	*/
+/*	$NetBSD: for.c,v 1.137 2021/01/25 19:10:57 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,75 +48,93 @@
  * body is scanned for variable expressions, and those that match the variable
  * names are replaced with expressions of the form ${:U...} or $(: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.136 2021/01/25 19:05:39 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.137 2021/01/25 19:10:57 rillig Exp $");
 static int forLevel = 0;	/* Nesting level */
 /* One of the variables to the left of the "in" in a .for loop. */
 typedef struct ForVar {
 	char *name;
 	size_t nameLen;
 } ForVar;
 typedef struct ForLoop {
 	Buffer body;		/* Unexpanded body of the loop */
 	Vector /* of ForVar */ vars; /* Iteration variables */
 	Words items;		/* Substitution items */
 	Buffer curBody;		/* Expanded body of the current iteration */
 	/* Is any of the names 1 character long? If so, when the variable values
 	 * are substituted, the parser must handle $V expressions as well, not
 	 * only ${V} and $(V). */
 	Boolean short_var;
 	unsigned int sub_next;	/* Where to continue iterating */
 } ForLoop;
 static ForLoop *accumFor;		/* Loop being accumulated */
 static int forLevel = 0;	/* Nesting level */
 static void
-ForLoop_AddVar(ForLoop *f, const char *name, size_t len)
+static ForLoop *
 ForLoop_New(void)
+{
-	ForVar *var = Vector_Push(&f->vars);
+	ForLoop *f = bmake_malloc(sizeof *f);
 	var->name = bmake_strldup(name, len);
-	var->nameLen = len;
+	Buf_Init(&f->body);
 	Vector_Init(&f->vars, sizeof(ForVar));
 	f->items.words = NULL;
 	f->items.freeIt = NULL;
 	Buf_Init(&f->curBody);
 	f->short_var = FALSE;
 	f->sub_next = 0;
 	return f;
+}
 static void
 ForLoop_Free(ForLoop *f)
+{
 	Buf_Destroy(&f->body, TRUE);
 	while (f->vars.len > 0) {
 		ForVar *var = Vector_Pop(&f->vars);
 		free(var->name);
+	}
 	Vector_Done(&f->vars);
 	Words_Free(f->items);
 	Buf_Destroy(&f->curBody, TRUE);
 	free(f);
+}
 static void
 ForLoop_AddVar(ForLoop *f, const char *name, size_t len)
+{
 	ForVar *var = Vector_Push(&f->vars);
 	var->name = bmake_strldup(name, len);
 	var->nameLen = len;
+}
 static Boolean
 IsFor(const char *p)
+{
 	return p[0] == 'f' && p[1] == 'o' && p[2] == 'r' && ch_isspace(p[3]);
+}
 static Boolean
 IsEndfor(const char *p)
+{
 	return p[0] == 'e' && strncmp(p, "endfor", 6) == 0 &&
 	       (p[6] == '\0' || ch_isspace(p[6]));
+}
 @@ -144,34 +162,27 @@ For_Eval(const char *line)
 	if (!IsFor(p)) {
 		if (IsEndfor(p)) {
 			Parse_Error(PARSE_FATAL, "for-less endfor");
 			return -1;
+		}
 		return 0;
+	}
 	p += 3;
 	/*
 	 * we found a for loop, and now we are going to parse it.
 	 */
-	f = bmake_malloc(sizeof *f);
+	f = ForLoop_New();
 	Buf_Init(&f->body);
 	Vector_Init(&f->vars, sizeof(ForVar));
 	f->items.words = NULL;
 	f->items.freeIt = NULL;
 	Buf_Init(&f->curBody);
 	f->short_var = FALSE;
 	f->sub_next = 0;
 	/* Grab the variables. Terminate on "in". */
 	for (;;) {
 		size_t len;
 		cpp_skip_whitespace(&p);
 		if (*p == '\0') {
 			Parse_Error(PARSE_FATAL, "missing `in' in for");
 			ForLoop_Free(f);
 			return -1;
+		}
 		/*