 @@ -1,53 +1,55 @@
 :D expanded when var set
 true
 TRUE
 :U expanded when var undef
 true
 TRUE
 :D skipped if var undef
 :U skipped when var set
 is set
 :? only lhs when value true
 true
 TRUE
 :? only rhs when value false
 false
 FALSE
 do not evaluate or expand :? if discarding
 is set
 year=2016 month=04 day=01
 date=20160401
 Version=123.456.789 == 123456789
 Literal=3.4.5 == 3004005
 We have target specific vars
 MAN= make.1
 save-dollars: 0        = $
 save-dollars: 1        = $$
 save-dollars: 2        = $$
 save-dollars: False    = $
 save-dollars: True     = $$
 save-dollars: false    = $
 save-dollars: true     = $$
 save-dollars: Yes      = $$
 save-dollars: No       = $
 save-dollars: yes      = $$
 save-dollars: no       = $
 save-dollars: On       = $$
 save-dollars: Off      = $
 save-dollars: ON       = $$
 save-dollars: OFF      = $
 save-dollars: on       = $$
 save-dollars: off      = $
 export-appended: env
 export-appended: env
 export-appended: env mk
 parse-dynamic: parse-dynamic parse-dynamic before
 parse-dynamic: parse-dynamic parse-dynamic after
 parse-dynamic: parse-dynamic parse-dynamic after
 varerror-unclosed:begin
 make: Unclosed variable specification (expecting '}') for "UNCLOSED" (value "") modifier M
 varerror-unclosed:end
 exit status 0

 @@ -1,186 +1,201 @@
-# $Id: varmisc.mk,v 1.16 2020/07/26 21:09:49 rillig Exp $
+# $Id: varmisc.mk,v 1.17 2020/07/26 21:46:10 rillig Exp $
+#
 # Miscellaneous variable tests.
 all: unmatched_var_paren D_true U_true D_false U_false Q_lhs Q_rhs NQ_none \
 	strftime cmpv manok
 all: save-dollars
 all: export-appended
 all: parse-dynamic
 all: varerror-unclosed
 unmatched_var_paren:
 	@echo ${foo::=foo-text}
 True = ${echo true >&2:L:sh}TRUE
 False= ${echo false >&2:L:sh}FALSE
 VSET= is set
 .undef UNDEF
 U_false:
 	@echo :U skipped when var set
 	@echo ${VSET:U${False}}
 D_false:
 	@echo :D skipped if var undef
 	@echo ${UNDEF:D${False}}
 U_true:
 	@echo :U expanded when var undef
 	@echo ${UNDEF:U${True}}
 D_true:
 	@echo :D expanded when var set
 	@echo ${VSET:D${True}}
 Q_lhs:
 	@echo :? only lhs when value true
 	@echo ${1:L:?${True}:${False}}
 Q_rhs:
 	@echo :? only rhs when value false
 	@echo ${0:L:?${True}:${False}}
 NQ_none:
 	@echo do not evaluate or expand :? if discarding
 	@echo ${VSET:U${1:L:?${True}:${False}}}
 April1= 1459494000
 # slightly contorted syntax to use utc via variable
 strftime:
 	@echo ${year=%Y month=%m day=%d:L:gmtime=1459494000}
 	@echo date=${%Y%m%d:L:${gmtime=${April1}:L}}
 # big jumps to handle 3 digits per step
 M_cmpv.units = 1 1000 1000000
 M_cmpv = S,., ,g:_:range:@i@+ $${_:[-$$i]} \* $${M_cmpv.units:[$$i]}@:S,^,expr 0 ,1:sh
 Version = 123.456.789
 cmpv.only = target specific vars
 cmpv:
 	@echo Version=${Version} == ${Version:${M_cmpv}}
 	@echo Literal=3.4.5 == ${3.4.5:L:${M_cmpv}}
 	@echo We have ${${.TARGET:T}.only}
 # catch misshandling of nested vars in .for loop
 MAN=
 MAN1= make.1
 .for s in 1 2
 .if defined(MAN$s) && !empty(MAN$s)
 MAN+= ${MAN$s}
 .endif
 .endfor
 manok:
 	@echo MAN=${MAN}
 # This is an expanded variant of the above .for loop.
 # Between 2020-06-28 and 2020-07-02 this paragraph generated a wrong
 # error message "Variable VARNAME is recursive".
 # When evaluating the !empty expression, the ${:U1} was not expanded and
 # thus resulted in the seeming definition VARNAME=${VARNAME}, which is
 # obviously recursive.
 VARNAME=	${VARNAME${:U1}}
 .if defined(VARNAME${:U2}) && !empty(VARNAME${:U2})
 .endif
 # begin .MAKE.SAVE_DOLLARS; see Var_Set_with_flags and s2Boolean.
 SD_VALUES=	0 1 2 False True false true Yes No yes no On Off ON OFF on off
 SD_4_DOLLARS=	$$$$
 .for val in ${SD_VALUES}
 .MAKE.SAVE_DOLLARS:=	${val}	# Must be := since a simple = has no effect.
 SD.${val}:=		${SD_4_DOLLARS}
 .endfor
 .MAKE.SAVE_DOLLARS:=	yes
 save-dollars:
 .for val in ${SD_VALUES}
 	@printf '%s: %-8s = %s\n' $@ ${val} ${SD.${val}:Q}
 .endfor
 # Appending to an undefined variable does not add a space in front.
 .undef APPENDED
 APPENDED+=	value
 .if ${APPENDED} != "value"
 .error "${APPENDED}"
 .endif
 # Appending to an empty variable adds a space between the old value
 # and the additional value.
 APPENDED=	# empty
 APPENDED+=	value
 .if ${APPENDED} != " value"
 .error "${APPENDED}"
 .endif
 # Appending to parameterized variables works as well.
 PARAM=		param
 VAR.${PARAM}=	1
 VAR.${PARAM}+=	2
 .if ${VAR.param} != "1 2"
 .error "${VAR.param}"
 .endif
 # The variable name can contain arbitrary characters.
 # If the expanded variable name ends in a +, this still does not influence
 # the parser. The assignment operator is still a simple assignment.
 # Therefore, there is no need to add a space between the variable name
 # and the assignment operator.
 PARAM=		+
 VAR.${PARAM}=	1
 VAR.${PARAM}+=	2
 .if ${VAR.+} != "1 2"
 .error "${VAR.+}"
 .endif
 .for param in + ! ?
 VAR.${param}=	${param}
 .endfor
 .if ${VAR.+} != "+" || ${VAR.!} != "!" || ${VAR.?} != "?"
 .error "${VAR.+}" "${VAR.!}" "${VAR.?}"
 .endif
 # Appending to a variable from the environment creates a copy of that variable
 # in the global context.
 # The appended value is not exported automatically.
 # When a variable is exported, the exported value is taken at the time of the
 # .export directive. Later changes to the variable have no effect.
 .export FROM_ENV_BEFORE
 FROM_ENV+=		mk
 FROM_ENV_BEFORE+=	mk
 FROM_ENV_AFTER+=	mk
 .export FROM_ENV_AFTER
 export-appended:
 	@echo $@: "$$FROM_ENV"
 	@echo $@: "$$FROM_ENV_BEFORE"
 	@echo $@: "$$FROM_ENV_AFTER"
 # begin parse-dynamic
