Fri Feb 11 21:18:10 2022 UTC ()

make: simplify control flow in CondParser_Comparison

No functional change.


(rillig)

diff -r1.329 -r1.330 src/usr.bin/make/cond.c

--- src/usr.bin/make/cond.c 2022/02/09 21:09:24	1.329
+++ src/usr.bin/make/cond.c 2022/02/11 21:18:09	1.330

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cond.c,v 1.329 2022/02/09 21:09:24 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.330 2022/02/11 21:18: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.329 2022/02/09 21:09:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.330 2022/02/11 21:18:09 rillig Exp $");
 /*
  * Conditional expressions conform to this grammar:
  *	Or -> And ('||' And)*
  *	And -> Term ('&&' Term)*
  *	Term -> Function '(' Argument ')'
  *	Term -> Leaf Operator Leaf
  *	Term -> Leaf
  *	Term -> '(' Or ')'
  *	Term -> '!' Term
  *	Leaf -> "string"
  *	Leaf -> Number
  *	Leaf -> VariableExpression
 @@ -653,38 +653,31 @@ CondParser_Comparison(CondParser *par, b
 		goto done_lhs;
+	}
 	CondParser_SkipWhitespace(par);
 	if (par->p[0] == '\0') {
 		Parse_Error(PARSE_FATAL,
 		    "Missing right-hand side of operator '%s'", opname[op]);
 		par->printedError = true;
 		goto done_lhs;
+	}
 	CondParser_Leaf(par, doEval, true, &rhs, &rhsQuoted);
-	if (rhs.str == NULL)
+	t = rhs.str == NULL ? TOK_ERROR
-		goto done_rhs;
+	    : !doEval ? TOK_FALSE
 	    : EvalCompare(par, lhs.str, lhsQuoted, op, rhs.str, rhsQuoted);
 	if (!doEval) {
 		t = TOK_FALSE;
 		goto done_rhs;
 	t = EvalCompare(par, lhs.str, lhsQuoted, op, rhs.str, rhsQuoted);
 done_rhs:
 	FStr_Done(&rhs);
 done_lhs:
 	FStr_Done(&lhs);
 	return t;
+}
 /*
  * The argument to empty() is a variable name, optionally followed by
  * variable modifiers.
  */
 static bool
 CondParser_FuncCallEmpty(CondParser *par, bool doEval, Token *out_token)
+{
 	const char *cp = par->p;