Once those special variable are taken care of, other Var functions can take

the GNode's context directly.  We rename that special Lst to `SymTable *'
in prevision of things to come.

Along the line, we lose the special GNodes affected to VAR_CMD, VAR_GLOBAL,
VAR_ENV, which become simple Lsts... This is not a problem, except when
getting to a context's name for debugging (handled very nicely by
offsetof).

Again, this is a preparatory patch, which does not gain anything except
for cleaning up issues...

Reviewed by millert@ and miod@, like the previous patch

1 files changed, 6 insertions, 6 deletions

diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index bc75abc23f6..b642ac3c367 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: suff.c,v 1.32 2000/06/23 16:18:09 espie Exp $	*/
+/*	$OpenBSD: suff.c,v 1.33 2000/06/23 16:20:01 espie Exp $	*/
 /*	$NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-static char rcsid[] = "$OpenBSD: suff.c,v 1.32 2000/06/23 16:18:09 espie Exp $";
+static char rcsid[] = "$OpenBSD: suff.c,v 1.33 2000/06/23 16:20:01 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -1293,7 +1293,7 @@ SuffExpandChildren(cgnp, pgnp)
     if (strchr(cgn->name, '$') != NULL) {
 	if (DEBUG(SUFF))
 	    printf("Expanding \"%s\"...", cgn->name);
-	cp = Var_Subst(cgn->name, pgn, TRUE);
+	cp = Var_Subst(cgn->name, &pgn->context, TRUE);
 
 	if (cp != NULL) {
 	    LIST	members;
@@ -1307,7 +1307,7 @@ SuffExpandChildren(cgnp, pgnp)
 		 */
 		char	*sacrifice = cp;
 
-		(void)Arch_ParseArchive(&sacrifice, &members, pgn);
+		(void)Arch_ParseArchive(&sacrifice, &members, &pgn->context);
 	    } else {
 		/*
 		 * Break the result into a vector of strings whose nodes
@@ -1347,7 +1347,7 @@ SuffExpandChildren(cgnp, pgnp)
 			size_t 	len;
 			Boolean	doFree;
 
-			junk = Var_Parse(cp, pgn, TRUE, &len, &doFree);
+			junk = Var_Parse(cp, &pgn->context, TRUE, &len, &doFree);
 			if (junk != var_Error)
 			    cp += len - 1;
 
@@ -1640,7 +1640,7 @@ SuffFindArchiveDeps(gn, slst)
      * Copy in the variables from the member node to this one.
      */
     for (i = (sizeof(copy)/sizeof(copy[0]))-1; i >= 0; i--) {
-	Var_Set(copy[i], Var_Value(copy[i], mem), gn);
+	Var_Set(copy[i], Var_Value(copy[i], &mem->context), &gn->context);
 
     }