[src/trunk]: src/usr.bin/make make(1): update references to the renamed CondP...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee1e01c85749
branches:  trunk
changeset: 958789:ee1e01c85749
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Jan 19 18:20:30 2021 +0000

description:
make(1): update references to the renamed CondParser functions

diffstat:

 usr.bin/make/cond.c                |  6 +++---
 usr.bin/make/unit-tests/cond-op.mk |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 4e3b33a19a05 -r ee1e01c85749 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Tue Jan 19 18:18:43 2021 +0000
+++ b/usr.bin/make/cond.c       Tue Jan 19 18:20:30 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cond.c,v 1.239 2021/01/19 18:18:43 rillig Exp $        */
+/*     $NetBSD: cond.c,v 1.240 2021/01/19 18:20:30 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.239 2021/01/19 18:18:43 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.240 2021/01/19 18:20:30 rillig Exp $");
 
 /*
  * The parsing of conditional expressions is based on this grammar:
@@ -128,7 +128,7 @@
  * the function given in the terminal, they return either TOK_TRUE or
  * TOK_FALSE.
  *
- * All non-terminal functions (CondParser_Expr, CondParser_Factor and
+ * All non-terminal functions (CondParser_Or, CondParser_And and
  * CondParser_Term) return either TOK_FALSE, TOK_TRUE, or TOK_ERROR on error.
  */
 typedef enum Token {
diff -r 4e3b33a19a05 -r ee1e01c85749 usr.bin/make/unit-tests/cond-op.mk
--- a/usr.bin/make/unit-tests/cond-op.mk        Tue Jan 19 18:18:43 2021 +0000
+++ b/usr.bin/make/unit-tests/cond-op.mk        Tue Jan 19 18:20:30 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: cond-op.mk,v 1.12 2021/01/19 18:13:37 rillig Exp $
+# $NetBSD: cond-op.mk,v 1.13 2021/01/19 18:20:30 rillig Exp $
 #
 # Tests for operators like &&, ||, ! in .if conditions.
 #
@@ -61,8 +61,8 @@
 # As soon as the parser sees the '$', it knows that the condition will
 # be malformed.  Therefore there is no point in evaluating it.
 #
-# As of 2020-09-11, that part of the condition is evaluated nevertheless,
-# since CondParser_Expr just requests the next token, without restricting
+# As of 2021-01-20, that part of the condition is evaluated nevertheless,
+# since CondParser_Or just requests the next token, without restricting
 # the token to the expected tokens.  If the parser were to restrict the
 # valid follow tokens for the token "0" to those that can actually produce
 # a correct condition (which in this case would be comparison operators,