Module Name: src
Committed By: rillig
Date: Tue Nov 3 18:21:37 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: dollar.exp dollar.mk varmod-loop.mk
varmod-subst.mk
Log Message:
make(1): in tests, replace "dollar character" with "dollar sign"
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/dollar.exp \
src/usr.bin/make/unit-tests/dollar.mk
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/varmod-loop.mk \
src/usr.bin/make/unit-tests/varmod-subst.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/unit-tests/dollar.exp
diff -u src/usr.bin/make/unit-tests/dollar.exp:1.3 src/usr.bin/make/unit-tests/dollar.exp:1.4
--- src/usr.bin/make/unit-tests/dollar.exp:1.3 Sun May 17 09:37:48 2020
+++ src/usr.bin/make/unit-tests/dollar.exp Tue Nov 3 18:21:36 2020
@@ -1,7 +1,7 @@
Printing dollar from literals and variables
-To survive the parser, a dollar character must be doubled.
+To survive the parser, a dollar sign must be doubled.
1 dollar literal => <single-quote-var-value>
1 dollar literal eol => <>
2 dollar literal => <$>
Index: src/usr.bin/make/unit-tests/dollar.mk
diff -u src/usr.bin/make/unit-tests/dollar.mk:1.3 src/usr.bin/make/unit-tests/dollar.mk:1.4
--- src/usr.bin/make/unit-tests/dollar.mk:1.3 Sun May 17 09:37:48 2020
+++ src/usr.bin/make/unit-tests/dollar.mk Tue Nov 3 18:21:36 2020
@@ -1,6 +1,6 @@
-# $NetBSD: dollar.mk,v 1.3 2020/05/17 09:37:48 rillig Exp $
+# $NetBSD: dollar.mk,v 1.4 2020/11/03 18:21:36 rillig Exp $
#
-# Test the various places where a dollar character can appear and
+# Test the various places where a dollar sign can appear and
# see what happens. There are lots of surprises here.
#
@@ -30,7 +30,7 @@ ${:U'}= single-quote-var-value'
all:
$H 'Printing dollar from literals and variables'
- $C 'To survive the parser, a dollar character must be doubled.'
+ $C 'To survive the parser, a dollar sign must be doubled.'
$T '1 dollar literal' '$'
$T '1 dollar literal eol' ''$
$T '2 dollar literal' '$$'
Index: src/usr.bin/make/unit-tests/varmod-loop.mk
diff -u src/usr.bin/make/unit-tests/varmod-loop.mk:1.5 src/usr.bin/make/unit-tests/varmod-loop.mk:1.6
--- src/usr.bin/make/unit-tests/varmod-loop.mk:1.5 Sat Oct 31 12:34:03 2020
+++ src/usr.bin/make/unit-tests/varmod-loop.mk Tue Nov 3 18:21:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-loop.mk,v 1.5 2020/10/31 12:34:03 rillig Exp $
+# $NetBSD: varmod-loop.mk,v 1.6 2020/11/03 18:21:36 rillig Exp $
#
# Tests for the :@var@...${var}...@ variable modifier.
@@ -57,7 +57,7 @@ mod-loop-varname-dollar:
@echo $@:${1 2 3:L:@v$$@($v)@:Q}.
@echo $@:${1 2 3:L:@v$$$@($v)@:Q}.
-# Demonstrate that it is possible to generate dollar characters using the
+# Demonstrate that it is possible to generate dollar signs using the
# :@ modifier.
#
# These are edge cases that could have resulted in a parse error as well
Index: src/usr.bin/make/unit-tests/varmod-subst.mk
diff -u src/usr.bin/make/unit-tests/varmod-subst.mk:1.5 src/usr.bin/make/unit-tests/varmod-subst.mk:1.6
--- src/usr.bin/make/unit-tests/varmod-subst.mk:1.5 Tue Nov 3 18:18:31 2020
+++ src/usr.bin/make/unit-tests/varmod-subst.mk Tue Nov 3 18:21:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-subst.mk,v 1.5 2020/11/03 18:18:31 rillig Exp $
+# $NetBSD: varmod-subst.mk,v 1.6 2020/11/03 18:21:36 rillig Exp $
#
# Tests for the :S,from,to, variable modifier.
@@ -132,7 +132,7 @@ mod-subst-chain:
# modifiers with the matching modifiers.
@echo ${:Uvalue:S,a,x,i}.
-# No matter how many dollar characters there are, they all get merged
+# No matter how many dollar signs there are, they all get merged
# into a single dollar by the :S modifier.
#
# As of 2020-08-09, this is because ParseModifierPart sees a '$' and
@@ -156,7 +156,7 @@ mod-subst-dollar:
@echo $@:${:U40:S,^,$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$,:Q}:
# This generates no dollar at all:
@echo $@:${:UU8:S,^,${:U$$$$$$$$},:Q}:
-# Here is an alternative way to generate dollar characters.
+# Here is an alternative way to generate dollar signs.
# It's unexpectedly complicated though.
@echo $@:${:U:range=5:ts\x24:C,[0-9],,g:Q}:
# In modifiers, dollars are escaped using the backslash, not using another
