[src/trunk]: src/usr.bin/make make(1): extract GetEscapes from For_Eval

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

details:   https://anonhg.NetBSD.org/src/rev/2d910b748a97
branches:  trunk
changeset: 1015533:2d910b748a97
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Oct 25 14:29:13 2020 +0000

description:
make(1): extract GetEscapes from For_Eval

diffstat:

 usr.bin/make/for.c |  59 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 34 insertions(+), 25 deletions(-)

diffs (90 lines):

diff -r 2d337f98a07e -r 2d910b748a97 usr.bin/make/for.c
--- a/usr.bin/make/for.c        Sun Oct 25 13:51:56 2020 +0000
+++ b/usr.bin/make/for.c        Sun Oct 25 14:29:13 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: for.c,v 1.98 2020/10/25 13:51:56 rillig Exp $  */
+/*     $NetBSD: for.c,v 1.99 2020/10/25 14:29:13 rillig Exp $  */
 
 /*
  * Copyright (c) 1992, The Regents of the University of California.
@@ -60,7 +60,7 @@
 #include    "make.h"
 
 /*     "@(#)for.c      8.1 (Berkeley) 6/6/93"  */
-MAKE_RCSID("$NetBSD: for.c,v 1.98 2020/10/25 13:51:56 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.99 2020/10/25 14:29:13 rillig Exp $");
 
 typedef enum ForEscapes {
     FOR_SUB_ESCAPE_CHAR = 0x0001,
@@ -145,6 +145,30 @@
     free(arg);
 }
 
+static ForEscapes
+GetEscapes(const char *word)
+{
+    const char *p;
+    ForEscapes escapes = 0;
+
+    for (p = word; *p != '\0'; p++) {
+       switch (*p) {
+       case ':':
+       case '$':
+       case '\\':
+           escapes |= FOR_SUB_ESCAPE_CHAR;
+           break;
+       case ')':
+           escapes |= FOR_SUB_ESCAPE_PAREN;
+           break;
+       case '}':
+           escapes |= FOR_SUB_ESCAPE_BRACE;
+           break;
+       }
+    }
+    return escapes;
+}
+
 /* Evaluate the for loop in the passed line. The line looks like this:
  *     .for <varname...> in <value...>
  *
@@ -242,32 +266,17 @@
     }
 
     {
-       size_t n;
+       size_t i;
 
-       for (n = 0; n < words.len; n++) {
+       for (i = 0; i < words.len; i++) {
+           const char *word = words.words[i];
            ForEscapes escapes;
-           char ch;
 
-           ptr = words.words[n];
-           if (ptr[0] == '\0')
-               continue;
-           escapes = 0;
-           while ((ch = *ptr++)) {
-               switch (ch) {
-               case ':':
-               case '$':
-               case '\\':
-                   escapes |= FOR_SUB_ESCAPE_CHAR;
-                   break;
-               case ')':
-                   escapes |= FOR_SUB_ESCAPE_PAREN;
-                   break;
-               case '}':
-                   escapes |= FOR_SUB_ESCAPE_BRACE;
-                   break;
-               }
-           }
-           ForAddItem(new_for, words.words[n], escapes);
+           if (word[0] == '\0')
+               continue;       /* .for var in ${:U} */
+
+           escapes = GetEscapes(word);
+           ForAddItem(new_for, word, escapes);
        }
     }