[src/trunk]: src/usr.bin/make make(1): document that nested braces work as ex...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d68143a83c58
branches:  trunk
changeset: 954662:d68143a83c58
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Sep 07 19:48:08 2020 +0000

description:
make(1): document that nested braces work as expected now

diffstat:

 usr.bin/make/dir.c             |  7 +++----
 usr.bin/make/unit-tests/dir.mk |  6 ++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 5fdb0c25d963 -r d68143a83c58 usr.bin/make/dir.c
--- a/usr.bin/make/dir.c        Mon Sep 07 19:46:45 2020 +0000
+++ b/usr.bin/make/dir.c        Mon Sep 07 19:48:08 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.136 2020/09/05 13:55:08 rillig Exp $ */
+/*     $NetBSD: dir.c,v 1.137 2020/09/07 19:48:08 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: dir.c,v 1.136 2020/09/05 13:55:08 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.137 2020/09/07 19:48:08 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)dir.c      8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: dir.c,v 1.136 2020/09/05 13:55:08 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.137 2020/09/07 19:48:08 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -256,7 +256,6 @@
 
 static Hash_Table lmtimes;     /* same as mtimes but for lstat */
 
-static void DirExpandCurly(const char *, const char *, Lst, Lst);
 static void DirExpandInt(const char *, Lst, Lst);
 static int DirPrintWord(void *, void *);
 static int DirPrintDir(void *, void *);
diff -r 5fdb0c25d963 -r d68143a83c58 usr.bin/make/unit-tests/dir.mk
--- a/usr.bin/make/unit-tests/dir.mk    Mon Sep 07 19:46:45 2020 +0000
+++ b/usr.bin/make/unit-tests/dir.mk    Mon Sep 07 19:48:08 2020 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: dir.mk,v 1.4 2020/07/31 20:16:21 rillig Exp $
+# $NetBSD: dir.mk,v 1.5 2020/09/07 19:48:08 rillig Exp $
 #
 # Tests for dir.c.
 
 # Dependency lines may use braces for expansion.
+# See DirExpandCurly for the implementation.
 all: {one,two,three}
 
 one:
@@ -22,7 +23,8 @@
 six:
        @echo 6
 
-# But nested braces don't work.
+# Nested braces work as expected since 2020-07-31 19:06 UTC.
+# They had been broken at least since 2003-01-01, probably even longer.
 all: {{thi,fou}r,fif}teen
 
 thirteen: