 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.855 2021/02/23 16:29:52 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.856 2021/03/14 10:57:12 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -130,27 +130,27 @@
 #include <regex.h>
 #endif
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.855 2021/02/23 16:29:52 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.856 2021/03/14 10:57:12 rillig Exp $");
 typedef enum VarFlags {
 	VFL_NONE	= 0,
 	/*
 	 * The variable's value is currently being used by Var_Parse or
 	 * Var_Subst.  This marker is used to avoid endless recursion.
 	 */
 	VFL_IN_USE	= 1 << 0,
 	/*
 	 * The variable comes from the environment.
 	 * These variables are not registered in any GNode, therefore they
 @@ -2882,26 +2882,32 @@ ApplyModifier_Regex(const char **pp, App
 	args.matched = FALSE;
 	oneBigWord = st->oneBigWord;
 	for (;; (*pp)++) {
 		if (**pp == 'g')
 			args.pflags.subGlobal = TRUE;
 		else if (**pp == '1')
 			args.pflags.subOnce = TRUE;
 		else if (**pp == 'W')
 			oneBigWord = TRUE;
 		else
 			break;
+	}
 	if (!(st->expr->eflags & VARE_WANTRES)) {
 		free(args.replace);
 		free(re);
 		return AMR_OK;
+	}
 	error = regcomp(&args.re, re, REG_EXTENDED);
 	free(re);
 	if (error != 0) {
 		VarREError(error, &args.re, "Regex compilation error");
 		free(args.replace);
 		return AMR_CLEANUP;
+	}
 	args.nsub = args.re.re_nsub + 1;
 	if (args.nsub > 10)
 		args.nsub = 10;
 	ModifyWords(st, ModifyWord_SubstRegex, &args, oneBigWord);

 @@ -1,9 +1,8 @@
 make: "opt-debug-lint.mk" line 19: Variable "X" is undefined
 make: "opt-debug-lint.mk" line 41: Variable "UNDEF" is undefined
 make: "opt-debug-lint.mk" line 61: Missing delimiter ':' after modifier "L"
 make: "opt-debug-lint.mk" line 61: Missing delimiter ':' after modifier "P"
 make: "opt-debug-lint.mk" line 69: Unknown modifier "${"
 make: Regex compilation error: (details omitted)
 make: Fatal errors encountered -- cannot continue
 make: stopped in unit-tests
 exit status 1

 @@ -1,14 +1,14 @@
-# $NetBSD: opt-debug-lint.mk,v 1.13 2021/03/14 10:45:51 rillig Exp $
+# $NetBSD: opt-debug-lint.mk,v 1.14 2021/03/14 10:57:12 rillig Exp $
+#
 # Tests for the -dL command line option, which runs additional checks
 # to catch common mistakes, such as unclosed variable expressions.
 .MAKEFLAGS: -dL
 # Since 2020-09-13, undefined variables that are used on the left-hand side
 # of a condition at parse time get a proper error message.  Before, the
 # error message was "Malformed conditional" only, which was wrong and
 # misleading.  The form of the condition is totally fine, it's the evaluation
 # that fails.
+#
 # Since 2020-09-13, the "Malformed conditional" error message is not printed
 @@ -67,26 +67,29 @@ ${UNDEF}: ${UNDEF}
 # since make always fell back trying to parse the indirect modifier as a
 # SysV modifier.
 .if ${value:${:UL}PL} != "LPL}"		# FIXME: "LPL}" is unexpected here.
 .  error ${value:${:UL}PL}
 .endif
 # Typically, an indirect modifier is followed by a colon or the closing
 # brace.  This one isn't, therefore make falls back to parsing it as the SysV
 # modifier ":lue=lid".
 .if ${value:L:${:Ulue}=${:Ulid}} != "valid"
 .  error
 .endif
-# Before var.c 1.XXX from 2021-03-14, the whole variable text was evaluated
+# In lint mode, the whole variable text is evaluated to check for unclosed
-# to check for unclosed expressions and unknown operators.  During this check,
+# expressions and unknown operators.  During this check, the subexpression
-# the subexpression '${:U2}' was not expanded, instead it was copied verbatim
+# '${:U2}' is not expanded, instead it is copied verbatim into the regular
-# into the regular expression, which was '.*=.{1,${:U2}}$'.  This regular
+# expression, leading to '.*=.{1,${:U2}}$'.
 # expression was then compiled (despite VARE_WANTRES being unset), which
-# resulted in a wrong error message.
+# Before var.c 1.856 from 2021-03-14, this regular expression was then
 # compiled even though that was not necessary for checking the syntax at the
 # level of variable expressions.  The unexpanded '$' then resulted in a wrong
 # error message.
+#
 # This only happened in lint mode since in default mode the early check for
 # unclosed expressions and unknown modifiers is skipped.
+#
 # See VarCheckSyntax, ApplyModifier_Regex.
+#
 VARMOD_REGEX=	${:UA=111 B=222 C=33:C/.*=.{1,${:U2}}$//g}