 @@ -1,14 +1,14 @@
-# $NetBSD: var-scope-cmdline.mk,v 1.1 2022/01/23 16:25:54 rillig Exp $
+# $NetBSD: var-scope-cmdline.mk,v 1.2 2023/04/07 05:54:16 rillig Exp $
+#
 # Tests for variables specified on the command line.
+#
 # Variables that are specified on the command line override those from the
 # global scope.
+#
 # For performance reasons, the actual implementation is more complex than the
 # above single-sentence rule, in order to avoid unnecessary lookups in scopes,
 # which before var.c 1.586 from 2020-10-25 calculated the hash value of the
 # variable name once for each lookup.  Instead, when looking up the value of
 # a variable, the search often starts in the global scope since that is where
 # most of the variables are stored.  This conflicts with the statement that
 # variables from the cmdline scope override global variables, since after the
 @@ -51,26 +51,30 @@
+#
 # Another bug was the wrong assumption that "deleting a cmdline variable is
 # not possible".  Deleting such a variable has been possible since var.c 1.204
 # from 2016-02-19, when the variable modifier ':@' started to delete the
 # temporary loop variable after finishing the loop.  It was probably not
 # intended back then that a side effect of this seemingly simple change was
 # that both global and cmdline variables could now be undefined at will as a
 # side effect of evaluating a variable expression.  As of 2021-02-23, this is
 # still possible.
+#
 # Most cmdline variables are set at the very beginning, when parsing the
 # command line arguments.  Using the special target '.MAKEFLAGS', it is
 # possible to set cmdline variables at any later time.
+#
 # See also:
 #	varcmd.mk
 #	varname-makeflags.mk
 # A normal global variable, without any cmdline variable nearby.
 VAR=	global
 .info ${VAR}
 # The global variable is "overridden" by simply deleting it and then
 # installing the cmdline variable instead.  Since there is no obvious way to
 # undefine a cmdline variable, there is no need to remember the old value
 # of the global variable could become visible again.
+#
 # See varmod-loop.mk for a non-obvious way to undefine a cmdline variable.
 .MAKEFLAGS: VAR=makeflags
 .info ${VAR}

 @@ -1,27 +1,31 @@
-# $NetBSD: varcmd.mk,v 1.6 2021/02/16 19:43:09 rillig Exp $
+# $NetBSD: varcmd.mk,v 1.7 2023/04/07 05:54:16 rillig Exp $
+#
 # Test behaviour of recursive make and vars set on command line.
+#
 # FIXME: The purpose of this test is unclear.  The test uses six levels of
 # sub-makes, which makes it incredibly hard to understand.  There must be at
 # least an introductory explanation about what _should_ happen here.
 # The variable names are terrible, as well as their values.
+#
 # This test produces different results if the large block with the condition
 # "scope == SCOPE_GLOBAL" in Var_SetWithFlags is removed.  This test should
 # be rewritten to make it clear why there is a difference and why this is
 # actually intended.  Removing that large block of code makes only this test
 # and vardebug.mk fail, which is not enough.
+#
 # See also:
 #	var-scope-cmdline.mk
 #	varname-makeflags.mk
 FU=	fu
 FOO?=	foo
 .if !empty(.TARGETS)
 TAG=	${.TARGETS}
 .endif
 TAG?=	default
 all:	one
 show:
 	@echo "${TAG} FU=<v>${FU}</v> FOO=<v>${FOO}</v> VAR=<v>${VAR}</v>"

 @@ -1,4 +1,4 @@
-make: "var-scope-cmdline.mk" line 67: global
+make: "var-scope-cmdline.mk" line 71: global
-make: "var-scope-cmdline.mk" line 76: makeflags
+make: "var-scope-cmdline.mk" line 80: makeflags
 makeflags
 exit status 0