 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.h,v 1.302 2022/05/07 17:49:47 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.303 2022/06/12 13:37:32 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.
 @@ -842,27 +842,27 @@ void Punt(const char *, ...) MAKE_ATTR_P
 void DieHorribly(void) MAKE_ATTR_DEAD;
 void Finish(int) MAKE_ATTR_DEAD;
 bool unlink_file(const char *) MAKE_ATTR_USE;
 void execDie(const char *, const char *);
 char *getTmpdir(void) MAKE_ATTR_USE;
 bool ParseBoolean(const char *, bool) MAKE_ATTR_USE;
 const char *cached_realpath(const char *, char *);
 bool GetBooleanExpr(const char *, bool);
 /* parse.c */
 void Parse_Init(void);
 void Parse_End(void);
-void PrintLocation(FILE *, bool, const char *, unsigned);
+void PrintLocation(FILE *, bool, const GNode *);
 void PrintStackTrace(bool);
 void Parse_Error(ParseErrorLevel, const char *, ...) MAKE_ATTR_PRINTFLIKE(2, 3);
 bool Parse_VarAssign(const char *, bool, GNode *) MAKE_ATTR_USE;
 void Parse_AddIncludeDir(const char *);
 void Parse_File(const char *, int);
 void Parse_PushInput(const char *, unsigned, unsigned, Buffer,
 		     struct ForLoop *);
 void Parse_MainName(GNodeList *);
 int Parse_NumErrors(void) MAKE_ATTR_USE;
 /* suff.c */
 void Suff_Init(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.679 2022/06/11 17:58:15 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.680 2022/06/12 13:37:32 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.
 @@ -95,27 +95,27 @@
  */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdarg.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.679 2022/06/11 17:58:15 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.680 2022/06/12 13:37:32 rillig Exp $");
 /*
  * A file being read.
  */
 typedef struct IncludedFile {
 	FStr name;		/* absolute or relative to the cwd */
 	unsigned lineno;	/* 1-based */
 	unsigned readLines;	/* the number of physical lines that have
 				 * been read from the file */
 	unsigned forHeadLineno;	/* 1-based */
 	unsigned forBodyReadLines; /* the number of physical lines that have
 				 * been read from the file above the body of
 				 * the .for loop */
 @@ -426,133 +426,133 @@ FindKeyword(const char *str)
 		if (diff == 0)
 			return curr;
 		if (diff < 0)
 			end = curr - 1;
 		else
 			start = curr + 1;
+	}
 	return -1;
+}
 void
