 @@ -1,14 +1,14 @@
-/*	$NetBSD: enum.c,v 1.3 2020/08/09 09:44:14 rillig Exp $	*/
+/*	$NetBSD: enum.c,v 1.4 2020/08/24 20:15:51 rillig Exp $	*/
 /*
  Copyright (c) 2020 Roland Illig <rillig@NetBSD.org>
  All rights reserved.
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
 . Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
 @@ -18,44 +18,44 @@
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: enum.c,v 1.3 2020/08/09 09:44:14 rillig Exp $";
+static char rcsid[] = "$NetBSD: enum.c,v 1.4 2020/08/24 20:15:51 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: enum.c,v 1.3 2020/08/09 09:44:14 rillig Exp $");
+__RCSID("$NetBSD: enum.c,v 1.4 2020/08/24 20:15:51 rillig Exp $");
 #endif
 #endif
 #include <assert.h>
 #include <string.h>
 #include "enum.h"
 /* Convert a bitset into a string representation showing the names of the
  * individual bits, or optionally shortcuts for groups of bits. */
 const char *
-Enum_ToString(char *buf, size_t buf_size, int value,
+Enum_FlagsToString(char *buf, size_t buf_size,
-	      const EnumToStringSpec *spec)
+		   int value, const EnumToStringSpec *spec)
+{
 	const char *buf_start = buf;
 	const char *sep = "";
 	size_t sep_len = 0;
 	for (; spec->es_value != 0; spec++) {
 		size_t name_len;
 		if ((value & spec->es_value) != spec->es_value)
 			    continue;
 		value &= ~spec->es_value;
 		assert(buf_size >= sep_len + 1);
 @@ -71,13 +71,24 @@ Enum_ToString(char *buf, size_t buf_size
 		sep = ENUM__SEP;
 		sep_len = sizeof ENUM__SEP - 1;
+	}
 	assert(value == 0);
 	if (buf == buf_start)
 		return "none";
 	assert(buf_size >= 1);
 	buf[0] = '\0';
 	return buf_start;
+}
 /* Convert a fixed-value enum into a string representation. */
 const char *
 Enum_ValueToString(int value, const EnumToStringSpec *spec)
+{
 	for (; spec->es_name[0] != '\0'; spec++) {
 	    if (value == spec->es_value)
 	        return spec->es_name;
+	}
 	assert(!"unknown enum value");
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: enum.h,v 1.6 2020/08/23 09:28:52 rillig Exp $	*/
+/*	$NetBSD: enum.h,v 1.7 2020/08/24 20:15:51 rillig Exp $	*/
 /*
  Copyright (c) 2020 Roland Illig <rillig@NetBSD.org>
  All rights reserved.
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
 . Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
 @@ -31,68 +31,105 @@
 #define MAKE_ENUM_H
 /*
  * Generate string representation for bitmasks.
  */
 #include <stddef.h>
 typedef struct {
 	int es_value;
 	const char *es_name;
 } EnumToStringSpec;
-const char *Enum_ToString(char *, size_t, int, const EnumToStringSpec *);
+const char *Enum_FlagsToString(char *, size_t, int, const EnumToStringSpec *);
 const char *Enum_ValueToString(int, const EnumToStringSpec *);
 #define ENUM__SEP "|"
 #define ENUM__JOIN_1(v1) \
 	#v1
 #define ENUM__JOIN_2(v1, v2) \
-	#v1 ENUM__SEP ENUM__JOIN_1(v2)
+	#v1 ENUM__SEP #v2
 #define ENUM__JOIN_3(v1, v2, v3) \
 	#v1 ENUM__SEP ENUM__JOIN_2(v2, v3)
 #define ENUM__JOIN_4(v1, v2, v3, v4) \
-	#v1 ENUM__SEP ENUM__JOIN_3(v2, v3, v4)
+	ENUM__JOIN_2(v1, v2) ENUM__SEP ENUM__JOIN_2(v3, v4)
 #define ENUM__JOIN_5(v1, v2, v3, v4, v5) \
 	#v1 ENUM__SEP ENUM__JOIN_4(v2, v3, v4, v5)
 #define ENUM__JOIN_6(v1, v2, v3, v4, v5, v6) \
 	#v1 ENUM__SEP ENUM__JOIN_5(v2, v3, v4, v5, v6)
 #define ENUM__JOIN_7(v1, v2, v3, v4, v5, v6, v7) \
 	#v1 ENUM__SEP ENUM__JOIN_6(v2, v3, v4, v5, v6, v7)
 #define ENUM__JOIN_8(v1, v2, v3, v4, v5, v6, v7, v8) \
-	#v1 ENUM__SEP ENUM__JOIN_7(v2, v3, v4, v5, v6, v7, v8)
+	ENUM__JOIN_4(v1, v2, v3, v4) ENUM__SEP ENUM__JOIN_4(v5, v6, v7, v8)
 #define ENUM__JOIN_16(v01, v02, v03, v04, v05, v06, v07, v08, \
 		      v09, v10, v11, v12, v13, v14, v15, v16) \
 	ENUM__JOIN_8(v01, v02, v03, v04, v05, v06, v07, v08) ENUM__SEP \
 	ENUM__JOIN_8(v09, v10, v11, v12, v13, v14, v15, v16)
 #define ENUM__JOIN_32(v01, v02, v03, v04, v05, v06, v07, v08, \
 		      v09, v10, v11, v12, v13, v14, v15, v16, \
 		      v17, v18, v19, v20, v21, v22, v23, v24, \
 		      v25, v26, v27, v28, v29, v30, v31, v32) \
 	ENUM__JOIN_16(v01, v02, v03, v04, v05, v06, v07, v08, \
 		      v09, v10, v11, v12, v13, v14, v15, v16) ENUM__SEP \
 	ENUM__JOIN_16(v17, v18, v19, v20, v21, v22, v23, v24, \
 		      v25, v26, v27, v28, v29, v30, v31, v32)
 #define ENUM__JOIN(part1, part2) \
 	part1 ENUM__SEP part2
 #define ENUM__RTTI(typnam, specs, joined) \
 	static const EnumToStringSpec typnam ## _ ## ToStringSpecs[] = specs; \
 	enum { typnam ## _ ## ToStringSize = sizeof joined }
-#define ENUM__SPEC(v) { v, #v }
+#define ENUM__SPEC_1(v1) { v1, #v1 }
 #define ENUM__SPEC_2(v1, v2) \
-#define ENUM__SPEC_3(v1, v2, v3) { \
+	ENUM__SPEC_1(v1), \
-	ENUM__SPEC(v1), \
+	ENUM__SPEC_1(v2)
-	ENUM__SPEC(v2), \
+#define ENUM__SPEC_4(v1, v2, v3, v4) \
-	ENUM__SPEC(v3), \
+	ENUM__SPEC_2(v1, v2), \
-	{ 0, "" } }
+	ENUM__SPEC_2(v3, v4)
 #define ENUM__SPEC_8(v1, v2, v3, v4, v5, v6, v7, v8) \
