Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make: add functions for assigning the value of ...
details: https://anonhg.NetBSD.org/src/rev/73207ae644a4
branches: trunk
changeset: 959441:73207ae644a4
user: rillig <rillig%NetBSD.org@localhost>
date: Sun Feb 14 13:53:28 2021 +0000
description:
make: add functions for assigning the value of an expression
The plan is to have only the "current value" of the expression as a
member, not the "new value". To do this consistently and get the memory
management right, there must be a single place (or two) where the value
of the expression is updated.
No functional change.
diffstat:
usr.bin/make/var.c | 124 +++++++++++++++++++++++++++++-----------------------
1 files changed, 68 insertions(+), 56 deletions(-)
diffs (truncated from 432 to 300 lines):
diff -r 97b13d13e03d -r 73207ae644a4 usr.bin/make/var.c
--- a/usr.bin/make/var.c Sun Feb 14 13:46:01 2021 +0000
+++ b/usr.bin/make/var.c Sun Feb 14 13:53:28 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.812 2021/02/14 13:46:01 rillig Exp $ */
+/* $NetBSD: var.c,v 1.813 2021/02/14 13:53:28 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.812 2021/02/14 13:46:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.813 2021/02/14 13:53:28 rillig Exp $");
typedef enum VarFlags {
VAR_NONE = 0,
@@ -2028,7 +2028,7 @@
*
* Evaluating the modifier usually takes the current value of the variable
* expression from st->val, or the variable name from st->var->name and stores
- * the result in st->newVal.
+ * the result in st->newValue.
*
* If evaluating fails (as of 2020-08-23), an error message is printed using
* Error. This function has no side-effects, it really just prints the error
@@ -2075,7 +2075,7 @@
* The new value of the expression, after applying the modifier,
* never NULL.
*/
- FStr newVal;
+ FStr newValue;
/* Word separator in expansions (see the :ts modifier). */
char sep;
/*
@@ -2096,6 +2096,18 @@
expr->exprStatus = VES_DEF;
}
+static void
+Expr_SetValueOwn(Expr *expr, char *value)
+{
+ expr->newValue = FStr_InitOwn(value);
+}
+
+static void
+Expr_SetValueRefer(Expr *expr, const char *value)
+{
+ expr->newValue = FStr_InitRefer(value);
+}
+
typedef enum ApplyModifierResult {
/* Continue parsing */
AMR_OK,
@@ -2384,7 +2396,7 @@
args.eflags = st->eflags & ~(unsigned)VARE_KEEP_DOLLAR;
prev_sep = st->sep;
st->sep = ' '; /* XXX: should be st->sep for consistency */
- st->newVal = FStr_InitOwn(
+ Expr_SetValueOwn(st,
ModifyWords(val, ModifyWord_Loop, &args, st->oneBigWord, st->sep));
st->sep = prev_sep;
/* XXX: Consider restoring the previous variable instead of deleting. */
@@ -2449,9 +2461,9 @@
Expr_Define(st);
if (eflags & VARE_WANTRES) {
- st->newVal = FStr_InitOwn(Buf_DoneData(&buf));
+ Expr_SetValueOwn(st, Buf_DoneData(&buf));
} else {
- st->newVal = FStr_InitRefer(val);
+ Expr_SetValueRefer(st, val);
Buf_Done(&buf);
}
return AMR_OK;
@@ -2462,7 +2474,7 @@
ApplyModifier_Literal(const char **pp, ApplyModifiersState *st)
{
Expr_Define(st);
- st->newVal = FStr_InitOwn(bmake_strdup(st->var->name.str));
+ Expr_SetValueOwn(st, bmake_strdup(st->var->name.str));
(*pp)++;
return AMR_OK;
}
@@ -2508,7 +2520,7 @@
utc = 0;
*pp = mod + 6;
}
- st->newVal = FStr_InitOwn(VarStrftime(val, TRUE, utc));
+ Expr_SetValueOwn(st, VarStrftime(val, TRUE, utc));
return AMR_OK;
}
@@ -2535,7 +2547,7 @@
utc = 0;
*pp = mod + 9;
}
- st->newVal = FStr_InitOwn(VarStrftime(val, FALSE, utc));
+ Expr_SetValueOwn(st, VarStrftime(val, FALSE, utc));
return AMR_OK;
}
@@ -2546,7 +2558,7 @@
if (!ModMatch(*pp, "hash", st->endc))
return AMR_UNKNOWN;
- st->newVal = FStr_InitOwn(VarHash(val));
+ Expr_SetValueOwn(st, VarHash(val));
*pp += 4;
return AMR_OK;
}
@@ -2571,7 +2583,7 @@
}
if (path == NULL)
path = bmake_strdup(st->var->name.str);
- st->newVal = FStr_InitOwn(path);
+ Expr_SetValueOwn(st, path);
(*pp)++;
return AMR_OK;
@@ -2592,9 +2604,9 @@
errfmt = NULL;
if (st->eflags & VARE_WANTRES)
- st->newVal = FStr_InitOwn(Cmd_Exec(cmd, &errfmt));
+ Expr_SetValueOwn(st, Cmd_Exec(cmd, &errfmt));
else
- st->newVal = FStr_InitRefer("");
+ Expr_SetValueRefer(st, "");
if (errfmt != NULL)
Error(errfmt, cmd); /* XXX: why still return AMR_OK? */
free(cmd);
@@ -2647,7 +2659,7 @@
Buf_AddInt(&buf, 1 + (int)i);
}
- st->newVal = FStr_InitOwn(Buf_DoneData(&buf));
+ Expr_SetValueOwn(st, Buf_DoneData(&buf));
return AMR_OK;
}
@@ -2724,8 +2736,8 @@
st->var->name.str, val, pattern);
callback = mod[0] == 'M' ? ModifyWord_Match : ModifyWord_NoMatch;
- st->newVal = FStr_InitOwn(ModifyWords(val, callback, pattern,
- st->oneBigWord, st->sep));
+ Expr_SetValueOwn(st,
+ ModifyWords(val, callback, pattern, st->oneBigWord, st->sep));
free(pattern);
return AMR_OK;
}
@@ -2784,8 +2796,8 @@
break;
}
- st->newVal = FStr_InitOwn(ModifyWords(val, ModifyWord_Subst, &args,
- oneBigWord, st->sep));
+ Expr_SetValueOwn(st,
+ ModifyWords(val, ModifyWord_Subst, &args, oneBigWord, st->sep));
free(lhs);
free(rhs);
@@ -2848,7 +2860,7 @@
args.nsub = args.re.re_nsub + 1;
if (args.nsub > 10)
args.nsub = 10;
- st->newVal = FStr_InitOwn(
+ Expr_SetValueOwn(st,
ModifyWords(val, ModifyWord_SubstRegex, &args,
oneBigWord, st->sep));
regfree(&args.re);
@@ -2863,7 +2875,7 @@
ApplyModifier_Quote(const char **pp, const char *val, ApplyModifiersState *st)
{
if ((*pp)[1] == st->endc || (*pp)[1] == ':') {
- st->newVal = FStr_InitOwn(VarQuote(val, **pp == 'q'));
+ Expr_SetValueOwn(st, VarQuote(val, **pp == 'q'));
(*pp)++;
return AMR_OK;
} else
@@ -2944,7 +2956,7 @@
}
ok:
- st->newVal = FStr_InitOwn(
+ Expr_SetValueOwn(st,
ModifyWords(val, ModifyWord_Copy, NULL, st->oneBigWord, st->sep));
return AMR_OK;
}
@@ -2998,7 +3010,7 @@
}
if (mod[1] == 'A') { /* :tA */
- st->newVal = FStr_InitOwn(
+ Expr_SetValueOwn(st,
ModifyWords(val, ModifyWord_Realpath, NULL,
st->oneBigWord, st->sep));
*pp = mod + 2;
@@ -3006,20 +3018,20 @@
}
if (mod[1] == 'u') { /* :tu */
- st->newVal = FStr_InitOwn(str_toupper(val));
+ Expr_SetValueOwn(st, str_toupper(val));
*pp = mod + 2;
return AMR_OK;
}
if (mod[1] == 'l') { /* :tl */
- st->newVal = FStr_InitOwn(str_tolower(val));
+ Expr_SetValueOwn(st, str_tolower(val));
*pp = mod + 2;
return AMR_OK;
}
if (mod[1] == 'W' || mod[1] == 'w') { /* :tW, :tw */
st->oneBigWord = mod[1] == 'W';
- st->newVal = FStr_InitRefer(val);
+ Expr_SetValueRefer(st, val);
*pp = mod + 2;
return AMR_OK;
}
@@ -3051,7 +3063,7 @@
if (estr[0] == '#' && estr[1] == '\0') { /* Found ":[#]" */
if (st->oneBigWord) {
- st->newVal = FStr_InitRefer("1");
+ Expr_SetValueRefer(st, "1");
} else {
Buffer buf;
@@ -3062,20 +3074,20 @@
/* 3 digits + '\0' is usually enough */
Buf_InitSize(&buf, 4);
Buf_AddInt(&buf, (int)ac);
- st->newVal = FStr_InitOwn(Buf_DoneData(&buf));
+ Expr_SetValueOwn(st, Buf_DoneData(&buf));
}
goto ok;
}
if (estr[0] == '*' && estr[1] == '\0') { /* Found ":[*]" */
st->oneBigWord = TRUE;
- st->newVal = FStr_InitRefer(val);
+ Expr_SetValueRefer(st, val);
goto ok;
}
if (estr[0] == '@' && estr[1] == '\0') { /* Found ":[@]" */
st->oneBigWord = FALSE;
- st->newVal = FStr_InitRefer(val);
+ Expr_SetValueRefer(st, val);
goto ok;
}
@@ -3104,7 +3116,7 @@
if (first == 0 && last == 0) {
/* ":[0]" or perhaps ":[0..0]" */
st->oneBigWord = TRUE;
- st->newVal = FStr_InitRefer(val);
+ Expr_SetValueRefer(st, val);
goto ok;
}
@@ -3113,7 +3125,7 @@
goto bad_modifier;
/* Normal case: select the words described by first and last. */
- st->newVal = FStr_InitOwn(
+ Expr_SetValueOwn(st,
VarSelectWords(st->sep, st->oneBigWord, val, first, last));
ok:
@@ -3177,7 +3189,7 @@
return AMR_BAD;
}
- st->newVal = FStr_InitOwn(Words_JoinFree(words));
+ Expr_SetValueOwn(st, Words_JoinFree(words));
return AMR_OK;
}
@@ -3219,10 +3231,10 @@
}
if (value) {
- st->newVal = FStr_InitOwn(then_expr);
+ Expr_SetValueOwn(st, then_expr);
free(else_expr);
} else {
- st->newVal = FStr_InitOwn(else_expr);
+ Expr_SetValueOwn(st, else_expr);
free(then_expr);
}
Expr_Define(st);
@@ -3326,7 +3338,7 @@
}
}
Home |
Main Index |
Thread Index |
Old Index