d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the LST_FOREACH macro instead of the Lst_ForEach function

Browse Source 
and so get rid of the ForExec helper function by inlining it
into For_Run.
This commit is contained in:
Hartmut Brandt 2005-02-23 14:03:18 +00:00
parent 7175fefe00
commit 592dcf0422
1 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
usr.bin/make/for.c
View File

@ -247,34 +247,6 @@ For_Eval(char *line)
return (0);
}
/*-
*-----------------------------------------------------------------------
* ForExec --
* Expand the for loop for this index and push it in the Makefile
*
* Results:
* None.
*
* Side Effects:
* None.
*
*-----------------------------------------------------------------------
*/
static int
ForExec(void *namep, void *argp)
{
char *name = namep;
For *arg = argp;
Var_Set(arg->var, name, VAR_GLOBAL);
DEBUGF(FOR, ("--- %s = %s\n", arg->var, name));
Parse_FromString(Var_Subst(arg->var, (char *)Buf_GetAll(arg->buf, NULL),
VAR_GLOBAL, FALSE), arg->lineno);
Var_Delete(arg->var, VAR_GLOBAL);
return (0);
}
/*-
*-----------------------------------------------------------------------
* For_Run --
@ -284,31 +256,44 @@ ForExec(void *namep, void *argp)
* None.
*
* Side Effects:
* None.
* The values of the variables forLst, forVar and forBuf are freed.
*
*-----------------------------------------------------------------------
*/
void
For_Run(int lineno)
{
For arg;
Lst values; /* list of values for the variable */
char *var; /* the variable's name */
Buffer *buf; /* the contents of the for loop */
const char *val; /* current value of loop variable */
LstNode *ln;
if (forVar == NULL || forBuf == NULL)
return;
arg.var = forVar;
arg.buf = forBuf;
/* move the forLst to the arg to get it free for nested for's */
Lst_Init(&arg.lst);
Lst_Concat(&arg.lst, &forLst, LST_CONCLINK);
/* copy the global variables to have them free for embedded fors */
var = forVar;
buf = forBuf;
Lst_Init(&values);
Lst_Concat(&values, &forLst, LST_CONCLINK);
arg.lineno = lineno;
forVar = NULL;
forBuf = NULL;
Lst_ForEach(&arg.lst, ForExec, &arg);
LST_FOREACH(ln, &values) {
val = Lst_Datum(ln);
Var_Set(var, val, VAR_GLOBAL);
free(arg.var);
Lst_Destroy(&arg.lst, free);
Buf_Destroy(arg.buf, TRUE);
DEBUGF(FOR, ("--- %s = %s\n", var, val));
Parse_FromString(Var_Subst(var,
(char *)Buf_GetAll(buf, NULL),
VAR_GLOBAL, FALSE), lineno);
Var_Delete(var, VAR_GLOBAL);
}
free(var);
Lst_Destroy(&values, free);
Buf_Destroy(buf, TRUE);
}