Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make: fix grammar in error message for malforme...



details:   https://anonhg.NetBSD.org/src/rev/5d00892302c8
branches:  trunk
changeset: 379846:5d00892302c8
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Jun 21 21:10:01 2021 +0000

description:
make: fix grammar in error message for malformed conditional

diffstat:

 usr.bin/make/cond.c                          |  6 +++---
 usr.bin/make/unit-tests/cond-token-plain.exp |  2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 36d57fff683c -r 5d00892302c8 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Mon Jun 21 21:07:35 2021 +0000
+++ b/usr.bin/make/cond.c       Mon Jun 21 21:10:01 2021 +0000
@@ -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;
        }
diff -r 36d57fff683c -r 5d00892302c8 usr.bin/make/unit-tests/cond-token-plain.exp
--- a/usr.bin/make/unit-tests/cond-token-plain.exp      Mon Jun 21 21:07:35 2021 +0000
+++ b/usr.bin/make/unit-tests/cond-token-plain.exp      Mon Jun 21 21:10:01 2021 +0000
@@ -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: \\



Home | Main Index | Thread Index | Old Index