+#
 # Demonstrate that the target-specific variables are not evaluated in
 # the global context. They are preserved until there is a local context
 # in which resolving them makes sense.
 # There are different code paths for short names ...
 ${:U>}=		before
-G_TARGET:=	$@
+GS_TARGET:=	$@
-G_MEMBER:=	$%
+GS_MEMBER:=	$%
-G_PREFIX:=	$*
+GS_PREFIX:=	$*
-G_ARCHIVE:=	$!
+GS_ARCHIVE:=	$!
-G_ALLSRC:=	$>
+GS_ALLSRC:=	$>
 ${:U>}=		after
 # ... and for braced short names ...
 GB_TARGET:=	${@}
 GB_MEMBER:=	${%}
 GB_PREFIX:=	${*}
 GB_ARCHIVE:=	${!}
 GB_ALLSRC:=	${>}
 # ... and for long names.
 GL_TARGET:=	${.TARGET}
 GL_MEMBER:=	${.MEMBER}
 GL_PREFIX:=	${.PREFIX}
 GL_ARCHIVE:=	${.ARCHIVE}
 GL_ALLSRC:=	${.ALLSRC}
 parse-dynamic:
-	@echo $@: ${G_TARGET} ${G_MEMBER} ${G_PREFIX} ${G_ARCHIVE} ${G_ALLSRC}
+	@echo $@: ${GS_TARGET} ${GS_MEMBER} ${GS_PREFIX} ${GS_ARCHIVE} ${GS_ALLSRC}
 	@echo $@: ${GB_TARGET} ${GB_MEMBER} ${GB_PREFIX} ${GB_ARCHIVE} ${GB_ALLSRC}
 	@echo $@: ${GL_TARGET} ${GL_MEMBER} ${GL_PREFIX} ${GL_ARCHIVE} ${GL_ALLSRC}
 # As of 2020-07-26, make does not complain about unclosed variables.
 # It does complain about unclosed variables when parsing modifiers though.
 varerror-unclosed:
 	@echo $@:begin
 	@echo ${UNCLOSED
 	@echo ${UNCLOSED:M${PATTERN
 	@echo ${UNCLOSED.${param
 	@echo $@:end