[src/trunk]: src/usr.bin/make make(1): reword variable invocation to variable...

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

details:   https://anonhg.NetBSD.org/src/rev/ab155e7dfd9b
branches:  trunk
changeset: 938645:ab155e7dfd9b
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Sep 12 19:41:20 2020 +0000

description:
make(1): reword variable invocation to variable expression

Variables are a passive thing.  They cannot be invoked, they can only be
evaluated.

diffstat:

 usr.bin/make/parse.c |   8 ++++----
 usr.bin/make/suff.c  |   8 ++++----
 usr.bin/make/var.c   |  12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diffs (123 lines):

diff -r 3ac0576f2656 -r ab155e7dfd9b usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Sat Sep 12 19:33:02 2020 +0000
+++ b/usr.bin/make/parse.c      Sat Sep 12 19:41:20 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.294 2020/09/12 18:19:50 rillig Exp $       */
+/*     $NetBSD: parse.c,v 1.295 2020/09/12 19:41:20 rillig Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.294 2020/09/12 18:19:50 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.295 2020/09/12 19:41:20 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c    8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.294 2020/09/12 18:19:50 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.295 2020/09/12 19:41:20 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1927,7 +1927,7 @@
     } else if (type == VAR_SUBST) {
        /*
         * Allow variables in the old value to be undefined, but leave their
-        * invocation alone -- this is done by forcing oldVars to be false.
+        * expressions alone -- this is done by forcing oldVars to be false.
         * XXX: This can cause recursive variables, but that's not hard to do,
         * and this allows someone to do something like
         *
diff -r 3ac0576f2656 -r ab155e7dfd9b usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Sat Sep 12 19:33:02 2020 +0000
+++ b/usr.bin/make/suff.c       Sat Sep 12 19:41:20 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.152 2020/09/12 18:19:50 rillig Exp $        */
+/*     $NetBSD: suff.c,v 1.153 2020/09/12 19:41:20 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.152 2020/09/12 18:19:50 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.153 2020/09/12 19:41:20 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c     8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.152 2020/09/12 18:19:50 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.153 2020/09/12 19:41:20 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1241,7 +1241,7 @@
 }
 
 /* Expand the names of any children of a given node that contain variable
- * invocations or file wildcards into actual targets.
+ * expressions or file wildcards into actual targets.
  *
  * The expanded node is removed from the parent's list of children, and the
  * parent's unmade counter is decremented, but other nodes may be added.
diff -r 3ac0576f2656 -r ab155e7dfd9b usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sat Sep 12 19:33:02 2020 +0000
+++ b/usr.bin/make/var.c        Sat Sep 12 19:41:20 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.502 2020/09/12 19:33:02 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.503 2020/09/12 19:41:20 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.502 2020/09/12 19:33:02 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.503 2020/09/12 19:41:20 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c      8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.502 2020/09/12 19:33:02 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.503 2020/09/12 19:41:20 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -3364,7 +3364,7 @@
 /*-
  *-----------------------------------------------------------------------
  * Var_Parse --
- *     Given the start of a variable invocation (such as $v, $(VAR),
+ *     Given the start of a variable expression (such as $v, $(VAR),
  *     ${VAR:Mpattern}), extract the variable name, possibly some
  *     modifiers and find its value by applying the modifiers to the
  *     original value.
@@ -3416,7 +3416,7 @@
     Boolean     dynamic;       /* TRUE if the variable is local and we're
                                 * expanding it in a non-local context. This
                                 * is done to support dynamic sources. The
-                                * result is just the invocation, unaltered */
+                                * result is just the expression, unaltered */
     const char *extramodifiers;
     Var *v;
     char *nstr;
@@ -3685,7 +3685,7 @@
        } else if (*str != '$') {
            /*
             * Skip as many characters as possible -- either to the end of
-            * the string or to the next dollar sign (variable invocation).
+            * the string or to the next dollar sign (variable expression).
             */
            const char *cp;