summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2021-12-03 18:29:35 +0000
committerrillig <rillig@NetBSD.org>2021-12-03 18:29:35 +0000
commitaad2e4e0b4bb5fb39cbf759b9b7bc8600e0bc91c (patch)
tree8229c1ccbfa3ef007e16a1f455818c669217e506 /usr.bin/make
parentcfcc0841284bbd0d8b4fe82eb60a6fdc8e0aa28a (diff)
make: condense ParseModifierPartSubst
No functional change.
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/var.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index a6c80ca168f..960066b5801 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.957 2021/12/03 18:23:03 rillig Exp $ */
+/* $NetBSD: var.c,v 1.958 2021/12/03 18:29:35 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.957 2021/12/03 18:23:03 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.958 2021/12/03 18:29:35 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -2216,37 +2216,23 @@ ParseModifierPartSubst(
p = *pp;
LazyBuf_Init(part, p);
- /*
- * Skim through until the matching delimiter is found; pick up
- * variable expressions on the way.
- */
while (*p != '\0' && *p != delim) {
-
if (IsEscapedModifierPart(p, delim, subst)) {
LazyBuf_Add(part, p[1]);
p += 2;
- continue;
- }
-
- if (*p != '$') { /* Unescaped, simple text */
+ } else if (*p != '$') { /* Unescaped, simple text */
if (subst != NULL && *p == '&')
LazyBuf_AddSubstring(part, subst->lhs);
else
LazyBuf_Add(part, *p);
p++;
- continue;
- }
-
- if (p[1] == delim) { /* Unescaped $ at end of pattern */
+ } else if (p[1] == delim) { /* Unescaped '$' at end */
if (out_pflags != NULL)
out_pflags->anchorEnd = true;
else
LazyBuf_Add(part, *p);
p++;
- continue;
- }
-
- if (VarEvalMode_ShouldEval(emode))
+ } else if (VarEvalMode_ShouldEval(emode))
ParseModifierPartExpr(&p, part, ch, emode);
else
ParseModifierPartDollar(&p, part);