Module Name: src
Committed By: rillig
Date: Sat Dec 11 10:28:59 UTC 2021
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make: simplify evaluation of function 'empty'
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.293 -r1.294 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.293 src/usr.bin/make/cond.c:1.294
--- src/usr.bin/make/cond.c:1.293 Sat Dec 11 10:21:02 2021
+++ src/usr.bin/make/cond.c Sat Dec 11 10:28:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.293 2021/12/11 10:21:02 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.294 2021/12/11 10:28:59 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.293 2021/12/11 10:21:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.294 2021/12/11 10:28:59 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -753,13 +753,9 @@ CondParser_FuncCallEmpty(CondParser *par
return false;
tok = ParseEmptyArg(&cp, doEval);
- if (tok == TOK_ERROR) {
- par->p = cp;
- *out_token = TOK_ERROR;
- return true;
- }
-
- *out_token = ToToken(!doEval || tok == TOK_TRUE);
+ if (tok == TOK_FALSE && !doEval)
+ tok = TOK_TRUE;
+ *out_token = tok;
par->p = cp;
return true;
}
