[src/trunk]: src/usr.bin/make From Aleksey Cheusov: Fix unexpected behavior w...

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

details:   https://anonhg.NetBSD.org/src/rev/21624c177350
branches:  trunk
changeset: 759226:21624c177350
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Dec 02 16:46:22 2010 +0000

description:
>From Aleksey Cheusov: Fix unexpected behavior with:
all: test1 test2
test1:
        @echo ${foo::=foo-text}
test2:
        @echo $(foo::=foo-text)
Saying:
nbmake: Unclosed substitution for foo (} missing)
for test 2

diffstat:

 usr.bin/make/var.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 099d347d5e9d -r 21624c177350 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Thu Dec 02 16:36:55 2010 +0000
+++ b/usr.bin/make/var.c        Thu Dec 02 16:46:22 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.160 2010/12/02 16:36:55 christos Exp $       */
+/*     $NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.160 2010/12/02 16:36:55 christos Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos 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.160 2010/12/02 16:36:55 christos Exp $");
+__RCSID("$NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2492,7 +2492,7 @@
                        cp = ++tstr;
                        break;
                    }
-                   delim = BRCLOSE;
+                   delim = startc == PROPEN ? PRCLOSE : BRCLOSE;
                    pattern.flags = 0;
 
                    pattern.rhs = VarGetPattern(ctxt, &parsestate, errnum,