 @@ -1,14 +1,14 @@
-/*	$NetBSD: cond.c,v 1.235 2021/01/10 21:20:46 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.236 2021/01/19 17:49:13 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -85,27 +85,27 @@
  *	Cond_restore_depth
  *			Save and restore the nesting of the conditions, at
  *			the start and end of including another makefile, to
  *			ensure that in each makefile the conditional
  *			directives are well-balanced.
  */
 #include <errno.h>
 #include "make.h"
 #include "dir.h"
 /*	"@(#)cond.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: cond.c,v 1.235 2021/01/10 21:20:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.236 2021/01/19 17:49:13 rillig Exp $");
 /*
  * The parsing of conditional expressions is based on this grammar:
  *	E -> F || E
  *	E -> F
  *	F -> T && F
  *	F -> T
  *	T -> defined(variable)
  *	T -> make(target)
  *	T -> exists(file)
  *	T -> empty(varspec)
  *	T -> target(name)
  *	T -> commands(name)
 @@ -939,26 +939,32 @@ CondParser_Term(CondParser *par, Boolean
 		if (t != TOK_ERROR) {
 			if (CondParser_Token(par, doEval) != TOK_RPAREN) {
 				t = TOK_ERROR;
+			}
+		}
 	} else if (t == TOK_NOT) {
 		t = CondParser_Term(par, doEval);
 		if (t == TOK_TRUE) {
 			t = TOK_FALSE;
 		} else if (t == TOK_FALSE) {
 			t = TOK_TRUE;
+		}
+	}
 	/*
 	 * FIXME: Can at least return TOK_AND, TOK_OR, TOK_RPAREN, maybe
 	 *  others as well.
 	 */
 	/* TODO: assert(t == TOK_ERROR); */
 	return t;
+}
 /*
  * Parse a conjunctive factor (nice name, wot?)
+ *
  *	F -> T && F | T
+ *
  * Results:
  *	TOK_TRUE, TOK_FALSE or TOK_ERROR
  */
 static Token
 CondParser_Factor(CondParser *par, Boolean doEval)

 @@ -1,6 +1,9 @@
 make: "cond-op-not.mk" line 29: Not empty evaluates to true.
 make: "cond-op-not.mk" line 37: Not space evaluates to false.
 make: "cond-op-not.mk" line 41: Not 0 evaluates to true.
 make: "cond-op-not.mk" line 49: Not 1 evaluates to false.
 make: "cond-op-not.mk" line 55: Not word evaluates to false.
-exit status 0
+make: "cond-op-not.mk" line 59: Malformed conditional (!)
 make: Fatal errors encountered -- cannot continue
 make: stopped in unit-tests
 exit status 1

 @@ -1,19 +1,36 @@
-# $NetBSD: cond-op-parentheses.mk,v 1.3 2020/11/15 14:58:14 rillig Exp $
+# $NetBSD: cond-op-parentheses.mk,v 1.4 2021/01/19 17:49:13 rillig Exp $
+#
 # Tests for parentheses in .if conditions.
 # TODO: Implementation
 # Test for deeply nested conditions.
 .if	((((((((((((((((((((((((((((((((((((((((((((((((((((((((	\
 	((((((((((((((((((((((((((((((((((((((((((((((((((((((((	\
 								\
 	))))))))))))))))))))))))))))))))))))))))))))))))))))))))	\
 	))))))))))))))))))))))))))))))))))))))))))))))))))))))))
 .  info Parentheses can be nested at least to depth 112.
 .else
 .  error
 .endif
 # An unbalanced opening parenthesis is a parse error.
 .if (
 .  error
 .else
 .  error
 .endif
 # An unbalanced closing parenthesis is a parse error.
+#
 # As of 2021-01-19, CondParser_Term returned TOK_RPAREN even though this
 # function promised to only ever return TOK_TRUE, TOK_FALSE or TOK_ERROR.
 .if )
 .  error
 .else
 .  error
 .endif
 all:
 	@:;

 @@ -1,14 +1,14 @@
-# $NetBSD: cond-op-not.mk,v 1.6 2020/11/15 14:58:14 rillig Exp $
+# $NetBSD: cond-op-not.mk,v 1.7 2021/01/19 17:49:13 rillig Exp $
+#
 # Tests for the ! operator in .if conditions, which negates its argument.
 # The exclamation mark negates its operand.
 .if !1
 .  error
 .endif
 # Exclamation marks can be chained.
 # This doesn't happen in practice though.
 .if !!!1
 .  error
 .endif
 @@ -45,15 +45,22 @@
 .if !${:U1}
 .  info Not 1 evaluates to true.
 .else
 .  info Not 1 evaluates to false.
 .endif
 .if !${:Uword}
 .  info Not word evaluates to true.
 .else
 .  info Not word evaluates to false.
 .endif
 # A single exclamation mark is a parse error.
 .if !
 .  error
 .else
 .  error
 .endif
 all:
 	@:;