Module Name: src
Committed By: rillig
Date: Mon Mar 15 11:41:07 UTC 2021
Modified Files:
src/usr.bin/make: cond.c nonints.h parse.c suff.c var.c
Log Message:
make: rename VARE_NONE to VARE_PARSE_ONLY
The name 'NONE' described the bit pattern, which was not useful to
understand its meaning. Omitting VARE_WANTRES only parses the
expression, without evaluating any part of it.
No functional change, not even in debug mode since Enum_FlagsToString
always returns "none" for all-bits-unset.
To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/usr.bin/make/cond.c
cvs rdiff -u -r1.203 -r1.204 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.550 -r1.551 src/usr.bin/make/parse.c
cvs rdiff -u -r1.346 -r1.347 src/usr.bin/make/suff.c
cvs rdiff -u -r1.883 -r1.884 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.257 src/usr.bin/make/cond.c:1.258
--- src/usr.bin/make/cond.c:1.257 Mon Feb 22 23:21:33 2021
+++ src/usr.bin/make/cond.c Mon Mar 15 11:41:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.257 2021/02/22 23:21:33 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.258 2021/03/15 11:41:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.257 2021/02/22 23:21:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.258 2021/03/15 11:41:07 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -266,7 +266,7 @@ ParseFuncArg(CondParser *par, const char
*/
VarEvalFlags eflags = doEval
? VARE_WANTRES | VARE_UNDEFERR
- : VARE_NONE;
+ : VARE_PARSE_ONLY;
FStr nestedVal;
(void)Var_Parse(&p, SCOPE_CMDLINE, eflags, &nestedVal);
/* TODO: handle errors */
@@ -422,7 +422,7 @@ CondParser_StringExpr(CondParser *par, c
/* if we are in quotes, an undefined variable is ok */
eflags = doEval && !quoted ? VARE_WANTRES | VARE_UNDEFERR
: doEval ? VARE_WANTRES
- : VARE_NONE;
+ : VARE_PARSE_ONLY;
nested_p = par->p;
atStart = nested_p == start;
@@ -740,8 +740,8 @@ ParseEmptyArg(CondParser *par MAKE_ATTR_
*out_arg = NULL;
(*pp)--; /* Make (*pp)[1] point to the '('. */
- (void)Var_Parse(pp, SCOPE_CMDLINE, doEval ? VARE_WANTRES : VARE_NONE,
- &val);
+ (void)Var_Parse(pp, SCOPE_CMDLINE,
+ doEval ? VARE_WANTRES : VARE_PARSE_ONLY, &val);
/* TODO: handle errors */
/* If successful, *pp points beyond the closing ')' now. */
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.203 src/usr.bin/make/nonints.h:1.204
--- src/usr.bin/make/nonints.h:1.203 Sun Feb 14 21:32:58 2021
+++ src/usr.bin/make/nonints.h Mon Mar 15 11:41:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.203 2021/02/14 21:32:58 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.204 2021/03/15 11:41:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -293,7 +293,7 @@ void Var_Init(void);
void Var_End(void);
typedef enum VarEvalFlags {
- VARE_NONE = 0,
+ VARE_PARSE_ONLY = 0,
/*
* Expand and evaluate variables during parsing.
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.550 src/usr.bin/make/parse.c:1.551
--- src/usr.bin/make/parse.c:1.550 Mon Feb 22 23:21:33 2021
+++ src/usr.bin/make/parse.c Mon Mar 15 11:41:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.550 2021/02/22 23:21:33 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.551 2021/03/15 11:41:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.550 2021/02/22 23:21:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.551 2021/03/15 11:41:07 rillig Exp $");
/* types and constants */
@@ -1042,8 +1042,8 @@ ParseDependencyTargetWord(const char **p
const char *nested_p = cp;
FStr nested_val;
- (void)Var_Parse(&nested_p, SCOPE_CMDLINE, VARE_NONE,
- &nested_val);
+ (void)Var_Parse(&nested_p, SCOPE_CMDLINE,
+ VARE_PARSE_ONLY, &nested_val);
/* TODO: handle errors */
FStr_Done(&nested_val);
cp += nested_p - cp;
@@ -1874,7 +1874,7 @@ VarCheckSyntax(VarAssignOp type, const c
if (type != VAR_SUBST && strchr(uvalue, '$') != NULL) {
char *expandedValue;
- (void)Var_Subst(uvalue, scope, VARE_NONE,
+ (void)Var_Subst(uvalue, scope, VARE_PARSE_ONLY,
&expandedValue);
/* TODO: handle errors */
free(expandedValue);
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.346 src/usr.bin/make/suff.c:1.347
--- src/usr.bin/make/suff.c:1.346 Tue Feb 23 15:56:29 2021
+++ src/usr.bin/make/suff.c Mon Mar 15 11:41:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.346 2021/02/23 15:56:29 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.347 2021/03/15 11:41:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.346 2021/02/23 15:56:29 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.347 2021/03/15 11:41:07 rillig Exp $");
typedef List SuffixList;
typedef ListNode SuffixListNode;
@@ -1309,7 +1309,7 @@ ExpandChildrenRegular(char *cp, GNode *p
const char *nested_p = cp;
FStr junk;
- (void)Var_Parse(&nested_p, pgn, VARE_NONE, &junk);
+ (void)Var_Parse(&nested_p, pgn, VARE_PARSE_ONLY, &junk);
/* TODO: handle errors */
if (junk.str == var_Error) {
Parse_Error(PARSE_FATAL,
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.883 src/usr.bin/make/var.c:1.884
--- src/usr.bin/make/var.c:1.883 Sun Mar 14 20:23:29 2021
+++ src/usr.bin/make/var.c Mon Mar 15 11:41:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.883 2021/03/14 20:23:29 rillig Exp $ */
+/* $NetBSD: var.c,v 1.884 2021/03/15 11:41:07 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.883 2021/03/14 20:23:29 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.884 2021/03/15 11:41:07 rillig Exp $");
typedef enum VarFlags {
VFL_NONE = 0,
@@ -2408,7 +2408,7 @@ ApplyModifier_Loop(const char **pp, Appl
args.scope = expr->scope;
(*pp)++; /* Skip the first '@' */
- res = ParseModifierPart(pp, '@', VARE_NONE, st, &args.tvar);
+ res = ParseModifierPart(pp, '@', VARE_PARSE_ONLY, st, &args.tvar);
if (res != VPR_OK)
return AMR_CLEANUP;
if (opts.strict && strchr(args.tvar, '$') != NULL) {
@@ -2419,7 +2419,7 @@ ApplyModifier_Loop(const char **pp, Appl
return AMR_CLEANUP;
}
- res = ParseModifierPart(pp, '@', VARE_NONE, st, &args.str);
+ res = ParseModifierPart(pp, '@', VARE_PARSE_ONLY, st, &args.str);
if (res != VPR_OK)
return AMR_CLEANUP;
@@ -2452,7 +2452,7 @@ ApplyModifier_Defined(const char **pp, A
Buffer buf;
const char *p;
- VarEvalFlags eflags = VARE_NONE;
+ VarEvalFlags eflags = VARE_PARSE_ONLY;
if (expr->eflags & VARE_WANTRES)
if ((**pp == 'D') == (expr->defined == DEF_REGULAR))
eflags = expr->eflags;
@@ -3292,8 +3292,8 @@ ApplyModifier_IfElse(const char **pp, Ap
VarParseResult res;
Boolean value = FALSE;
- VarEvalFlags then_eflags = VARE_NONE;
- VarEvalFlags else_eflags = VARE_NONE;
+ VarEvalFlags then_eflags = VARE_PARSE_ONLY;
+ VarEvalFlags else_eflags = VARE_PARSE_ONLY;
int cond_rc = COND_PARSE; /* anything other than COND_INVALID */
if (expr->eflags & VARE_WANTRES) {
