Module Name: src
Committed By: rillig
Date: Mon Sep 6 19:38:30 UTC 2021
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: var-eval-short.mk
Log Message:
make: fix typos in comments
To generate a diff of this commit:
cvs rdiff -u -r1.948 -r1.949 src/usr.bin/make/var.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/var-eval-short.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/var.c
diff -u src/usr.bin/make/var.c:1.948 src/usr.bin/make/var.c:1.949
--- src/usr.bin/make/var.c:1.948 Wed Aug 25 22:14:38 2021
+++ src/usr.bin/make/var.c Mon Sep 6 19:38:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.948 2021/08/25 22:14:38 rillig Exp $ */
+/* $NetBSD: var.c,v 1.949 2021/09/06 19:38:30 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.948 2021/08/25 22:14:38 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.949 2021/09/06 19:38:30 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -1975,7 +1975,7 @@ VarStrftime(const char *fmt, bool zulu,
* After parsing, the modifier is evaluated. The side effects from evaluating
* nested variable expressions in the modifier text often already happen
* during parsing though. For most modifiers this doesn't matter since their
- * only noticeable effect is that the update the value of the expression.
+ * only noticeable effect is that they update the value of the expression.
* Some modifiers such as ':sh' or '::=' have noticeable side effects though.
*
* Evaluating the modifier usually takes the current value of the variable
Index: src/usr.bin/make/unit-tests/var-eval-short.mk
diff -u src/usr.bin/make/unit-tests/var-eval-short.mk:1.5 src/usr.bin/make/unit-tests/var-eval-short.mk:1.6
--- src/usr.bin/make/unit-tests/var-eval-short.mk:1.5 Sun Apr 4 13:35:26 2021
+++ src/usr.bin/make/unit-tests/var-eval-short.mk Mon Sep 6 19:38:30 2021
@@ -1,4 +1,4 @@
-# $NetBSD: var-eval-short.mk,v 1.5 2021/04/04 13:35:26 rillig Exp $
+# $NetBSD: var-eval-short.mk,v 1.6 2021/09/06 19:38:30 rillig Exp $
#
# Tests for each variable modifier to ensure that they only do the minimum
# necessary computations. If the result of the expression is not needed, they
@@ -44,13 +44,13 @@ FAIL= ${:!echo unexpected 1>&2!}
.if 0 && ${:Uword:@var@${FAIL}@}
.endif
-# Before var.c,v 1.877 from 2021-03-14, the modifier ':[...]' did not expand
+# Before var.c 1.877 from 2021-03-14, the modifier ':[...]' did not expand
# the nested expression ${FAIL} and then tried to parse the unexpanded text,
# which failed since '$' is not a valid range character.
.if 0 && ${:Uword:[${FAIL}]}
.endif
-# Before var.c,v 1.867 from 2021-03-14, the modifier ':_' defined the variable
+# Before var.c 1.867 from 2021-03-14, the modifier ':_' defined the variable
# even though the whole expression should have only been parsed, not
# evaluated.
.if 0 && ${:Uword:_=VAR}
@@ -58,7 +58,7 @@ FAIL= ${:!echo unexpected 1>&2!}
. error
.endif
-# Before var.c,v 1.856 from 2021-03-14, the modifier ':C' did not expand the
+# Before var.c 1.856 from 2021-03-14, the modifier ':C' did not expand the
# nested expression ${FAIL} and then tried to compile the unexpanded text as a
# regular expression, which failed both because of the '{FAIL}', which is not
# a valid repetition, and because of the '****', which are repeated