-#define ENUM__SPEC_8(v1, v2, v3, v4, v5, v6, v7, v8) { \
+	ENUM__SPEC_4(v1, v2, v3, v4), \
-	ENUM__SPEC(v1), \
+	ENUM__SPEC_4(v5, v6, v7, v8)
-	ENUM__SPEC(v2), \
+#define ENUM__SPEC_16(v01, v02, v03, v04, v05, v06, v07, v08, \
-	ENUM__SPEC(v3), \
+		      v09, v10, v11, v12, v13, v14, v15, v16) \
-	ENUM__SPEC(v4), \
+	ENUM__SPEC_8(v01, v02, v03, v04, v05, v06, v07, v08), \
-	ENUM__SPEC(v5), \
+	ENUM__SPEC_8(v09, v10, v11, v12, v13, v14, v15, v16)
-	ENUM__SPEC(v6), \
+#define ENUM__SPEC(part1, part2) \
-	ENUM__SPEC(v7), \
+	{ part1, part2, { 0, "" } }
 	ENUM__SPEC(v8), \
 	{ 0, "" } }
 #define ENUM_RTTI_3(typnam, v1, v2, v3) \
 	ENUM__RTTI(typnam, \
-		  ENUM__SPEC_3(v1, v2, v3), \
+	    ENUM__SPEC(ENUM__SPEC_2(v1, v2), ENUM__SPEC_1(v3)), \
-		  ENUM__JOIN_3(v1, v2, v3))
+	    ENUM__JOIN_2(ENUM__JOIN_2(v1, v2), ENUM__JOIN_1(v3)))
 #define ENUM_RTTI_8(typnam, v1, v2, v3, v4, v5, v6, v7, v8) \
 	ENUM__RTTI(typnam, \
-		  ENUM__SPEC_8(v1, v2, v3, v4, v5, v6, v7, v8), \
+	    ENUM__SPEC( \
-		  ENUM__JOIN_8(v1, v2, v3, v4, v5, v6, v7, v8))
+		ENUM__SPEC_4(v1, v2, v3, v4), \
 		ENUM__SPEC_4(v5, v6, v7, v8)), \
 	    ENUM__JOIN( \
 		ENUM__JOIN_4(v1, v2, v3, v4), \
 		ENUM__JOIN_4(v5, v6, v7, v8)))
 #define ENUM_RTTI_10(typnam, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) \
 	ENUM__RTTI(typnam, \
 	    ENUM__SPEC( \
 		ENUM__SPEC_8(v1, v2, v3, v4, v5, v6, v7, v8), \
 		ENUM__SPEC_2(v9, v10)), \
 	    ENUM__JOIN( \
 		ENUM__JOIN_8(v1, v2, v3, v4, v5, v6, v7, v8), \
 		ENUM__JOIN_2(v9, v10)))
 #define ENUM_RTTI_32( \
     typnam, \
     v01, v02, v03, v04, v05, v06, v07, v08, v09, v10, \
     v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
     v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, \
     v31, v32) \
     ENUM__RTTI( \
 	typnam, \
         ENUM__SPEC( \
         ENUM__SPEC_16(v01, v02, v03, v04, v05, v06, v07, v08, \
 		      v09, v10, v11, v12, v13, v14, v15, v16), \
         ENUM__SPEC_16(v17, v18, v19, v20, v21, v22, v23, v24, \
         	      v25, v26, v27, v28, v29, v30, v31, v32)), \
 	ENUM__JOIN_32( \
 	    v01, v02, v03, v04, v05, v06, v07, v08, \
 	    v09, v10, v11, v12, v13, v14, v15, v16, \
 	    v17, v18, v19, v20, v21, v22, v23, v24, \
 	    v25, v26, v27, v28, v29, v30, v31, v32))
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.c,v 1.121 2020/08/22 22:57:53 rillig Exp $	*/
+/*	$NetBSD: make.c,v 1.122 2020/08/24 20:15:51 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.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: make.c,v 1.121 2020/08/22 22:57:53 rillig Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.122 2020/08/24 20:15:51 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: make.c,v 1.121 2020/08/22 22:57:53 rillig Exp $");
+__RCSID("$NetBSD: make.c,v 1.122 2020/08/24 20:15:51 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * make.c --
  *	The functions which perform the examination of targets and
  *	their suitability for creation
+ *
  * Interface:
  *	Make_Run 	    	Initialize things for the module and recreate
  *	    	  	    	whatever needs recreating. Returns TRUE if
  *	    	    	    	work was (or would have been) done and FALSE
 @@ -106,27 +106,27 @@ __RCSID("$NetBSD: make.c,v 1.121 2020/08
  *	    	  	    	target, including the .ALLSRC variable, making
  *	    	  	    	sure that any variable that needs to exist
  *	    	  	    	at the very least has the empty value.
+ *
  *	Make_OODate 	    	Determine if a target is out-of-date.
+ *
  *	Make_HandleUse	    	See if a child is a .USE node for a parent
  *				and perform the .USE actions if so.
+ *
  *	Make_ExpandUse	    	Expand .USE nodes
  */
 #include    "make.h"
