[src/trunk]: src/usr.bin/make/unit-tests make(1): in tests, replace "dollar c...

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

details:   https://anonhg.NetBSD.org/src/rev/37a0ed1412aa
branches:  trunk
changeset: 945666:37a0ed1412aa
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Nov 03 18:21:36 2020 +0000

description:
make(1): in tests, replace "dollar character" with "dollar sign"

diffstat:

 usr.bin/make/unit-tests/dollar.exp      |  2 +-
 usr.bin/make/unit-tests/dollar.mk       |  6 +++---
 usr.bin/make/unit-tests/varmod-loop.mk  |  4 ++--
 usr.bin/make/unit-tests/varmod-subst.mk |  6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs (78 lines):

diff -r cc0e1d4bf18c -r 37a0ed1412aa usr.bin/make/unit-tests/dollar.exp
--- a/usr.bin/make/unit-tests/dollar.exp        Tue Nov 03 18:18:31 2020 +0000
+++ b/usr.bin/make/unit-tests/dollar.exp        Tue Nov 03 18:21:36 2020 +0000
@@ -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 => <$>
diff -r cc0e1d4bf18c -r 37a0ed1412aa usr.bin/make/unit-tests/dollar.mk
--- a/usr.bin/make/unit-tests/dollar.mk Tue Nov 03 18:18:31 2020 +0000
+++ b/usr.bin/make/unit-tests/dollar.mk Tue Nov 03 18:21:36 2020 +0000
@@ -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 @@
 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'      '$$'
diff -r cc0e1d4bf18c -r 37a0ed1412aa usr.bin/make/unit-tests/varmod-loop.mk
--- a/usr.bin/make/unit-tests/varmod-loop.mk    Tue Nov 03 18:18:31 2020 +0000
+++ b/usr.bin/make/unit-tests/varmod-loop.mk    Tue Nov 03 18:21:36 2020 +0000
@@ -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 @@
        @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
diff -r cc0e1d4bf18c -r 37a0ed1412aa usr.bin/make/unit-tests/varmod-subst.mk
--- a/usr.bin/make/unit-tests/varmod-subst.mk   Tue Nov 03 18:18:31 2020 +0000
+++ b/usr.bin/make/unit-tests/varmod-subst.mk   Tue Nov 03 18:21:36 2020 +0000
@@ -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 @@
        # 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 @@
        @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