-PrintLocation(FILE *f, bool useVars, const char *fname, unsigned lineno)
+PrintLocation(FILE *f, bool useVars, const GNode *gn)
+{
 	char dirbuf[MAXPATHLEN + 1];
 	FStr dir, base;
 	const char *fname;
 	unsigned lineno;
 	if (gn != NULL) {
 		fname = gn->fname;
 		lineno = gn->lineno;
 	} else if (includes.len > 0) {
 		IncludedFile *curFile = CurFile();
 		fname = curFile->name.str;
 		lineno = curFile->lineno;
 	} else
 		return;
 	if (!useVars || fname[0] == '/' || strcmp(fname, "(stdin)") == 0) {
 		(void)fprintf(f, "\"%s\" line %u: ", fname, lineno);
 		return;
+	}
 	dir = Var_Value(SCOPE_GLOBAL, ".PARSEDIR");
 	if (dir.str == NULL)
 		dir.str = ".";
 	if (dir.str[0] != '/')
 		dir.str = realpath(dir.str, dirbuf);
 	base = Var_Value(SCOPE_GLOBAL, ".PARSEFILE");
 	if (base.str == NULL)
 		base.str = str_basename(fname);
 	(void)fprintf(f, "\"%s/%s\" line %u: ", dir.str, base.str, lineno);
 	FStr_Done(&base);
 	FStr_Done(&dir);
+}
-static void MAKE_ATTR_PRINTFLIKE(6, 0)
+static void MAKE_ATTR_PRINTFLIKE(5, 0)
-ParseVErrorInternal(FILE *f, bool useVars, const char *fname, unsigned lineno,
+ParseVErrorInternal(FILE *f, bool useVars, const GNode *gn,
 		    ParseErrorLevel level, const char *fmt, va_list ap)
+{
 	static bool fatal_warning_error_printed = false;
 	(void)fprintf(f, "%s: ", progname);
-	if (fname != NULL)
+	PrintLocation(f, useVars, gn);
 		PrintLocation(f, useVars, fname, lineno);
 	if (level == PARSE_WARNING)
 		(void)fprintf(f, "warning: ");
 	(void)vfprintf(f, fmt, ap);
 	(void)fprintf(f, "\n");
 	(void)fflush(f);
 	if (level == PARSE_FATAL)
 		parseErrors++;
 	if (level == PARSE_WARNING && opts.parseWarnFatal) {
 		if (!fatal_warning_error_printed) {
 			Error("parsing warnings being treated as errors");
 			fatal_warning_error_printed = true;
+		}
 		parseErrors++;
+	}
 	if (DEBUG(PARSE))
 		PrintStackTrace(false);
+}
-static void MAKE_ATTR_PRINTFLIKE(4, 5)
+static void MAKE_ATTR_PRINTFLIKE(3, 4)
-ParseErrorInternal(const char *fname, unsigned lineno,
+ParseErrorInternal(const GNode *gn,
 		   ParseErrorLevel level, const char *fmt, ...)
+{
 	va_list ap;
 	(void)fflush(stdout);
 	va_start(ap, fmt);
-	ParseVErrorInternal(stderr, false, fname, lineno, level, fmt, ap);
+	ParseVErrorInternal(stderr, false, gn, level, fmt, ap);
 	va_end(ap);
 	if (opts.debug_file != stdout && opts.debug_file != stderr) {
 		va_start(ap, fmt);
-		ParseVErrorInternal(opts.debug_file, false, fname, lineno,
+		ParseVErrorInternal(opts.debug_file, false, gn,
 		    level, fmt, ap);
 		va_end(ap);
+	}
+}
 /*
  * Print a parse error message, including location information.
+ *
  * If the level is PARSE_FATAL, continue parsing until the end of the
  * current top-level makefile, then exit (see Parse_File).
+ *
  * Fmt is given without a trailing newline.
  */
 void
 Parse_Error(ParseErrorLevel level, const char *fmt, ...)
+{
 	va_list ap;
 	const char *fname;
 	unsigned lineno;
 	if (includes.len == 0) {
 		fname = NULL;
 		lineno = 0;
 	} else {
 		IncludedFile *curFile = CurFile();
 		fname = curFile->name.str;
 		lineno = curFile->lineno;
 	(void)fflush(stdout);
 	va_start(ap, fmt);
-	ParseVErrorInternal(stderr, true, fname, lineno, level, fmt, ap);
+	ParseVErrorInternal(stderr, true, NULL, level, fmt, ap);
 	va_end(ap);
 	if (opts.debug_file != stdout && opts.debug_file != stderr) {
 		va_start(ap, fmt);
-		ParseVErrorInternal(opts.debug_file, true, fname, lineno,
+		ParseVErrorInternal(opts.debug_file, true, NULL,
 		    level, fmt, ap);
 		va_end(ap);
+	}
+}
 /*
  * Handle an .info, .warning or .error directive.  For an .error directive,
  * exit immediately.
  */
 static void
 HandleMessage(ParseErrorLevel level, const char *levelName, const char *umsg)
+{
 @@ -1911,27 +1911,27 @@ GNode_AddCommand(GNode *gn, char *cmd)
 		RememberLocation(gn);
 	} else {
 #if 0
 		/* XXX: We cannot do this until we fix the tree */
 		Lst_Append(&gn->commands, cmd);
 		Parse_Error(PARSE_WARNING,
 		    "overriding commands for target \"%s\"; "
 		    "previous commands defined at %s: %u ignored",
 		    gn->name, gn->fname, gn->lineno);
 #else
 		Parse_Error(PARSE_WARNING,
 		    "duplicate script for target \"%s\" ignored",
 		    gn->name);
-		ParseErrorInternal(gn->fname, gn->lineno, PARSE_WARNING,
+		ParseErrorInternal(gn, PARSE_WARNING,
 		    "using previous script for \"%s\" defined here",
 		    gn->name);
 #endif
+	}
+}
 /*
  * Add a directory to the path searched for included makefiles bracketed
  * by double-quotes.
  */
 void
 Parse_AddIncludeDir(const char *dir)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.1021 2022/05/14 12:25:16 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.1022 2022/06/12 13:37:32 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.
 @@ -129,27 +129,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.1021 2022/05/14 12:25:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1022 2022/06/12 13:37:32 rillig Exp $");
 /*
  * Variables are defined using one of the VAR=value assignments.  Their
  * value can be queried by expressions such as $V, ${VAR}, or with modifiers
  * such as ${VAR:S,from,to,g:Q}.
+ *
  * There are 3 kinds of variables: scope variables, environment variables,
  * undefined variables.
+ *
  * Scope variables are stored in a GNode.scope.  The only way to undefine
  * a scope variable is using the .undef directive.  In particular, it must
  * not be possible to undefine a variable during the evaluation of an
  * expression, or Var.name might point nowhere.  (There is another,
 @@ -4513,28 +4513,27 @@ Var_Parse(const char **pp, GNode *scope,
 	} else {
 		VarParseResult res;
 		if (!ParseVarnameLong(&p, startc, scope, emode,
 		    pp, &res, out_val,
 		    &endc, &v, &haveModifier, &extramodifiers,
 		    &dynamic, &expr.defined))
 			return res;
+	}
 	expr.name = v->name.str;
 	if (v->inUse) {
 		if (scope->fname != NULL) {
 			fprintf(stderr, "In a command near ");
-			PrintLocation(stderr, false,
+			PrintLocation(stderr, false, scope);
 			    scope->fname, scope->lineno);
+		}
 		Fatal("Variable %s is recursive.", v->name.str);
+	}
 	/*
 	 * XXX: This assignment creates an alias to the current value of the
 	 * variable.  This means that as long as the value of the expression
 	 * stays the same, the value of the variable must not change.
 	 * Using the '::=' modifier, it could be possible to trigger exactly
 	 * this situation.
+	 *
 	 * At the bottom of this function, the resulting value is compared to
 	 * the then-current value of the variable.  This might also invoke