 @@ -1,14 +1,14 @@
-/*	$NetBSD: cond.c,v 1.246 2021/01/21 13:51:24 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.247 2021/01/21 14:08:09 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.246 2021/01/21 13:51:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.247 2021/01/21 14:08:09 rillig Exp $");
 /*
  * The parsing of conditional expressions is based on this grammar:
  *	Or -> And '||' Or
  *	Or -> And
  *	And -> Term '&&' And
  *	And -> Term
  *	Term -> Function '(' Argument ')'
  *	Term -> Leaf Operator Leaf
  *	Term -> Leaf
  *	Term -> '(' Or ')'
  *	Term -> '!' Term
  *	Leaf -> "string"
 @@ -457,28 +457,36 @@ CondParser_String(CondParser *par, Boole
 		case '$':
 			/* if we are in quotes, an undefined variable is ok */
 			eflags =
 			    doEval && !quoted ? VARE_WANTRES | VARE_UNDEFERR :
 			    doEval ? VARE_WANTRES :
 			    VARE_NONE;
 			nested_p = par->p;
 			atStart = nested_p == start;
 			parseResult = Var_Parse(&nested_p, VAR_CMDLINE, eflags,
 			    &str);
 			/* TODO: handle errors */
 			if (str.str == var_Error) {
-				if (parseResult == VPR_ERR)
+				if (parseResult == VPR_ERR) {
 					/*
 					 * FIXME: Even if an error occurs,
 					 * there is no guarantee that it is
 					 * reported.
+					 *
 					 * See cond-token-plain.mk $$$$$$$$.
 					 */
 					par->printedError = TRUE;
+				}
 				/*
 				 * XXX: Can there be any situation in which
 				 * a returned var_Error requires freeIt?
 				 */
 				FStr_Done(&str);
 				/*
 				 * Even if !doEval, we still report syntax
 				 * errors, which is what getting var_Error
 				 * back with !doEval means.
 				 */
 				str = FStr_InitRefer(NULL);
 				goto cleanup;
+			}

 @@ -39,16 +39,17 @@ make: "cond-token-plain.mk" line 130: Nu
 CondParser_Eval: 0${:Ux01}
 make: "cond-token-plain.mk" line 134: Numbers can be composed from literals and variable expressions.
 CondParser_Eval: "" ==
 make: "cond-token-plain.mk" line 140: warning: Missing right-hand-side of operator
 make: "cond-token-plain.mk" line 140: Malformed conditional ("" ==)
 CondParser_Eval: == ""
 make: "cond-token-plain.mk" line 148: Malformed conditional (== "")
 CondParser_Eval: \\
 make: "cond-token-plain.mk" line 163: The variable '\\' is not defined.
 CondParser_Eval: \\
 make: "cond-token-plain.mk" line 168: Now the variable '\\' is defined.
 CondParser_Eval: "unquoted\"quoted" != unquoted"quoted
 lhs = "unquoted"quoted", rhs = "unquoted"quoted", op = !=
 CondParser_Eval: $$$$$$$$ != ""
 make: Fatal errors encountered -- cannot continue
 make: stopped in unit-tests
 exit status 1

 @@ -1,14 +1,14 @@
-# $NetBSD: cond-token-plain.mk,v 1.9 2021/01/21 13:52:32 rillig Exp $
+# $NetBSD: cond-token-plain.mk,v 1.10 2021/01/21 14:08:09 rillig Exp $
+#
 # Tests for plain tokens (that is, string literals without quotes)
 # in .if conditions.
 .MAKEFLAGS: -dc
 .if ${:Uvalue} != value
 .  error
 .endif
 # Malformed condition since comment parsing is done in an early phase
 # and removes the '#' and everything behind it long before the condition
 # parser gets to see it.
 @@ -167,18 +167,26 @@ ${:U\\\\}=	backslash
 .if \\
 .  info Now the variable '\\' is defined.
 .else
 .  error
 .endif
 # Anything that doesn't start with a double quote is considered a "bare word".
 # Strangely, a bare word may contain double quotes inside.  Nobody should ever
 # depend on this since it may well be unintended.  See CondParser_String.
 .if "unquoted\"quoted" != unquoted"quoted
 .  error
 .endif
 # FIXME: In CondParser_String, Var_Parse returns var_Error without a
 # corresponding error message.
 .if $$$$$$$$ != ""
 .  error
 .else
 .  error
 .endif
 # See cond-token-string.mk for similar tests where the condition is enclosed
 # in "quotes".
 all:
 	@:;