[src/trunk]: src/usr.bin/make make(1): rename CondParser_Func to CondParser_L...

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

details:   https://anonhg.NetBSD.org/src/rev/65ff274fa96e
branches:  trunk
changeset: 1016142:65ff274fa96e
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 08 23:08:49 2020 +0000

description:
make(1): rename CondParser_Func to CondParser_LeafToken

The previous name was misleading since the function did not only parse
function call expressions.

diffstat:

 usr.bin/make/cond.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 49ca42571c3a -r 65ff274fa96e usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Sun Nov 08 23:05:47 2020 +0000
+++ b/usr.bin/make/cond.c       Sun Nov 08 23:08:49 2020 +0000
@@ -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 @@
     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 @@
        return CondParser_Comparison(par, doEval);
 
     default:
-       return CondParser_Func(par, doEval);
+       return CondParser_LeafToken(par, doEval);
     }
 }