 @@ -1,15 +1,15 @@
 %{
-/*	$NetBSD: scan.l,v 1.27 2020/03/07 19:26:13 christos Exp $	*/
+/*	$NetBSD: scan.l,v 1.28 2020/03/07 22:35:16 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,85 +32,75 @@
  * 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.27 2020/03/07 19:26:13 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.28 2020/03/07 22:35:16 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];
-int ifdefstate = -1;
+uint64_t ifdefstate;
-int st;
+int	 ifdefshift = -1;
 #define IDS_PARENT_DISABLED \
-    ((ifdefstate > 6) && ((((ifdefstate/6)-1) & 1) == 1))
+/*
-#define IDS_MAX_DEPTH		362797056 /* 6^11 */
+ * The state is represented by 3 bits.
-/* States for ifdefstate:
+ */
 #define IDS_MATCH	1ll
--> matched ifdef
+#define IDS_ELIF	2ll
--> unmatched ifdef
+#define	IDS_ELSE	4ll
 -> matched elifdef
--> unmatched elifdef
+#define IDS_BITS	7
--> matched else
+#define IDS_SHIFT	3
 -> unmatched else
   Upon "ifdef", add one and multiply by 6.
   Upon "endif", divide by 6, remove 1.
   ifdef -> MATCH => continue
            MISMATCH => set to 1
   elifdef -> if (!1) -> MISMATCH
              MATCH => set to 2
              MISMATCH => if (2 || 3) set to 3, else set to 1
   else -> if (1) -> MATCH
           MATCH => set to 4
           MISMATCH => set to 5
-  in each case, if parent & 1 == 1, MISMATCH
+#define IDS_ISMATCH(st) (((st) & IDS_MATCH) != 0)
-*/
+#define IDS_PARENT_DISABLED \
 	(ifdefshift > 0 && !IDS_ISMATCH(ifdefstate >> IDS_SHIFT))
 #define IDS_MAX_DEPTH	21 /* 64 / 3 */
 /*
  * 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" */
-	int	in_ifdefstate;	/* conditional level */
+	uint64_t	in_ifdefstate;	/* conditional level */
 	int	in_ifdefshift;	/* conditional level */
 };
 static struct incl *incl;
 static int endinclude(void);
 static int getincludepath(void);
 static int getcurifdef(void);
 %}
 %option  noyywrap nounput noinput
 PATH	[A-Za-z_0-9]*[./][-A-Za-z_0-9./]*
 QCHARS	\"(\\.|[^\\"])*\"
 @@ -170,117 +160,108 @@ pseudo-root	return PSEUDO_ROOT;
 root		return ROOT;
 select		return SELECT;
 single		return SINGLE;
 source		return SOURCE;
 type		return TYPE;
 vector 		return VECTOR;
 version 	return VERSION;
 with		return WITH;
 \+=		return PLUSEQ;
 :=		return COLONEQ;
 <*>ifdef[ \t]+{WORD}{RESTOFLINE} {
-		ifdefstate = (ifdefstate + 1) * 6;
+		ifdefstate <<= IDS_SHIFT;
-		if (ifdefstate >= IDS_MAX_DEPTH) {
+		if (++ifdefshift >= IDS_MAX_DEPTH) {
 			yyerror("too many levels of conditional");
+		}
-		if (!IDS_PARENT_DISABLED && getcurifdef()) {
+		if (IDS_PARENT_DISABLED || !getcurifdef()) {
 			BEGIN(INITIAL);
 		} else {
 			ifdefstate++;
 			BEGIN(IGNORED);
 		} else {
 			ifdefstate |= IDS_MATCH;
 			BEGIN(INITIAL);
+		}
 		yyline++;
+	}
 <*>ifndef[ \t]+{WORD}{RESTOFLINE} {
-		ifdefstate = (ifdefstate + 1) * 6;
+		ifdefstate <<= IDS_SHIFT;
-		if (ifdefstate >= IDS_MAX_DEPTH) {
+		if (++ifdefshift >= IDS_MAX_DEPTH) {
 			yyerror("too many levels of conditional");
+		}
-		if (!IDS_PARENT_DISABLED && !getcurifdef()) {
+		if (IDS_PARENT_DISABLED || getcurifdef()) {
 			BEGIN(INITIAL);
 		} else {
 			ifdefstate++;
 			BEGIN(IGNORED);
 		} else {
 			ifdefstate |= IDS_MATCH;
 			BEGIN(INITIAL);
+		}
 		yyline++;
+	}
 <*>elifdef[ \t]+{WORD}{RESTOFLINE} {
-		st = ifdefstate % 6;
+		int st = ifdefstate & IDS_BITS;
-		if (ifdefstate < 0 || st > 3) {
+		if (ifdefshift == -1 || (st & IDS_ELSE) != 0) {
 			yyerror("mismatched elifdef");
+		}
-		if (IDS_PARENT_DISABLED ||
+		if (IDS_PARENT_DISABLED || IDS_ISMATCH(st) || !getcurifdef()) {
 		    st != 1 || !getcurifdef()) {
 			if (st == 2 || st == 3) {
 				ifdefstate += 3 - st;
 			} else {
 				ifdefstate += 1 - st;
 			BEGIN(IGNORED);
 		} else {
-			ifdefstate++;
+			ifdefstate |= IDS_MATCH;
 			BEGIN(INITIAL);
+		}
 		ifdefstate |= IDS_ELIF;
 		yyline++;
+	}
 <*>elifndef[ \t]+{WORD}{RESTOFLINE} {
-		st = ifdefstate % 6;
+		int st = ifdefstate & IDS_BITS;
-		if (ifdefstate < 0 || st > 3) {
+		if (ifdefshift == -1 || (st & IDS_ELSE) != 0) {
 			yyerror("mismatched elifndef");
+		}
-		if (IDS_PARENT_DISABLED ||
+		if (IDS_PARENT_DISABLED || IDS_ISMATCH(st) || getcurifdef()) {
 		    st != 1 || getcurifdef()) {
 			if (st == 2 || st == 3) {
 				ifdefstate += 3 - st;
 			} else {
 				ifdefstate += 1 - st;
 			BEGIN(IGNORED);
 		} else {
-			ifdefstate++;
+			ifdefstate |= IDS_MATCH;
 			BEGIN(INITIAL);
+		}
 		ifdefstate |= IDS_ELIF;
 		yyline++;
+	}
 <*>else{RESTOFLINE} {
-		st = ifdefstate % 6;
+		int st = ifdefstate & IDS_BITS;
-		if (ifdefstate < 0 || st > 3) {
+		if (ifdefshift == -1 || (st & IDS_ELSE) != 0) {
 			yyerror("mismatched else");
+		}
-		if (!IDS_PARENT_DISABLED && (st == 1)) {
+		if (IDS_PARENT_DISABLED || IDS_ISMATCH(st)) {
 			ifdefstate += 3;
 			BEGIN(INITIAL);
 		} else {
 			ifdefstate += 5 - st;
 			BEGIN(IGNORED);
 		} else {
 			ifdefstate |= IDS_MATCH;
 			BEGIN(INITIAL);
+		}
 		ifdefstate |= IDS_ELSE;
 		yyline++;
+	}
 <*>endif{RESTOFLINE} {
-		if (ifdefstate < 0) {
+		if (ifdefshift == -1) {
 			yyerror("mismatched endif");
+		}
 		if (!IDS_PARENT_DISABLED) {
 			BEGIN(INITIAL);
+		}
-		ifdefstate = (ifdefstate/6) - 1;
+		ifdefshift--;
 		ifdefstate >>= IDS_SHIFT;
 		yyline++;
+	}
 <IGNORED>\n		{
 		yyline++;
+	}
 <IGNORED>.	/* ignore */
 include[ \t]+{FILENAME}{RESTOFLINE}	{
 		yyline++;
 		if (getincludepath()) {
 			include(curinclpath, 0, 0, 1);
 @@ -359,27 +340,27 @@ package[ \t]+{FILENAME}{RESTOFLINE}	{
 		yyline++;
 		return '\n';
+	}
 \00	{
 		/* Detect NUL characters in the config file and
 		 * error out.
 		 */
 		cfgerror("NUL character detected at line %i", yyline);
+	}
 #.*	{ /* ignored (comment) */; }
 [ \t]+	{ /* ignored (white space) */; }
 .	{ return yytext[0]; }
 <*><<EOF>> {
-		if (ifdefstate > (incl == NULL ? -1 : incl->in_ifdefstate)) {
+		if (ifdefshift > (incl == NULL ? -1 : incl->in_ifdefshift)) {
 			yyerror("reached EOF while looking for endif");
+		}
 		if (incl == NULL)
 			return YY_NULL;
 		tok = endinclude();
 		if (tok)
 			return tok;
 		/* otherwise continue scanning */
+	}
 %%
 int interesting = 1;
 @@ -520,26 +501,27 @@ include(const char *fname, int ateof, in
 		cfgerror("cannot record current working directory for %s", s);
 		fclose(fp);
 		free(s);
 		return (-1);
+	}
 	in = ecalloc(1, sizeof *in);
 	in->in_prev = incl;
 	in->in_buf = YY_CURRENT_BUFFER;
 	in->in_where.w_srcfile = yyfile;
 	in->in_where.w_srcline = (u_short)yyline;
 	in->in_ateof = ateof;
 	in->in_interesting = interesting;
 	in->in_ifdefstate = ifdefstate;
 	in->in_ifdefshift = ifdefshift;
 	interesting = direct & interesting;
 	if (interesting)
 		logconfig_include(fp, fname);
 	incl = in;
 	CFGDBG(1, "include `%s' from `%s' line %d", fname, yyfile, yyline);
 	yy_switch_to_buffer(yy_create_buffer(fp, YY_BUF_SIZE));
 	yyfile = intern(s);
 	yyline = 1;
 	free(s);
 	includedepth++;
 	return (0);
+}
 @@ -590,26 +572,28 @@ endinclude(void)
 	curdir_pop();
 	if ((in = incl) == NULL)
 		panic("endinclude");
 	incl = in->in_prev;
 	lastfile = yyfile;
 	yy_delete_buffer(YY_CURRENT_BUFFER);
 	(void)fclose(yyin);
 	yy_switch_to_buffer(in->in_buf);
 	yyfile = in->in_where.w_srcfile;
 	yyline = in->in_where.w_srcline;
 	ateof  = in->in_ateof;
 	interesting = in->in_interesting;
 	ifdefstate = in->in_ifdefstate;
 	ifdefshift = in->in_ifdefshift;
 	free(in);
 	includedepth--;
 	return (ateof);
+}
 /*
  * Return the current line number.  If yacc has looked ahead and caused
  * us to consume a newline, we have to subtract one.  yychar is yacc's
  * token lookahead, so we can tell.
  */
 u_short