 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.157 2009/01/23 21:26:30 dsl Exp $	*/
+/*	$NetBSD: parse.c,v 1.158 2009/10/07 16:40:30 sjg 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: parse.c,v 1.157 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.158 2009/10/07 16:40:30 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.157 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: parse.c,v 1.158 2009/10/07 16:40:30 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * parse.c --
  *	Functions to parse a makefile.
+ *
  *	One function, Parse_Init, must be called before any functions
  *	in this module are used. After that, the function Parse_File is the
  *	main entry point and controls most of the other functions in this
  *	module.
+ *
 @@ -2580,35 +2580,50 @@ Parse_File(const char *name, int fd)
 		    if (inLine) {
 			Parse_Error(PARSE_WARNING,
 				     "Shell command needs a leading tab");
 			goto shellCommand;
+		    }
+		}
+	    }
 #endif
 	    ParseFinishLine();
 	    /*
 	     * For some reason - probably to make the parser impossible -
 	     * a ';' can be used to separate commands from dependencies.
-	     * No attempt is made to avoid ';' inside substitution patterns.
+	     * Attempt to avoid ';' inside substitution patterns.
 	     */
 	    for (cp = line; *cp != 0; cp++) {
-		if (*cp == '\\' && cp[1] != 0) {
+		int level = 0;
 		    cp++;
-		    continue;
+		for (cp = line; *cp != 0; cp++) {
 		    if (*cp == '\\' && cp[1] != 0) {
 			cp++;
 			continue;
+		    }
 		    if (*cp == '$' &&
 			(cp[1] == '(' || cp[1] == '{')) {
 			level++;
 			continue;
+		    }
 		    if (level > 0) {
 			if (*cp == ')' || *cp == '}') {
 			    level--;
 			    continue;
+			}
 		    } else if (*cp == ';') {
 			break;
+		    }
+		}
 		if (*cp == ';')
 		    break;
+	    }
 	    if (*cp != 0)
 		/* Terminate the dependency list at the ';' */
 		*cp++ = 0;
 	    else
 		cp = NULL;
 	    /*
 	     * We now know it's a dependency line so it needs to have all
 	     * variables expanded before being parsed. Tell the variable
 	     * module to complain if some variable is undefined...
 	     */
 	    line = Var_Subst(NULL, line, VAR_CMD, TRUE);

 @@ -1,39 +1,40 @@
-# $NetBSD: Makefile,v 1.23 2008/10/25 22:27:39 apb Exp $
+# $NetBSD: Makefile,v 1.24 2009/10/07 16:40:30 sjg Exp $
+#
 # Unit tests for make(1)
 # The main targets are:
+#
 # all:	run all the tests
 # test:	run 'all', capture output and compare to expected results
 # accept: move generated output to expected results
+#
 # Adding a test case.
 # Each feature should get its own set of tests in its own suitably
 # named makefile which should be added to SUBFILES to hook it in.
+#
 .MAIN: all
 UNIT_TESTS:= ${.PARSEDIR}
 # Simple sub-makefiles - we run them as a black box
 # keep the list sorted.
 SUBFILES= \
 	comment \
 	cond1 \
 	export \
 	export-all \
 	dotwait \
 	forsubst \
 	moderrs \
 	modmatch \
 	modmisc \
 	modorder \
 	modts \
 	modword \
 	posix \
 	qequals \
 	ternary \
 	varcmd
 all: ${SUBFILES}

 @@ -57,26 +57,27 @@ recursive.2.99
 shared.0
 shared.0
 shared.1.99
 shared.1.99
 shared.2.1
 shared.2.1
 shared.2.99
 shared.2.99
 make: Graph cycles through `cycle.2.99'
 make: Graph cycles through `cycle.2.98'
 make: Graph cycles through `cycle.2.97'
 cycle.1.99
 cycle.1.99
 .for with :S;... OK
 Expect: Unknown modifier 'Z'
 make: Unknown modifier 'Z'
 VAR:Z=
 Expect: Unknown modifier 'Z'
 make: Unknown modifier 'Z'
 VAR:Z=
 Expect: Unclosed variable specification for VAR
 make: Unclosed variable specification (expecting '}') for "VAR" (value "Thevariable") modifier S
 VAR:S,V,v,=Thevariable
 Expect: Unclosed variable specification for VAR
 make: Unclosed variable specification after complex modifier (expecting '}') for VAR
 VAR:S,V,v,=Thevariable
 Expect: Unclosed substitution for VAR (, missing)