Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make: fix grammar in error message for malformed conditional

This commit is contained in:
rillig 2021-06-21 21:10:01 +00:00
parent a934c5f08c
commit 2a36eea04d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/make/cond.c
View File

@ -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, bool doEval)
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;
}

2
usr.bin/make/unit-tests/cond-token-plain.exp
View File

@ -39,7 +39,7 @@ make: "cond-token-plain.mk" line 130: Numbers can be composed from literals and
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: \\