Module Name: src Committed By: rillig Date: Tue Jan 19 18:20:30 UTC 2021
Modified Files: src/usr.bin/make: cond.c src/usr.bin/make/unit-tests: cond-op.mk Log Message: make(1): update references to the renamed CondParser functions To generate a diff of this commit: cvs rdiff -u -r1.239 -r1.240 src/usr.bin/make/cond.c cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/cond-op.mk 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.239 src/usr.bin/make/cond.c:1.240 --- src/usr.bin/make/cond.c:1.239 Tue Jan 19 18:18:43 2021 +++ src/usr.bin/make/cond.c Tue Jan 19 18:20:30 2021 @@ -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 @@ MAKE_RCSID("$NetBSD: cond.c,v 1.239 2021 * 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 { Index: src/usr.bin/make/unit-tests/cond-op.mk diff -u src/usr.bin/make/unit-tests/cond-op.mk:1.12 src/usr.bin/make/unit-tests/cond-op.mk:1.13 --- src/usr.bin/make/unit-tests/cond-op.mk:1.12 Tue Jan 19 18:13:37 2021 +++ src/usr.bin/make/unit-tests/cond-op.mk Tue Jan 19 18:20:30 2021 @@ -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,