 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.420 2020/11/01 00:24:57 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.421 2020/11/02 22:44:29 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.
 @@ -107,27 +107,27 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif
 #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.420 2020/11/01 00:24:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.421 2020/11/02 22:44:29 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
     char *fname;		/* name of file */
     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 */
 @@ -1840,26 +1840,28 @@ Parse_IsVar(const char *p, VarAssign *ou
 	p++;
     /* During parsing, the '+' of the '+=' operator is initially parsed
      * as part of the variable name.  It is later corrected, as is the ':sh'
      * modifier. Of these two (nameEnd and op), the earlier one determines the
      * actual end of the variable name. */
     pvar.nameStart = p;
 #ifdef CLEANUP
     pvar.nameEnd = NULL;
     pvar.eq = NULL;
 #endif
     /* Scan for one of the assignment operators outside a variable expansion */
     /* FIXME: undefined behavior. In unit-tests/varname.mk:try1, at the end
      * of the loop, p already points to the next line. */
     while ((ch = *p++) != 0) {
 	if (ch == '(' || ch == '{') {
 	    level++;
 	    continue;
+	}
 	if (ch == ')' || ch == '}') {
 	    level--;
 	    continue;
+	}
 	if (level != 0)
 	    continue;

 @@ -1,26 +1,26 @@
 Global:VAR{{{}}} = 3 braces
 Var_Parse: ${VAR{{{}}}}" != "3 braces" with VARE_WANTRES
 Global:VARNAME = VAR(((
 Var_Parse: ${VARNAME} with VARE_WANTRES
 Global:VAR((( = 3 open parentheses
 Var_Parse: ${VAR(((}}}}" != "3 open parentheses}}}" with VARE_WANTRES
 Var_Parse: ${:UVAR(((}=	try1 with VARE_UNDEFERR|VARE_WANTRES
 Applying ${:U...} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF)
 Result of ${:UVAR(((} is "VAR(((" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF)
 Global:.ALLTARGETS =  VAR(((=)
 No closing parenthesis in archive specification
-make: "varname.mk" line 26: Error in archive specification: "VAR"
+make: "varname.mk" line 29: Error in archive specification: "VAR"
 Var_Parse: ${:UVAR\(\(\(}=	try2 with VARE_UNDEFERR|VARE_WANTRES
 Applying ${:U...} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF)
 Result of ${:UVAR\(\(\(} is "VAR\(\(\(" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF)
 Global:.ALLTARGETS =  VAR(((=) VAR\(\(\(=
-make: "varname.mk" line 27: Need an operator
+make: "varname.mk" line 30: Need an operator
 Var_Parse: ${:UVAR\(\(\(}=	try3 with VARE_UNDEFERR|VARE_WANTRES
 Applying ${:U...} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF)
 Result of ${:UVAR\(\(\(} is "VAR\(\(\(" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF)
-make: "varname.mk" line 28: Need an operator
+make: "varname.mk" line 31: Need an operator
 Global:.MAKEFLAGS =  -r -k -d v -d
 Global:.MAKEFLAGS =  -r -k -d v -d 0
 make: Fatal errors encountered -- cannot continue
 make: stopped in unit-tests
 exit status 1

 @@ -1,32 +1,36 @@
-# $NetBSD: varname.mk,v 1.6 2020/11/02 22:29:48 rillig Exp $
+# $NetBSD: varname.mk,v 1.7 2020/11/02 22:44:29 rillig Exp $
+#
 # Tests for special variables, such as .MAKE or .PARSEDIR.
 # And for variable names in general.
 .MAKEFLAGS: -dv
 # In variable names, braces are allowed, but they must be balanced.
 # Parentheses and braces may be mixed.
 VAR{{{}}}=	3 braces
 .if "${VAR{{{}}}}" != "3 braces"
 .  error
 .endif
 # In variable expressions, the parser works differently.  It doesn't treat
 # braces and parentheses equally, therefore the first closing brace already
 # marks the end of the variable name.
 VARNAME=	VAR(((
 ${VARNAME}=	3 open parentheses
 .if "${VAR(((}}}}" != "3 open parentheses}}}"
 .  error
 .endif
 # In the above test, the variable name is constructed indirectly.  Neither
 # of the following expressions produces the intended effect.
+#
 # This is not a variable assignment since the parentheses and braces are not
 # balanced.  At the end of the line, there are still 3 levels open, which
 # means the variable name is not finished.
 ${:UVAR(((}=	try1
 ${:UVAR\(\(\(}=	try2
 ${:UVAR\(\(\(}=	try3
 .MAKEFLAGS: -d0
 all: