[src/trunk]: src/usr.bin/make make(1): clean up ParseVarnameLong

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

details:   https://anonhg.NetBSD.org/src/rev/d01638cb95ea
branches:  trunk
changeset: 956713:d01638cb95ea
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Nov 05 21:16:20 2020 +0000

description:
make(1): clean up ParseVarnameLong

A parameter named pp is usually used as the parsing position, which is
updated upon successful return.  Not so in ParseVarnameLong, where it
was updated in the unsuccessful branch only.

To avoid confusion, rename it to out_FALSE_pp, which is a longer name
but expresses more clearly what actually happens.

diffstat:

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

diffs (97 lines):

diff -r 13a88aaab5ab -r d01638cb95ea usr.bin/make/var.c
--- a/usr.bin/make/var.c        Thu Nov 05 20:50:13 2020 +0000
+++ b/usr.bin/make/var.c        Thu Nov 05 21:16:20 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.663 2020/11/05 20:50:13 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.664 2020/11/05 21:16:20 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.663 2020/11/05 20:50:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.664 2020/11/05 21:16:20 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -3692,11 +3692,12 @@
  * Return whether to continue parsing. */
 static Boolean
 ParseVarnameLong(
-       const char **pp,
+       const char *p,
        char startc,
        GNode *ctxt,
        VarEvalFlags eflags,
 
+       const char **out_FALSE_pp,
        VarParseResult *out_FALSE_res,
        const char **out_FALSE_val,
        void **out_FALSE_freeIt,
@@ -3715,10 +3716,10 @@
     Boolean haveModifier;
     Boolean dynamic = FALSE;
 
-    const char *const start = *pp;
+    const char *const start = p;
     char endc = startc == '(' ? ')' : '}';
 
-    const char *p = start + 2;
+    p += 2;                    /* skip "${" or "$(" or "y(" */
     varname = ParseVarname(&p, startc, endc, ctxt, eflags, &namelen);
 
     if (*p == ':') {
@@ -3727,8 +3728,8 @@
        haveModifier = FALSE;
     } else {
        Parse_Error(PARSE_FATAL, "Unclosed variable \"%s\"", varname);
-       *pp = p;
        free(varname);
+       *out_FALSE_pp = p;
        *out_FALSE_val = var_Error;
        *out_FALSE_res = VPR_PARSE_MSG;
        return FALSE;
@@ -3750,7 +3751,7 @@
 
        if (!haveModifier) {
            p++;                /* skip endc */
-           *pp = p;
+           *out_FALSE_pp = p;
            *out_FALSE_res = EvalUndefined(dynamic, start, p, varname, eflags,
                                           out_FALSE_freeIt, out_FALSE_val);
            return FALSE;
@@ -3828,8 +3829,8 @@
 Var_Parse(const char **pp, GNode *ctxt, VarEvalFlags eflags,
          const char **out_val, void **out_val_freeIt)
 {
-    const char *const start = *pp;
-    const char *p;
+    const char *p = *pp;
+    const char *const start = p;
     Boolean haveModifier;      /* TRUE if have modifiers for the variable */
     char startc;               /* Starting character if variable in parens
                                 * or braces */
@@ -3857,17 +3858,17 @@
      * initialized. */
     endc = '\0';
 
-    startc = start[1];
+    startc = p[1];
     if (startc != '(' && startc != '{') {
        VarParseResult res;
        if (!ParseVarnameShort(startc, pp, ctxt, eflags, &res, out_val, &v))
            return res;
        haveModifier = FALSE;
-       p = start + 1;
+       p++;
     } else {
        VarParseResult res;
-       if (!ParseVarnameLong(pp, startc, ctxt, eflags,
-                             &res, out_val, out_val_freeIt,
+       if (!ParseVarnameLong(p, startc, ctxt, eflags,
+                             pp, &res, out_val, out_val_freeIt,
                              &endc, &p, &v, &haveModifier, &extramodifiers,
                              &dynamic, &exprFlags))
            return res;