Module Name: src
Committed By: rillig
Date: Mon Jun 21 21:10:01 UTC 2021
Modified Files:
src/usr.bin/make: cond.c
src/usr.bin/make/unit-tests: cond-token-plain.exp
Log Message:
make: fix grammar in error message for malformed conditional
To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.269 src/usr.bin/make/cond.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/cond-token-plain.exp
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.268 src/usr.bin/make/cond.c:1.269
--- src/usr.bin/make/cond.c:1.268 Mon Jun 21 21:07:35 2021
+++ src/usr.bin/make/cond.c Mon Jun 21 21:10:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.268 2021/06/21 21:07:35 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.269 2021/06/21 21:10:01 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.268 2021/06/21 21:07:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.269 2021/06/21 21:10:01 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -699,7 +699,7 @@ CondParser_Comparison(CondParser *par, b
if (par->p[0] == '\0') {
Parse_Error(PARSE_FATAL,
- "Missing right-hand-side of operator '%s'", opname[op]);
+ "Missing right-hand side of operator '%s'", opname[op]);
par->printedError = true;
goto done_lhs;
}
Index: src/usr.bin/make/unit-tests/cond-token-plain.exp
diff -u src/usr.bin/make/unit-tests/cond-token-plain.exp:1.9 src/usr.bin/make/unit-tests/cond-token-plain.exp:1.10
--- src/usr.bin/make/unit-tests/cond-token-plain.exp:1.9 Thu Jan 21 23:32:28 2021
+++ src/usr.bin/make/unit-tests/cond-token-plain.exp Mon Jun 21 21:10:01 2021
@@ -39,7 +39,7 @@ 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: Missing right-hand-side of operator '=='
+make: "cond-token-plain.mk" line 140: Missing right-hand side of operator '=='
CondParser_Eval: == ""
make: "cond-token-plain.mk" line 148: Malformed conditional (== "")
CondParser_Eval: \\