-#include    "hash.h"
+#include    "enum.h"
 #include    "dir.h"
 #include    "job.h"
 static unsigned int checked = 1;/* Sequence # to detect recursion */
 static Lst     	toBeMade;	/* The current fringe of the graph. These
 				 * are nodes which await examination by
 				 * MakeOODate. It is added to by
 				 * Make_Update and subtracted from by
 				 * MakeStartJobs */
 static int MakeAddChild(void *, void *);
 static int MakeFindChild(void *, void *);
 static int MakeUnmark(void *, void *);
 @@ -141,26 +141,62 @@ static int MakeBuildParent(void *, void
 MAKE_ATTR_DEAD static void
 make_abort(GNode *gn, int line)
+{
     static int two = 2;
     fprintf(debug_file, "make_abort from line %d\n", line);
     Targ_PrintNode(gn, &two);
     Lst_ForEach(toBeMade, Targ_PrintNode, &two);
     Targ_PrintGraph(3);
     abort();
+}
 ENUM_RTTI_8(GNodeMade,
 	    UNMADE, DEFERRED, REQUESTED, BEINGMADE,
 	    MADE, UPTODATE, ERROR, ABORTED);
 ENUM_RTTI_32(GNodeType,
 	     OP_DEPENDS, OP_FORCE, OP_DOUBLEDEP, OP_OPMASK,
 	     OP_OPTIONAL, OP_USE, OP_EXEC, OP_IGNORE,
 	     OP_PRECIOUS, OP_SILENT, OP_MAKE, OP_JOIN,
 	     OP_MADE, OP_SPECIAL, OP_USEBEFORE, OP_INVISIBLE,
 	     OP_NOTMAIN, OP_PHONY, OP_NOPATH, OP_WAIT,
 	     OP_NOMETA, OP_META, OP_NOMETA_CMP, OP_SUBMAKE,
 	     OP_TRANSFORM, OP_MEMBER, OP_LIB, OP_ARCHV,
 	     OP_HAS_COMMANDS, OP_SAVE_CMDS, OP_DEPS_FOUND, OP_MARK);
 ENUM_RTTI_10(GNodeFlags,
 	     REMAKE, CHILDMADE, FORCE, DONE_WAIT,
 	     DONE_ORDER, FROM_DEPEND, DONE_ALLSRC, CYCLE,
 	     DONECYCLE, INTERNAL);
 void
 GNode_FprintDetails(FILE *f, const char *prefix, const GNode *gn,
 		    const char *suffix)
+{
     char type_buf[GNodeType_ToStringSize];
     char flags_buf[GNodeFlags_ToStringSize];
     fprintf(f, "%smade %s, type %s, flags %s%s",
 	    prefix,
 	    Enum_ValueToString(gn->made, GNodeMade_ToStringSpecs),
 	    Enum_FlagsToString(type_buf, sizeof type_buf,
 			       gn->type, GNodeType_ToStringSpecs),
 	    Enum_FlagsToString(flags_buf, sizeof flags_buf,
 			       gn->flags, GNodeFlags_ToStringSpecs),
 	    suffix);
+}
 /*-
  *-----------------------------------------------------------------------
  * Make_TimeStamp --
  *	Set the cmgn field of a parent node based on the mtime stamp in its
  *	child. Called from MakeOODate via Lst_ForEach.
+ *
  * Input:
  *	pgn		the current parent
  *	cgn		the child we've just examined
+ *
  * Results:
  *	Always returns 0.
+ *
 @@ -1146,67 +1182,68 @@ MakeStartJobs(void)
+ *
  *-----------------------------------------------------------------------
  */
 static int
 MakePrintStatusOrder(void *ognp, void *gnp)
+{
     GNode *ogn = ognp;
     GNode *gn = gnp;
     if (!(ogn->flags & REMAKE) || ogn->made > REQUESTED)
 	/* not waiting for this one */
 	return 0;
-    printf("    `%s%s' has .ORDER dependency against %s%s "
+    printf("    `%s%s' has .ORDER dependency against %s%s ",
-		"(made %d, flags %x, type %x)\n",
+	    gn->name, gn->cohort_num, ogn->name, ogn->cohort_num);
-	    gn->name, gn->cohort_num,
+    GNode_FprintDetails(stdout, "(", ogn, ")\n");
 	    ogn->name, ogn->cohort_num, ogn->made, ogn->flags, ogn->type);
-    if (DEBUG(MAKE) && debug_file != stdout)
+    if (DEBUG(MAKE) && debug_file != stdout) {
-	fprintf(debug_file, "    `%s%s' has .ORDER dependency against %s%s "
+	fprintf(debug_file, "    `%s%s' has .ORDER dependency against %s%s ",
-		    "(made %d, flags %x, type %x)\n",
+		gn->name, gn->cohort_num, ogn->name, ogn->cohort_num);
-		gn->name, gn->cohort_num,
+	GNode_FprintDetails(debug_file, "(", ogn, ")\n");
 		ogn->name, ogn->cohort_num, ogn->made, ogn->flags, ogn->type);
     return 0;
+}
 static int
 MakePrintStatus(void *gnp, void *v_errors)
+{
     GNode   	*gn = (GNode *)gnp;
     int 	*errors = v_errors;
     if (gn->flags & DONECYCLE)
 	/* We've completely processed this node before, don't do it again. */
 	return 0;
     if (gn->unmade == 0) {
 	gn->flags |= DONECYCLE;
 	switch (gn->made) {
 	case UPTODATE:
 	    printf("`%s%s' is up to date.\n", gn->name, gn->cohort_num);
 	    break;
 	case MADE:
 	    break;
 	case UNMADE:
 	case DEFERRED:
 	case REQUESTED:
 	case BEINGMADE:
 	    (*errors)++;
-	    printf("`%s%s' was not built (made %d, flags %x, type %x)!\n",
+	    printf("`%s%s' was not built", gn->name, gn->cohort_num);
-		    gn->name, gn->cohort_num, gn->made, gn->flags, gn->type);
+	    GNode_FprintDetails(stdout, " (", gn, ")!\n");
-	    if (DEBUG(MAKE) && debug_file != stdout)
+	    if (DEBUG(MAKE) && debug_file != stdout) {
-		fprintf(debug_file,
+		fprintf(debug_file, "`%s%s' was not built",
-			"`%s%s' was not built (made %d, flags %x, type %x)!\n",
+			gn->name, gn->cohort_num);
-			gn->name, gn->cohort_num, gn->made, gn->flags, gn->type);
+		GNode_FprintDetails(debug_file, " (", gn, ")!\n");
+	    }
 	    /* Most likely problem is actually caused by .ORDER */
 	    Lst_ForEach(gn->order_pred, MakePrintStatusOrder, gn);
 	    break;
 	default:
 	    /* Errors - already counted */
 	    printf("`%s%s' not remade because of errors.\n",
 		    gn->name, gn->cohort_num);
 	    if (DEBUG(MAKE) && debug_file != stdout)
 		fprintf(debug_file, "`%s%s' not remade because of errors.\n",
 			gn->name, gn->cohort_num);
 	    break;
+	}
 	return 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.h,v 1.125 2020/08/23 17:04:21 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.126 2020/08/24 20:15:51 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.
 @@ -503,26 +503,27 @@ void Make_ExpandUse(Lst);
 time_t Make_Recheck(GNode *);
 void Make_HandleUse(GNode *, GNode *);
 void Make_Update(GNode *);
 void Make_DoAllVar(GNode *);
 Boolean Make_Run(Lst);
 int dieQuietly(GNode *, int);
 void PrintOnError(GNode *, const char *);
 void Main_ExportMAKEFLAGS(Boolean);
 Boolean Main_SetObjdir(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2);
 int mkTempFile(const char *, char **);
 int str2Lst_Append(Lst, char *, const char *);
 int cached_lstat(const char *, void *);
 int cached_stat(const char *, void *);
 void GNode_FprintDetails(FILE *, const char *, const GNode *, const char *);
 #ifdef __GNUC__
 #define UNCONST(ptr)	({ 		\
     union __unconst {			\
 	const void *__cp;		\
 	void *__p;			\
     } __d;				\
     __d.__cp = ptr, __d.__p; })
 #else
 #define UNCONST(ptr)	(void *)(ptr)
 #endif
 #ifndef MIN

 @@ -1,14 +1,14 @@
-/*	$NetBSD: targ.c,v 1.71 2020/08/22 18:20:31 rillig Exp $	*/
+/*	$NetBSD: targ.c,v 1.72 2020/08/24 20:15:51 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.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: targ.c,v 1.71 2020/08/22 18:20:31 rillig Exp $";
+static char rcsid[] = "$NetBSD: targ.c,v 1.72 2020/08/24 20:15:51 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)targ.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: targ.c,v 1.71 2020/08/22 18:20:31 rillig Exp $");
+__RCSID("$NetBSD: targ.c,v 1.72 2020/08/24 20:15:51 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * targ.c --
  *	Functions for maintaining the Lst allTargets. Target nodes are
  * kept in two structures: a Lst, maintained by the list library, and a
  * hash table, maintained by the hash library.
+ *
  * Interface:
  *	Targ_Init 	    	Initialization procedure.
+ *
 @@ -622,28 +622,28 @@ made_name(GNodeMade made)
 /*-
  *-----------------------------------------------------------------------
  * TargPrintNode --
  *	print the contents of a node
  *-----------------------------------------------------------------------
  */
 int
 Targ_PrintNode(void *gnp, void *passp)
+{
     GNode         *gn = (GNode *)gnp;
     int	    	  pass = passp ? *(int *)passp : 0;
-    fprintf(debug_file, "# %s%s, flags %x, type %x, made %d\n",
+    fprintf(debug_file, "# %s%s", gn->name, gn->cohort_num);
-	    gn->name, gn->cohort_num, gn->flags, gn->type, gn->made);
+    GNode_FprintDetails(debug_file, ", ", gn, "\n");
     if (gn->flags == 0)
 	return 0;
     if (!OP_NOP(gn->type)) {
 	fprintf(debug_file, "#\n");
 	if (gn == mainTarg) {
 	    fprintf(debug_file, "# *** MAIN TARGET ***\n");
+	}
 	if (pass >= 2) {
 	    if (gn->unmade) {
 		fprintf(debug_file, "# %d unmade children\n", gn->unmade);
 	    } else {
 		fprintf(debug_file, "# No unmade children\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.469 2020/08/23 22:49:45 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.470 2020/08/24 20:15:51 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.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.469 2020/08/23 22:49:45 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.470 2020/08/24 20:15:51 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.469 2020/08/23 22:49:45 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.470 2020/08/24 20:15:51 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * var.c --
  *	Variable-handling functions
+ *
  * Interface:
  *	Var_Set		    Set the value of a variable in the given
  *			    context. The variable is created if it doesn't
  *			    yet exist.
+ *
 @@ -3120,30 +3120,30 @@ ApplyModifiers(
 	mod = p;
 	if (DEBUG(VAR)) {
 	    char eflags_str[VarEvalFlags_ToStringSize];
 	    char vflags_str[VarFlags_ToStringSize];
 	    Boolean is_single_char = mod[0] != '\0' &&
 		(mod[1] == endc || mod[1] == ':');
 	    /* At this point, only the first character of the modifier can
 	     * be used since the end of the modifier is not yet known. */
 	    VAR_DEBUG("Applying ${%s:%c%s} to \"%s\" "
 		      "(eflags = %s, vflags = %s)\n",
 		      st.v->name, mod[0], is_single_char ? "" : "...", st.val,
-		      Enum_ToString(eflags_str, sizeof eflags_str, st.eflags,
+		      Enum_FlagsToString(eflags_str, sizeof eflags_str,
-				    VarEvalFlags_ToStringSpecs),
+					 st.eflags, VarEvalFlags_ToStringSpecs),
-		      Enum_ToString(vflags_str, sizeof vflags_str, st.v->flags,
+		      Enum_FlagsToString(vflags_str, sizeof vflags_str,
-				    VarFlags_ToStringSpecs));
+					 st.v->flags, VarFlags_ToStringSpecs));
+	}
 	switch (*mod) {
 	case ':':
 	    res = ApplyModifier_Assign(&p, &st);
 	    break;
 	case '@':
 	    res = ApplyModifier_Loop(&p, &st);
 	    break;
 	case '_':
 	    res = ApplyModifier_Remember(&p, &st);
 	    break;
 	case 'D':
 @@ -3265,30 +3265,30 @@ ApplyModifiers(
 	    goto cleanup;
 	if (res == AMR_BAD)
 	    goto bad_modifier;
 	if (DEBUG(VAR)) {
 	    char eflags_str[VarEvalFlags_ToStringSize];
 	    char vflags_str[VarFlags_ToStringSize];
 	    const char *quot = st.newVal == var_Error ? "" : "\"";
 	    const char *newVal = st.newVal == var_Error ? "error" : st.newVal;
 	    VAR_DEBUG("Result of ${%s:%.*s} is %s%s%s "
 		      "(eflags = %s, vflags = %s)\n",
 		      st.v->name, (int)(p - mod), mod, quot, newVal, quot,
-		      Enum_ToString(eflags_str, sizeof eflags_str, st.eflags,
+		      Enum_FlagsToString(eflags_str, sizeof eflags_str,
-				    VarEvalFlags_ToStringSpecs),
+					 st.eflags, VarEvalFlags_ToStringSpecs),
-		      Enum_ToString(vflags_str, sizeof vflags_str, st.v->flags,
+		      Enum_FlagsToString(vflags_str, sizeof vflags_str,
-				    VarFlags_ToStringSpecs));
+					 st.v->flags, VarFlags_ToStringSpecs));
+	}
 	if (st.newVal != st.val) {
 	    if (*freePtr) {
 		free(st.val);
 		*freePtr = NULL;
+	    }
 	    st.val = st.newVal;
 	    if (st.val != var_Error && st.val != varNoError) {
 		*freePtr = st.val;
+	    }
+	}
 	if (*p == '\0' && st.endc != '\0') {
 @@ -3400,28 +3400,28 @@ Var_Parse(const char * const str, GNode
 				 * or braces */
     char	 endc;		/* Ending character if variable in parens
 				 * or braces */
     Boolean	 dynamic;	/* TRUE if the variable is local and we're
 				 * expanding it in a non-local context. This
 				 * is done to support dynamic sources. The
 				 * result is just the invocation, unaltered */
     const char *extramodifiers;
     Var *v;
     char *nstr;
     char eflags_str[VarEvalFlags_ToStringSize];
     VAR_DEBUG("%s: %s with %s\n", __func__, str,
-	      Enum_ToString(eflags_str, sizeof eflags_str, eflags,
+	      Enum_FlagsToString(eflags_str, sizeof eflags_str, eflags,
-			    VarEvalFlags_ToStringSpecs));
+				 VarEvalFlags_ToStringSpecs));
     *freePtr = NULL;
     extramodifiers = NULL;	/* extra modifiers to apply first */
     dynamic = FALSE;
     startc = str[1];
     if (startc != PROPEN && startc != BROPEN) {
 	char name[2];
 	/*
 	 * If it's not bounded by braces of some sort, life is much simpler.
 	 * We just need to check for the first character and return the
 	 * value if it exists.