[src/trunk]: src/usr.bin/make make(1): remove redundant ApplyModifiersState.t...

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

details:   https://anonhg.NetBSD.org/src/rev/641e9e47c119
branches:  trunk
changeset: 936502:641e9e47c119
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Jul 28 00:01:13 2020 +0000

description:
make(1): remove redundant ApplyModifiersState.termc

diffstat:

 usr.bin/make/var.c |  51 +++++++++------------------------------------------
 1 files changed, 9 insertions(+), 42 deletions(-)

diffs (truncated from 316 to 300 lines):

diff -r 4ae1836efb7c -r 641e9e47c119 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Mon Jul 27 23:56:15 2020 +0000
+++ b/usr.bin/make/var.c        Tue Jul 28 00:01:13 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.350 2020/07/27 23:56:15 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.351 2020/07/28 00:01:13 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.350 2020/07/27 23:56:15 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.351 2020/07/28 00:01:13 rillig 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.350 2020/07/27 23:56:15 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.351 2020/07/28 00:01:13 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2040,7 +2040,6 @@
  * They parse the modifier (often until the next colon) and store the
  * updated position for the parser into st->next.
  * They take the st->val and generate st->newVal from it.
- * On success, they set st->termc to *st->next, redundantly.
  * On failure, many of them update st->missing_delim.
  */
 typedef struct {
@@ -2056,7 +2055,6 @@
                                 * to the expression */
     const char *next;          /* The position where parsing continues
                                 * after the current modifier. */
-    char termc;                        /* Character which terminated scan */
     char missing_delim;                /* For error reporting */
 
     Byte       sep;            /* Word separator in expansions */
@@ -2107,8 +2105,6 @@
        return FALSE;
     }
 
-    st->termc = *st->next;
-
     args.eflags = st->eflags & (VARE_UNDEFERR | VARE_WANTRES);
     int prev_sep = st->sep;
     st->sep = ' ';             /* XXX: this is inconsistent */
@@ -2174,7 +2170,6 @@
     }
 
     st->next = p;
-    st->termc = *st->next;
 
     if (st->v->flags & VAR_JUNK)
        st->v->flags |= VAR_KEEP;
@@ -2205,7 +2200,6 @@
        st->next = mod + 6;
     }
     st->newVal = VarStrftime(st->val, 1, utc);
-    st->termc = *st->next;
     return TRUE;
 }
 
@@ -2228,7 +2222,6 @@
        st->next = mod + 9;
     }
     st->newVal = VarStrftime(st->val, 0, utc);
-    st->termc = *st->next;
     return TRUE;
 }
 
@@ -2243,7 +2236,6 @@
 
     st->newVal = VarHash(st->val);
     st->next = mod + 4;
-    st->termc = *st->next;
     return TRUE;
 }
 
@@ -2264,7 +2256,6 @@
     if (!st->newVal)
        st->newVal = bmake_strdup(st->v->name);
     st->next = mod + 1;
-    st->termc = *st->next;
 }
 
 /* :!cmd! */
@@ -2290,7 +2281,6 @@
     if (emsg)
        Error(emsg, st->val);
 
-    st->termc = *st->next;
     if (st->v->flags & VAR_JUNK)
        st->v->flags |= VAR_KEEP;
     return TRUE;
@@ -2315,7 +2305,6 @@
        st->next = mod + 5;
     }
     st->newVal = VarRange(st->val, n);
-    st->termc = *st->next;
     return TRUE;
 }
 
@@ -2351,7 +2340,6 @@
        }
     }
     st->next = p;
-    st->termc = *st->next;
     const char *endpat = st->next;
 
     char *pattern;
@@ -2451,7 +2439,6 @@
        break;
     }
 
-    st->termc = *st->next;
     st->newVal = ModifyWords(st->ctxt, st->sep, oneBigWord, st->val,
                             ModifyWord_Subst, &args);
 
@@ -2504,8 +2491,6 @@
        break;
     }
 
-    st->termc = *st->next;
-
     int error = regcomp(&args.re, re, REG_EXTENDED);
     free(re);
     if (error) {
@@ -2581,7 +2566,6 @@
        return FALSE;           /* Found ":ts<unrecognised><unrecognised>". */
     }
 
-    st->termc = *st->next;
     st->newVal = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->val,
                             ModifyWord_Copy, NULL);
     return TRUE;
@@ -2606,24 +2590,20 @@
        st->newVal = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->val,
                                 ModifyWord_Realpath, NULL);
        st->next = mod + 2;
