 @@ -1,15 +1,15 @@
 %{
-/*	$NetBSD: scan.l,v 1.30 2020/03/08 17:38:37 christos Exp $	*/
+/*	$NetBSD: scan.l,v 1.31 2020/03/09 17:27:03 christos Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -32,80 +32,82 @@
  * 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.
+ *
  *	from: @(#)scan.l	8.1 (Berkeley) 6/6/93
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: scan.l,v 1.30 2020/03/08 17:38:37 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.31 2020/03/09 17:27:03 christos Exp $");
 #include <sys/param.h>
 #include <errno.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stddef.h>
 #include <ctype.h>
 #include <util.h>
 #undef ECHO
 #include "defs.h"
 #include "gram.h"
 int	yyline;
 const char *yyfile;
 const char *lastfile;
 char curinclpath[PATH_MAX];
 uint64_t ifdefstate;
 int	 ifdefshift = -1;
 /*
  * The state is represented by 3 bits.
  */
-#define IDS_MATCH	1ll
+#define	IDS_ENABLED	1ll
-#define IDS_ELIF	2ll
+#define	IDS_MATCH	2ll
-#define	IDS_ELSE	4ll
+#define	IDS_ELIF	4ll
 #define	IDS_ELSE	8ll
 #define IDS_BITS	7
-#define IDS_SHIFT	3
+#define	IDS_BITS	0xf
 #define	IDS_SHIFT	4
 #define IDS_ISMATCH(st) (((st) & IDS_MATCH) != 0)
-#define IDS_PARENT_DISABLED \
+#define	IDS_ISMATCH(st) (((st) & IDS_MATCH) != 0)
-	(ifdefshift > 0 && !IDS_ISMATCH(ifdefstate >> IDS_SHIFT))
+#define	IDS_ISENABLED(st) (((st) & IDS_ENABLED) != 0)
-#define IDS_MAX_DEPTH	21 /* 64 / 3 */
+#define	IDS_PARENT_DISABLED \
 	(ifdefshift > 0 && !IDS_ISENABLED(ifdefstate >> IDS_SHIFT))
 #define IDS_MAX_DEPTH	16 /* 64 / 4 */
-#ifdef IDS_DEBUG
+#ifdef	IDS_DEBUG
 # define IDS_PRINT(s, st, x) \
 	do { \
 		for (int i = 0; i < ifdefshift + 1; i++) \
 			fprintf(stderr, " "); \
 		printf("%s%s [%d,%d,%d] %#" PRIx64 "\n", x, # s, \
 		    IDS_PARENT_DISABLED, IDS_ISMATCH(st), getcurifdef(), \
 		    ifdefstate); \
 	} while (/*CONSTCOND*/0)
 #else
-# define IDS_PRINT(s, st, x) __nothing
+# define IDS_PRINT(s, st, x) ((void)0)
 #endif
-#define IDS_ENTER(s, st) \
+#define	IDS_ENTER(s, st) \
 	IDS_PRINT(s, st, ">")
-#define IDS_EXIT(s, st) \
+#define	IDS_EXIT(s, st) \
 	IDS_PRINT(s, st, "<")
 /*
  * Data for returning to previous files from include files.
  */
 struct incl {
 	struct	incl *in_prev;	/* previous includes in effect, if any */
 	YY_BUFFER_STATE in_buf;	/* previous lex state */
 	struct where in_where;
 	int	in_ateof;	/* token to insert at EOF */
 	int	in_interesting;	/* previous value for "interesting" */
 	uint64_t	in_ifdefstate;	/* conditional level */
 	int	in_ifdefshift;	/* conditional level */
 @@ -185,96 +187,101 @@ vector 		return VECTOR;
 version 	return VERSION;
 with		return WITH;
 \+=		return PLUSEQ;
 :=		return COLONEQ;
 <*>{WS}ifdef[ \t]+{WORD}{RESTOFLINE} {
 		ifdefstate <<= IDS_SHIFT;
 		if (++ifdefshift >= IDS_MAX_DEPTH) {
 			yyerror("too many levels of conditional");
+		}
 		IDS_ENTER(ifdef, 0);
 		if (IDS_PARENT_DISABLED || !getcurifdef()) {
 			ifdefstate &= (uint64_t)~IDS_ENABLED;
 			BEGIN(IGNORED);
 		} else {
-			ifdefstate |= IDS_MATCH;
+			ifdefstate |= IDS_MATCH|IDS_ENABLED;
 			BEGIN(INITIAL);
+		}
 		IDS_EXIT(ifdef, 0);
 		yyline++;
+	}
 <*>{WS}ifndef[ \t]+{WORD}{RESTOFLINE} {
 		ifdefstate <<= IDS_SHIFT;
 		if (++ifdefshift >= IDS_MAX_DEPTH) {
 			yyerror("too many levels of conditional");
+		}
 		IDS_ENTER(ifndef, 0);
 		if (IDS_PARENT_DISABLED || getcurifdef()) {
 			ifdefstate &= (uint64_t)~IDS_ENABLED;
 			BEGIN(IGNORED);
 		} else {
-			ifdefstate |= IDS_MATCH;
+			ifdefstate |= IDS_MATCH|IDS_ENABLED;
 			BEGIN(INITIAL);
+		}
 		IDS_EXIT(ifndef, 0);
 		yyline++;
+	}
 <*>{WS}elifdef[ \t]+{WORD}{RESTOFLINE} {
 		int st = ifdefstate & IDS_BITS;
 		IDS_ENTER(elifdef, st);
 		if (ifdefshift == -1 || (st & IDS_ELSE) != 0) {
 			yyerror("mismatched elifdef");
+		}
 		if (IDS_PARENT_DISABLED || IDS_ISMATCH(st) || !getcurifdef()) {
 			ifdefstate &= (uint64_t)~IDS_ENABLED;
 			BEGIN(IGNORED);
 		} else {
-			ifdefstate |= IDS_MATCH;
+			ifdefstate |= IDS_MATCH|IDS_ENABLED;
 			BEGIN(INITIAL);
+		}
 		ifdefstate |= IDS_ELIF;
 		IDS_EXIT(elifdef, st);
 		yyline++;
+	}
 <*>{WS}elifndef[ \t]+{WORD}{RESTOFLINE} {
 		int st = ifdefstate & IDS_BITS;
 		IDS_ENTER(elifndef, st);
 		if (ifdefshift == -1 || (st & IDS_ELSE) != 0) {
 			yyerror("mismatched elifndef");
+		}
 		if (IDS_PARENT_DISABLED || IDS_ISMATCH(st) || getcurifdef()) {
 			ifdefstate &= (uint64_t)~IDS_ENABLED;
 			BEGIN(IGNORED);
 		} else {
-			ifdefstate |= IDS_MATCH;
+			ifdefstate |= IDS_MATCH|IDS_ENABLED;
 			BEGIN(INITIAL);
+		}
 		ifdefstate |= IDS_ELIF;
 		IDS_EXIT(elifndef, st);
 		yyline++;
+	}
 <*>{WS}else{RESTOFLINE} {
 		int st = ifdefstate & IDS_BITS;
 		IDS_ENTER(else, st);
 		if (ifdefshift == -1 || (st & IDS_ELSE) != 0) {
 			yyerror("mismatched else");
+		}
 		if (IDS_PARENT_DISABLED || IDS_ISMATCH(st)) {
 			ifdefstate &= (uint64_t)~IDS_ENABLED;
 			BEGIN(IGNORED);
 		} else {
-			ifdefstate |= IDS_MATCH;
+			ifdefstate |= IDS_MATCH|IDS_ENABLED;
 			BEGIN(INITIAL);
+		}
 		ifdefstate |= IDS_ELSE;
 		IDS_ENTER(else, st);
 		yyline++;
+	}
 <*>{WS}endif{RESTOFLINE} {
 		IDS_ENTER(endif, 0);
 		if (ifdefshift == -1) {
 			yyerror("mismatched endif");
+		}
 		if (!IDS_PARENT_DISABLED) {