[src/trunk]: src/usr.bin/make Just have :_ use current ctxt, avoid need to fo...

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cac8f86a5b00
branches:  trunk
changeset: 351083:cac8f86a5b00
user:      sjg <sjg%NetBSD.org@localhost>
date:      Wed Feb 01 18:00:14 2017 +0000

description:
Just have :_ use current ctxt, avoid need to force VAR_INTERNAL.

diffstat:

 usr.bin/make/var.c |  19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)

diffs (74 lines):

diff -r d89a4b095718 -r cac8f86a5b00 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Wed Feb 01 17:58:47 2017 +0000
+++ b/usr.bin/make/var.c        Wed Feb 01 18:00:14 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.211 2017/01/31 07:00:59 sjg Exp $    */
+/*     $NetBSD: var.c,v 1.212 2017/02/01 18:00:14 sjg Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.211 2017/01/31 07:00:59 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.212 2017/02/01 18:00:14 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c      8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.211 2017/01/31 07:00:59 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.212 2017/02/01 18:00:14 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2743,7 +2743,7 @@
            }
        case '_':                       /* remember current value */
            if CHARMOD_MATCH(tstr[1]) {
-               Var_Set("_", nstr, VAR_INTERNAL, 0);
+               Var_Set("_", nstr, ctxt, 0);
                newStr = nstr;
                cp = ++tstr;
                termc = *tstr;
@@ -3729,7 +3729,6 @@
 Var_Parse(const char *str, GNode *ctxt, int flags,
          int *lengthPtr, void **freePtr)
 {
-    GNode         *mctxt;
     const char    *tstr;       /* Pointer into str */
     Var                   *v;          /* Variable in invocation */
     Boolean        haveModifier;/* TRUE if have modifiers for the variable */
@@ -3747,12 +3746,6 @@
     const char     *extramodifiers; /* extra modifiers to apply first */
     char         name[2];
 
-    /*
-     * We can safely (and only need to?) use VAR_INTERNAL for modifiers
-     * (so correct $_ is found) if ctxt is any of VAR_CMD, VAR_GLOBAL
-     * or VAR_INTERNAL, otherwise leave it alone.
-     */
-    mctxt = (ctxt == VAR_GLOBAL || ctxt == VAR_CMD) ? VAR_INTERNAL : ctxt;
     *freePtr = NULL;
     extramodifiers = NULL;
     dynamic = FALSE;
@@ -3999,7 +3992,7 @@
        extraFree = NULL;
        if (extramodifiers != NULL) {
                nstr = ApplyModifiers(nstr, extramodifiers, '(', ')',
-                                     v, mctxt, flags, &used, &extraFree);
+                                     v, ctxt, flags, &used, &extraFree);
        }
 
        if (haveModifier) {
@@ -4007,7 +4000,7 @@
                tstr++;
 
                nstr = ApplyModifiers(nstr, tstr, startc, endc,
-                                     v, mctxt, flags, &used, freePtr);
+                                     v, ctxt, flags, &used, freePtr);
                tstr += used;
                free(extraFree);
        } else {