-       st->termc = *st->next;
     } else if (mod[1] == 'u') {
        char *dp = bmake_strdup(st->val);
        for (st->newVal = dp; *dp; dp++)
            *dp = toupper((unsigned char)*dp);
        st->next = mod + 2;
-       st->termc = *st->next;
     } else if (mod[1] == 'l') {
        char *dp = bmake_strdup(st->val);
        for (st->newVal = dp; *dp; dp++)
            *dp = tolower((unsigned char)*dp);
        st->next = mod + 2;
-       st->termc = *st->next;
     } else if (mod[1] == 'W' || mod[1] == 'w') {
        st->oneBigWord = mod[1] == 'W';
        st->newVal = st->val;
        st->next = mod + 2;
-       st->termc = *st->next;
     } else {
        /* Found ":t<unrecognised>:" or ":t<unrecognised><endc>". */
        return FALSE;
@@ -2725,7 +2705,6 @@
     st->newVal = VarSelectWords(st->sep, st->oneBigWord, st->val, first, last);
 
 ok:
-    st->termc = *st->next;
     free(estr);
     return 0;
 
@@ -2743,12 +2722,10 @@
     st->next = mod + 1;        /* skip to the rest in any case */
     if (mod[1] == st->endc || mod[1] == ':') {
        otype = 's';
-       st->termc = *st->next;
     } else if ((mod[1] == 'r' || mod[1] == 'x') &&
               (mod[2] == st->endc || mod[2] == ':')) {
        otype = mod[1];
        st->next = mod + 2;
-       st->termc = *st->next;
     } else {
        return FALSE;
     }
@@ -2790,7 +2767,7 @@
        return FALSE;
     }
 
-    st->termc = *--st->next;
+    st->next--;
     if (cond_rc == COND_INVALID) {
        Error("Bad conditional expression `%s' in %s?%s:%s",
            st->v->name, st->v->name, then_expr, else_expr);
@@ -2884,7 +2861,7 @@
        return 'c';
     }
 
-    st->termc = *--st->next;
+    st->next--;
 
     if (st->eflags & VARE_WANTRES) {
        switch (op[0]) {
@@ -2935,7 +2912,6 @@
        st->next = mod + 1;
     }
     st->newVal = st->val;
-    st->termc = *st->next;
     return TRUE;
 }
 
@@ -2988,7 +2964,7 @@
      * SYSV modifications happen through the whole
      * string. Note the pattern is anchored at the end.
      */
-    st->termc = *--st->next;
+    st->next--;
     if (lhs[0] == '\0' && *st->val == '\0') {
        st->newVal = st->val;   /* special case */
     } else {
@@ -3076,7 +3052,7 @@
 {
     ApplyModifiersState st = {
        startc, endc, v, ctxt, eflags,
-       val, NULL, NULL, '\0', '\0', ' ', FALSE
+       val, NULL, NULL, '\0', ' ', FALSE
     };
 
     const char *p = tstr;
@@ -3171,7 +3147,6 @@
                    st.v->flags |= VAR_KEEP;
                st.newVal = bmake_strdup(st.v->name);
                st.next = p + 1;
-               st.termc = *st.next;
                break;
            }
        case 'P':
@@ -3229,7 +3204,6 @@
            if (p[1] == st.endc || p[1] == ':') {
                st.newVal = VarQuote(st.val, modifier == 'q');
                st.next = p + 1;
-               st.termc = *st.next;
                break;
            }
            goto default_case;
@@ -3238,7 +3212,6 @@
                st.newVal = ModifyWords(st.ctxt, st.sep, st.oneBigWord,
                                        st.val, ModifyWord_Tail, NULL);
                st.next = p + 1;
-               st.termc = *st.next;
                break;
            }
            goto default_case;
@@ -3247,7 +3220,6 @@
                st.newVal = ModifyWords(st.ctxt, st.sep, st.oneBigWord,
                                        st.val, ModifyWord_Head, NULL);
                st.next = p + 1;
-               st.termc = *st.next;
                break;
            }
            goto default_case;
@@ -3256,7 +3228,6 @@
                st.newVal = ModifyWords(st.ctxt, st.sep, st.oneBigWord,
                                        st.val, ModifyWord_Suffix, NULL);
                st.next = p + 1;
-               st.termc = *st.next;
                break;
            }
            goto default_case;
@@ -3265,7 +3236,6 @@
                st.newVal = ModifyWords(st.ctxt, st.sep, st.oneBigWord,
                                        st.val, ModifyWord_Root, NULL);
                st.next = p + 1;
-               st.termc = *st.next;
                break;
            }
            goto default_case;
@@ -3281,7 +3251,6 @@
            if (p[1] == st.endc || p[1] == ':') {
                st.newVal = VarUniq(st.val);
                st.next = p + 1;
-               st.termc = *st.next;
                break;
            }
            goto default_case;
@@ -3296,7 +3265,6 @@
                } else
                    st.newVal = varNoError;
                st.next = p + 2;
-               st.termc = *st.next;
                break;
            }
            goto default_case;
@@ -3317,7 +3285,6 @@
                         *st.next != '\0';
                         st.next++)
                        continue;
-                   st.termc = *st.next;
                    st.newVal = var_Error;