 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.532 2021/01/26 23:44:56 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.533 2021/01/27 00:02:38 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.
 @@ -99,27 +99,27 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdint.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.532 2021/01/26 23:44:56 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.533 2021/01/27 00:02:38 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
 	char *fname;		/* name of file (relative? absolute?) */
 	Boolean fromForLoop;	/* simulated .include by the .for loop */
 	int lineno;		/* current line number in file */
 	int first_lineno;	/* line number of start of text */
 	unsigned int cond_depth; /* 'if' nesting when file opened */
 	Boolean depending;	/* state of doing_depend on EOF */
 @@ -601,33 +601,30 @@ ParseVErrorInternal(FILE *f, const char
 	(void)fprintf(f, "%s: ", progname);
 	if (fname != NULL)
 		PrintLocation(f, fname, lineno);
 	if (type == PARSE_WARNING)
 		(void)fprintf(f, "warning: ");
 	(void)vfprintf(f, fmt, ap);
 	(void)fprintf(f, "\n");
 	(void)fflush(f);
 	if (type == PARSE_INFO)
 		goto print_stack_trace;
-	if (type == PARSE_FATAL || opts.parseWarnFatal)
+	if (type == PARSE_WARNING && !opts.parseWarnFatal)
-		fatals++;
+		goto print_stack_trace;
-	if (opts.parseWarnFatal && !fatal_warning_error_printed) {
+	fatals++;
-		/*
+	if (type == PARSE_WARNING && !fatal_warning_error_printed) {
 		 * FIXME: Also gets printed on .error, even though it
 		 *  doesn't apply to it.
 		 */
 		Error("parsing warnings being treated as errors");
 		fatal_warning_error_printed = TRUE;
+	}
 print_stack_trace:
 	PrintStackTrace();
+}
 static void
 ParseErrorInternal(const char *fname, size_t lineno,
 		   ParseErrorLevel type, const char *fmt, ...)
+{
 	va_list ap;

 @@ -1,11 +1,13 @@
-# $NetBSD: directive-error.mk,v 1.4 2021/01/26 23:51:20 rillig Exp $
+# $NetBSD: directive-error.mk,v 1.5 2021/01/27 00:02:38 rillig Exp $
+#
 # Tests for the .error directive, which prints an error message and exits
 # immediately, unlike other "fatal" parse errors, which continue to parse
 # until the end of the current top-level makefile.
+#
 # See also:
 #	opt-warnings-as-errors.mk
-# TODO: Implementation
+# Before parse.c 1.532 from 2021-01-27, the ".error" issued an irrelevant
 # message saying "parsing warnings being treated as errors".
 # FIXME: The "parsing warnings being treated as errors" is irrelevant.
 .MAKEFLAGS: -W
 .error message

 @@ -1,5 +1,4 @@
-make: "directive-error.mk" line 11: message
+make: "directive-error.mk" line 13: message
 make: parsing warnings being treated as errors
 make: stopped in unit-tests
 exit status 1

 @@ -1,13 +1,18 @@
-# $NetBSD: opt-warnings-as-errors.mk,v 1.4 2020/11/09 20:50:56 rillig Exp $
+# $NetBSD: opt-warnings-as-errors.mk,v 1.5 2021/01/27 00:02:38 rillig Exp $
+#
 # Tests for the -W command line option, which turns warnings into errors.
+#
 # Even in -W mode, a .warning is not completely equivalent to an .error.
 # First, the word "warning" is still printed, and second, parsing continues
 # after a failed warning, whereas it would stop immediately at the first
 # .error.
 .MAKEFLAGS: -W
 .warning message 1
 .warning message 2
 _!=	echo 'parsing continues' 1>&2
 all:
 	@:;

 @@ -1,7 +1,7 @@
-make: "opt-warnings-as-errors.mk" line 7: warning: message 1
+make: "opt-warnings-as-errors.mk" line 12: warning: message 1
 make: parsing warnings being treated as errors
-make: "opt-warnings-as-errors.mk" line 8: warning: message 2
+make: "opt-warnings-as-errors.mk" line 13: warning: message 2
 parsing continues
 make: Fatal errors encountered -- cannot continue
 make: stopped in unit-tests
 exit status 1