 @@ -1,14 +1,14 @@
-/*	$NetBSD: for.c,v 1.41 2008/12/29 10:12:30 dsl Exp $	*/
+/*	$NetBSD: for.c,v 1.42 2009/01/10 16:59:02 dsl 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.
 @@ -20,57 +20,61 @@
  * 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: for.c,v 1.41 2008/12/29 10:12:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: for.c,v 1.42 2009/01/10 16:59:02 dsl Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)for.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: for.c,v 1.41 2008/12/29 10:12:30 dsl Exp $");
+__RCSID("$NetBSD: for.c,v 1.42 2009/01/10 16:59:02 dsl Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * for.c --
  *	Functions to handle loops in a makefile.
+ *
  * Interface:
  *	For_Eval 	Evaluate the loop in the passed line.
  *	For_Run		Run accumulated loop
+ *
  */
 #include    <assert.h>
 #include    <ctype.h>
 #include    "make.h"
 #include    "hash.h"
 #include    "dir.h"
 #include    "buf.h"
 #include    "strlist.h"
 #define FOR_SUB_ESCAPE_COLON 1
 #define FOR_SUB_ESCAPE_BRACE 2
 #define FOR_SUB_ESCAPE_PAREN 4
 /*
  * For statements are of the form:
+ *
  * .for <variable> in <varlist>
  * ...
  * .endfor
+ *
  * The trick is to look for the matching end inside for for loop
  * To do that, we count the current nesting level of the for loops.
  * and the .endfor statements, accumulating all the statements between
  * the initial .for loop and the matching .endfor;
  * then we evaluate the for loop for each variable in the varlist.
+ *
 @@ -120,30 +124,28 @@ make_str(const char *ptr, int len)
  *	1: We found a for loop
  *     -1: A .for statement with a bad syntax error, discard.
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 int
 For_Eval(char *line)
+{
     char *ptr = line, *sub;
     int len;
     int i;
     int escapes;
-    int depth;
+    unsigned char ch;
     char ch;
     /* Forget anything we previously knew about - it cannot be useful */
     memset(&accumFor, 0, sizeof accumFor);
     forLevel = 0;
     for (ptr++; *ptr && isspace((unsigned char) *ptr); ptr++)
 	continue;
     /*
      * If we are not in a for loop quickly determine if the statement is
      * a for.
      */
     if (ptr[0] != 'f' || ptr[1] != 'o' || ptr[2] != 'r' ||
 	    !isspace((unsigned char) ptr[3])) {
 @@ -163,71 +165,59 @@ For_Eval(char *line)
     for (;; ptr += len) {
 	while (*ptr && isspace((unsigned char) *ptr))
 	    ptr++;
 	if (*ptr == '\0') {
 	    Parse_Error(PARSE_FATAL, "missing `in' in for");
 	    return -1;
+	}
 	for (len = 1; ptr[len] && !isspace((unsigned char)ptr[len]); len++)
 	    continue;
 	if (len == 2 && ptr[0] == 'i' && ptr[1] == 'n') {
 	    ptr += 2;
 	    break;
+	}
-	strlist_add_str(&accumFor.vars, make_str(ptr, len));
+	strlist_add_str(&accumFor.vars, make_str(ptr, len), len);
+    }
     if (strlist_num(&accumFor.vars) == 0) {
 	Parse_Error(PARSE_FATAL, "no iteration variables in for");
 	return -1;
+    }
     while (*ptr && isspace((unsigned char) *ptr))
 	ptr++;
     /*
      * Make a list with the remaining words
-     * The values are substituted as ${:U<value>... so we must \ escape
+     * The values are substituted as ${:U<value>...} so we must \ escape
      * characters that break that syntax - particularly ':', maybe $ and \.
      */
     sub = Var_Subst(NULL, ptr, VAR_GLOBAL, FALSE);
     for (ptr = sub;; ptr += len) {
 	while (*ptr && isspace((unsigned char)*ptr))
 	    ptr++;
 	if (*ptr == 0)
 	    break;
 	escapes = 0;
-	for (len = 0; ptr[len] && !isspace((unsigned char)ptr[len]); len++)
+	for (len = 0; (ch = ptr[len]) != 0 && !isspace(ch); len++) {
-	    if (ptr[len] == ':')
+	    if (ch == ':')
-		escapes++;
+		escapes |= FOR_SUB_ESCAPE_COLON;
-	if (escapes == 0)
+	    else if (ch == ')')
-	    strlist_add_str(&accumFor.items, make_str(ptr, len));
+		escapes |= FOR_SUB_ESCAPE_PAREN;
-	else {
+	    else if (ch == /*{*/ '}')
-	    char *item = bmake_malloc(len + escapes + 1);
+		escapes |= FOR_SUB_ESCAPE_BRACE;
 	    strlist_add_str(&accumFor.items, item);
 	    for (depth= 0, i = 0; i < len; i++) {
 		ch = ptr[i];
 		/* Loose determination of nested variable definitions. */
 		if (ch == '(' || ch == '{')
 		    depth++;
 		else if (ch == ')' || ch == '}')
 		    depth--;
 		else if (ch == ':' && depth == 0)
 		    *item++ = '\\';
 		*item++ = ch;
 	    *item = 0;
+	}
 	strlist_add_str(&accumFor.items, make_str(ptr, len), escapes);
+    }
     free(sub);
     if (strlist_num(&accumFor.items) % strlist_num(&accumFor.vars)) {
 	Parse_Error(PARSE_FATAL,
 		"Wrong number of words in .for substitution list %d %d",
 		strlist_num(&accumFor.items), strlist_num(&accumFor.vars));
 	/*
 	 * Return 'success' so that the body of the .for loop is accumulated.
 	 * The loop will have zero iterations expanded due a later test.
 	 */
+    }
 @@ -275,34 +265,83 @@ For_Accum(char *line)
 /*-
  *-----------------------------------------------------------------------
  * For_Run --
  *	Run the for loop, imitating the actions of an include file
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 static void
 for_substitute(Buffer cmds, strlist_t *items, unsigned int item_no, char ech)
+{
     int depth, var_depth;
     int escape;
     const char *item = strlist_str(items, item_no);
     int i;
     char ch;
 #define MAX_DEPTH 0x7fffffff
     /* If there were no escapes, or the only escape is the other variable
      * terminator, then just substitute the full string */
     if (!(strlist_info(items, item_no) &
 	    (ech == ')' ? ~FOR_SUB_ESCAPE_BRACE : ~FOR_SUB_ESCAPE_PAREN))) {
 	Buf_AddBytes(cmds, strlen(item), item);
 	return;
+    }
     /* Escape ':' and 'ech' provided they aren't inside variable expansions */
     depth = 0;
     var_depth = MAX_DEPTH;
     escape = -1;
     for (i = 0; (ch = item[i]) != 0; i++) {
 	/* Loose determination of nested variable definitions. */
 	if (ch == '(' || ch == '{') {
 	    depth++;
 	    if (var_depth == MAX_DEPTH && i != 0 && item[i-1] == '$')
 		var_depth = depth;
 	} else if (ch == ')' || ch == '}') {
 	    if (ch == ech && depth < var_depth)
 		escape = i;
 	    if (depth == var_depth)
 		var_depth = MAX_DEPTH;
 	    depth--;
 	} else if (ch == ':' && depth < var_depth)
 	    escape = i;
 	if (escape == i)
 	    Buf_AddByte(cmds, '\\');
 	Buf_AddByte(cmds, ch);
+    }
     if (escape == -1) {
 	/* We didn't actually need to escape anything, remember for next time */
 	strlist_set_info(items, item_no, strlist_info(items, item_no) &
 	    (ech == ')' ? ~FOR_SUB_ESCAPE_PAREN : ~FOR_SUB_ESCAPE_BRACE));
+    }
+}
 void
 For_Run(int lineno)
+{
     For arg;
     int i, len;
     unsigned int num_items;
     char *for_body;
-    char *var, *item;
+    char *var;
     char *cp;
     char *cmd_cp;
     char *body_end;
     char ch;
     Buffer cmds;
     int short_var;
     arg = accumFor;
     memset(&accumFor, 0, sizeof accumFor);
     num_items = strlist_num(&arg.items);
     if (num_items % strlist_num(&arg.vars))
 	/* Error message already printed */
 @@ -327,64 +366,62 @@ For_Run(int lineno)
      * Many of the modifiers use \ to escape $ (not $) so it is possible
      * to contrive a makefile where an unwanted substitution happens.
+     *
      * Each loop expansion is fed back into the parser as if it were an
      * include file.  This means we have to generate the last iteration first.
      */
     while (num_items != 0) {
 	num_items -= strlist_num(&arg.vars);
 	for_body = (char *)Buf_GetAll(arg.buf, &len);
 	body_end = for_body + len;
 	cmds = Buf_Init(len + 256);
 	cmd_cp = for_body;
 	for (cp = for_body; (cp = strchr(cp, '$')) != NULL;) {
 	    char ech;
 	    ch = *++cp;
-	    if (ch == '(' || ch == '{') {
+	    if ((ch == '(' && (ech = ')')) || (ch == '{' && (ech = '}'))) {
 		char ech = ch == '(' ? ')' : '}';
 		cp++;
 		/* Check variable name against the .for loop variables */
 		STRLIST_FOREACH(var, &arg.vars, i) {
-		    len = strlen(var);
+		    len = strlist_info(&arg.vars, i);
 		    if (memcmp(cp, var, len) != 0)
 			continue;
 		    if (cp[len] != ':' && cp[len] != ech && cp[len] != '\\')
 			continue;
-		    /* Found a variable match. Replace with ${:U<value> */
+		    /* Found a variable match. Replace with :U<value> */
 		    Buf_AddBytes(cmds, cp - cmd_cp, cmd_cp);
 		    Buf_AddBytes(cmds, 2, ":U");
 		    cp += len;
 		    cmd_cp = cp;
-		    item = strlist_str(&arg.items, num_items + i);
+		    for_substitute(cmds, &arg.items, num_items + i, ech);
 		    Buf_AddBytes(cmds, strlen(item), item);
 		    break;
+		}
 		continue;
+	    }
 	    if (ch == 0)
 		break;
-	    /* Probably a single character name, ignore $$ and stupid ones. */
+	    /* Probably a single character name, ignore $$ and stupid ones. {*/
 	    if (!short_var || strchr("}):$", ch) != NULL) {
 		cp++;
 		continue;
+	    }
 	    STRLIST_FOREACH(var, &arg.vars, i) {
 		if (var[0] != ch || var[1] != 0)
 		    continue;
 		/* Found a variable match. Replace with ${:U<value>} */
 		Buf_AddBytes(cmds, cp - cmd_cp, cmd_cp);
 		Buf_AddBytes(cmds, 3, "{:U");
 		cmd_cp = ++cp;
-		item = strlist_str(&arg.items, num_items + i);
+		for_substitute(cmds, &arg.items, num_items + i, /*{*/ '}');
 		Buf_AddBytes(cmds, strlen(item), item);
 		Buf_AddBytes(cmds, 1, "}");
 		break;
+	    }
+	}
 	Buf_AddBytes(cmds, body_end - cmd_cp, cmd_cp);
 	cp = Buf_GetAll(cmds, NULL);
 	if (DEBUG(FOR))
 	    (void)fprintf(debug_file, "For: loop body:\n%s", cp);
 	Parse_SetInput(NULL, lineno, -1, cp);
 	Buf_Destroy(cmds, FALSE);
+    }