[src/trunk]: src/usr.bin/make make: sort modifiers in ApplyModifier alphabeti...

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

details:   https://anonhg.NetBSD.org/src/rev/23032494fd50
branches:  trunk
changeset: 960303:23032494fd50
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Mar 14 11:15:37 2021 +0000

description:
make: sort modifiers in ApplyModifier alphabetically

No functional change.

diffstat:

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

diffs (122 lines):

diff -r b4cafa328a91 -r 23032494fd50 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Mar 14 10:57:12 2021 +0000
+++ b/usr.bin/make/var.c        Sun Mar 14 11:15:37 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.856 2021/03/14 10:57:12 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.857 2021/03/14 11:15:37 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.856 2021/03/14 10:57:12 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.857 2021/03/14 11:15:37 rillig Exp $");
 
 typedef enum VarFlags {
        VFL_NONE        = 0,
@@ -3577,63 +3577,64 @@
 ApplyModifier(const char **pp, ApplyModifiersState *st)
 {
        switch (**pp) {
-       case ':':
-               return ApplyModifier_Assign(pp, st);
-       case '@':
-               return ApplyModifier_Loop(pp, st);
-       case '_':
-               return ApplyModifier_Remember(pp, st);
-       case 'D':
-       case 'U':
-               return ApplyModifier_Defined(pp, st);
-       case 'L':
-               return ApplyModifier_Literal(pp, st);
-       case 'P':
-               return ApplyModifier_Path(pp, st);
        case '!':
                return ApplyModifier_ShellCommand(pp, st);
+       case ':':
+               return ApplyModifier_Assign(pp, st);
+       case '?':
+               return ApplyModifier_IfElse(pp, st);
+       case '@':
+               return ApplyModifier_Loop(pp, st);
        case '[':
                return ApplyModifier_Words(pp, st);
-       case 'g':
-               return ApplyModifier_Gmtime(pp, st);
-       case 'h':
-               return ApplyModifier_Hash(pp, st);
-       case 'l':
-               return ApplyModifier_Localtime(pp, st);
-       case 't':
-               return ApplyModifier_To(pp, st);
-       case 'N':
-       case 'M':
-               return ApplyModifier_Match(pp, st);
-       case 'S':
-               return ApplyModifier_Subst(pp, st);
-       case '?':
-               return ApplyModifier_IfElse(pp, st);
+       case '_':
+               return ApplyModifier_Remember(pp, st);
 #ifndef NO_REGEX
        case 'C':
                return ApplyModifier_Regex(pp, st);
 #endif
-       case 'q':
-       case 'Q':
-               return ApplyModifier_Quote(pp, st);
-       case 'T':
-               return ApplyModifier_WordFunc(pp, st, ModifyWord_Tail);
+       case 'D':
+               return ApplyModifier_Defined(pp, st);
+       case 'E':
+               return ApplyModifier_WordFunc(pp, st, ModifyWord_Suffix);
+       case 'g':
+               return ApplyModifier_Gmtime(pp, st);
        case 'H':
                return ApplyModifier_WordFunc(pp, st, ModifyWord_Head);
-       case 'E':
-               return ApplyModifier_WordFunc(pp, st, ModifyWord_Suffix);
+       case 'h':
+               return ApplyModifier_Hash(pp, st);
+       case 'L':
+               return ApplyModifier_Literal(pp, st);
+       case 'l':
+               return ApplyModifier_Localtime(pp, st);
+       case 'M':
+       case 'N':
+               return ApplyModifier_Match(pp, st);
+       case 'O':
+               return ApplyModifier_Order(pp, st);
+       case 'P':
+               return ApplyModifier_Path(pp, st);
+       case 'Q':
+       case 'q':
+               return ApplyModifier_Quote(pp, st);
        case 'R':
                return ApplyModifier_WordFunc(pp, st, ModifyWord_Root);
        case 'r':
                return ApplyModifier_Range(pp, st);
-       case 'O':
-               return ApplyModifier_Order(pp, st);
-       case 'u':
-               return ApplyModifier_Unique(pp, st);
+       case 'S':
+               return ApplyModifier_Subst(pp, st);
 #ifdef SUNSHCMD
        case 's':
                return ApplyModifier_SunShell(pp, st);
 #endif
+       case 'T':
+               return ApplyModifier_WordFunc(pp, st, ModifyWord_Tail);
+       case 't':
+               return ApplyModifier_To(pp, st);
+       case 'U':
+               return ApplyModifier_Defined(pp, st);
+       case 'u':
+               return ApplyModifier_Unique(pp, st);
        default:
                return AMR_UNKNOWN;
        }