Module Name: src
Committed By: rillig
Date: Sun Nov 8 23:08:49 UTC 2020
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make(1): rename CondParser_Func to CondParser_LeafToken
The previous name was misleading since the function did not only parse
function call expressions.
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/usr.bin/make/cond.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.193 src/usr.bin/make/cond.c:1.194
--- src/usr.bin/make/cond.c:1.193 Sun Nov 8 23:05:47 2020
+++ src/usr.bin/make/cond.c Sun Nov 8 23:08:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.193 2020/11/08 23:05:47 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.194 2020/11/08 23:08:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -93,7 +93,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.193 2020/11/08 23:05:47 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.194 2020/11/08 23:08:49 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -718,8 +718,10 @@ FuncEmpty(size_t arglen, const char *arg
return arglen == 1;
}
+/* Parse a function call, a number, a variable expression or a string
+ * literal. */
static Token
-CondParser_Func(CondParser *par, Boolean doEval)
+CondParser_LeafToken(CondParser *par, Boolean doEval)
{
static const struct fn_def {
const char *fn_name;
@@ -846,7 +848,7 @@ CondParser_Token(CondParser *par, Boolea
return CondParser_Comparison(par, doEval);
default:
- return CondParser_Func(par, doEval);
+ return CondParser_LeafToken(par, doEval);
}
}
