[src/trunk]: src/usr.bin/make make(1): fix tests directive-ifmake and varcmd ...

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

details:   https://anonhg.NetBSD.org/src/rev/f8714749f70a
branches:  trunk
changeset: 945741:f8714749f70a
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Nov 06 20:50:48 2020 +0000

description:
make(1): fix tests directive-ifmake and varcmd with custom boolean

When make is compiled with -DUSE_UCHAR_BOOLEAN, these tests failed.
Merge duplicate code and don't depend on the actual value of TRUE when
evaluating conditions.

diffstat:

 usr.bin/make/cond.c |  23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r 03b288a4855b -r f8714749f70a usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Fri Nov 06 20:29:35 2020 +0000
+++ b/usr.bin/make/cond.c       Fri Nov 06 20:50:48 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cond.c,v 1.175 2020/11/05 17:27:16 rillig Exp $        */
+/*     $NetBSD: cond.c,v 1.176 2020/11/06 20:50:48 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.175 2020/11/05 17:27:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.176 2020/11/06 20:50:48 rillig Exp $");
 
 /*
  * The parsing of conditional expressions is based on this grammar:
@@ -502,13 +502,15 @@
     return str;
 }
 
-/* The different forms of .if directives. */
-static const struct If {
+struct If {
     const char *form;          /* Form of if */
     size_t formlen;            /* Length of form */
     Boolean doNot;             /* TRUE if default function should be negated */
     Boolean (*defProc)(size_t, const char *); /* Default function to apply */
-} ifs[] = {
+};
+
+/* The different forms of .if directives. */
+static const struct If ifs[] = {
     { "def",   3, FALSE, FuncDefined },
     { "ndef",  4, TRUE,  FuncDefined },
     { "make",  4, FALSE, FuncMake },
@@ -517,6 +519,13 @@
     { NULL,    0, FALSE, NULL }
 };
 
+static Boolean
+If_Eval(const struct If *if_info, const char *arg, size_t arglen)
+{
+    Boolean res = if_info->defProc(arglen, arg);
+    return (if_info->doNot ? !res : res) ? TOK_TRUE : TOK_FALSE;
+}
+
 /* Evaluate a "comparison without operator", such as in ".if ${VAR}" or
  * ".if 0". */
 static Token
@@ -537,7 +546,7 @@
        return lhs[0] != 0;
 
     /* Otherwise action default test ... */
-    return par->if_info->defProc(strlen(lhs), lhs) == !par->if_info->doNot;
+    return If_Eval(par->if_info, lhs, strlen(lhs));
 }
 
 /* Evaluate a numerical comparison, such as in ".if ${VAR} >= 9". */
@@ -785,7 +794,7 @@
      * after .if must have been taken literally, so the argument cannot
      * be empty - even if it contained a variable expansion.
      */
-    t = !doEval || par->if_info->defProc(arglen, arg) == !par->if_info->doNot;
+    t = !doEval || If_Eval(par->if_info, arg, arglen);
     free(arg);
     return t;
 }