Module Name: src
Committed By: rillig
Date: Tue Sep 21 20:51:39 UTC 2021
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make: fix documentation about operator associativity in conditions
To generate a diff of this commit:
cvs rdiff -u -r1.270 -r1.271 src/usr.bin/make/cond.c
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.270 src/usr.bin/make/cond.c:1.271
--- src/usr.bin/make/cond.c:1.270 Thu Jul 29 06:35:20 2021
+++ src/usr.bin/make/cond.c Tue Sep 21 20:51:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.270 2021/07/29 06:35:20 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.271 2021/09/21 20:51:38 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,14 +95,14 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.270 2021/07/29 06:35:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.271 2021/09/21 20:51:38 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
- * Or -> And '||' Or
* Or -> And
- * And -> Term '&&' And
+ * Or -> Or '||' And
* And -> Term
+ * And -> And '&&' Term
* Term -> Function '(' Argument ')'
* Term -> Leaf Operator Leaf
* Term -> Leaf
@@ -977,8 +977,8 @@ CondParser_Term(CondParser *par, bool do
}
/*
- * And -> Term '&&' And
* And -> Term
+ * And -> And '&&' Term
*/
static CondResult
CondParser_And(CondParser *par, bool doEval)
@@ -1004,8 +1004,8 @@ CondParser_And(CondParser *par, bool doE
}
/*
- * Or -> And '||' Or
* Or -> And
+ * Or -> Or '||' And
*/
static CondResult
CondParser_Or(CondParser *par, bool doEval)
