 @@ -1,14 +1,14 @@
-/*	$NetBSD: lint.h,v 1.20 2021/01/01 11:58:03 rillig Exp $	*/
+/*	$NetBSD: lint.h,v 1.21 2021/01/02 01:06:15 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -28,29 +28,30 @@
  * 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #else
 #define HAVE_DECL_SYS_SIGNAME 1
 #endif
 #include <sys/types.h>
 #include <stddef.h>
 #include <err.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include "param.h"
 /*
  * Type specifiers, used in type structures (type_t) and elsewhere.
  */
 typedef enum {
 	NOTSPEC = 0,
 	SIGNED,		/* keyword "signed", only used in the parser */
 	UNSIGN,		/* keyword "unsigned", only used in the parser */
 	BOOL,		/* _Bool */
 	CHAR,		/* char */
 @@ -85,32 +86,32 @@ typedef enum {
 #define NTSPEC (LCOMPLEX + 1)
 } tspec_t;
 /*
  * size of types, name and classification
  */
 typedef	struct {
 	size_t	tt_sz;			/* size in bits */
 	size_t	tt_psz;			/* size, different from tt_sz
 					   if pflag is set */
 	tspec_t	tt_signed_counterpart;
 	tspec_t	tt_unsigned_counterpart;
-	u_int	tt_is_int : 1;		/* 1 if integer type */
+	bool	tt_is_int : 1;		/* integer type */
-	u_int	tt_is_uint : 1;		/* 1 if unsigned integer type */
+	bool	tt_is_uint : 1;		/* unsigned integer type */
-	u_int	tt_is_float : 1;	/* 1 if floating point type */
+	bool	tt_is_float : 1;	/* floating point type */
-	u_int	tt_is_arith : 1;	/* 1 if arithmetic type */
+	bool	tt_is_arith : 1;	/* arithmetic type */
-	u_int	tt_is_scalar : 1;	/* 1 if scalar type */
+	bool	tt_is_scalar : 1;	/* scalar type */
-	u_int	tt_is_complex : 1;	/* 1 if complex type */
+	bool	tt_is_complex : 1;	/* complex type */
 	const char *tt_name;		/* name of the type */
 } ttab_t;
 #define size(t)			(ttab[t].tt_sz)
 #define psize(t)		(ttab[t].tt_psz)
 #define signed_type(t)		(ttab[t].tt_signed_counterpart)
 #define unsigned_type(t)	(ttab[t].tt_unsigned_counterpart)
 #define tspec_is_int(t)		(ttab[t].tt_is_int)
 #define tspec_is_uint(t)	(ttab[t].tt_is_uint)
 #define tspec_is_float(t)	(ttab[t].tt_is_float)
 #define tspec_is_arith(t)	(ttab[t].tt_is_arith)
 #define tspec_is_complex(t)	(ttab[t].tt_is_complex)
 #define tspec_is_scalar(t)	(ttab[t].tt_is_scalar)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.55 2021/01/01 20:02:56 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.56 2021/01/02 01:06:15 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.55 2021/01/01 20:02:56 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.56 2021/01/02 01:06:15 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Type of stack which is used for initialisation of aggregate types.
+ *
  * XXX: Since C99, a stack is an inappropriate data structure for modelling
  * an initialization, since the designators don't have to be listed in a
 @@ -55,29 +55,29 @@ __RCSID("$NetBSD: init.c,v 1.55 2021/01/
  * of non-leaf structs may thus appear repeatedly, as demonstrated in
  * d_init_pop_member.c.
+ *
  * XXX: During initialization, there may be members of the top-level struct
  * that are partially initialized.  The simple i_remaining cannot model this
  * appropriately.
+ *
  * See C99 6.7.8, which spans 6 pages full of tricky details and carefully
  * selected examples.
  */
 typedef	struct istk {
 	type_t	*i_type;		/* type of initialisation */
 	type_t	*i_subt;		/* type of next level */
-	u_int	i_brace : 1;		/* need } for pop */
+	bool	i_brace : 1;		/* need } for pop */
-	u_int	i_nolimit : 1;		/* incomplete array type */
+	bool	i_nolimit : 1;		/* incomplete array type */
-	u_int	i_namedmem : 1;		/* has c9x named members */
+	bool	i_namedmem : 1;		/* has c9x named members */
 	sym_t	*i_mem;			/* next structure member */
 	int	i_remaining;		/* # of remaining elements */
 	struct	istk *i_next;		/* previous level */
 } istk_t;
 /*
  * The names for a nested C99 initialization designator, in a circular list.
+ *
  * Example:
  *	struct stat st = {
  *		.st_size = 123,
  *		.st_mtim.tv_sec = 45,
  *		.st_mtim.tv_nsec

 @@ -1,14 +1,14 @@
-/* $NetBSD: lint1.h,v 1.46 2021/01/01 19:15:58 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.47 2021/01/02 01:06:15 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -117,57 +117,57 @@ typedef struct {
 /*
  * Structures of type str_t uniqely identify structures. This can't
  * be done in structures of type type_t, because these are copied
  * if they must be modified. So it would not be possible to check
  * if two structures are identical by comparing the pointers to
  * the type structures.
+ *
  * The typename is used if the structure is unnamed to identify
  * the structure type in pass 2.
  */
 typedef	struct {
 	u_int	size;		/* size in bit */
 	u_int	align : 15;	/* alignment in bit */
-	u_int	sincompl : 1;	/* set if incomplete type */
+	bool	sincompl : 1;	/* set if incomplete type */
 	struct	sym *memb;	/* list of members */
 	struct	sym *stag;	/* symbol table entry of tag */
 	struct	sym *stdef;	/* symbol table entry of first typename */
 } str_t;
 /*
  * same as above for enums
  */
 typedef	struct {
-	u_int	eincompl : 1;	/* incomplete enum type */
+	bool	eincompl : 1;	/* incomplete enum type */
 	struct	sym *elem;	/* list of enumerators */
 	struct	sym *etag;	/* symbol table entry of tag */
 	struct	sym *etdef;	/* symbol table entry of first typename */
 } tenum_t;
 /*
  * Types are represented by concatenation of structures of type type_t
  * via t_subt.
  */
 struct type {
 	tspec_t	t_tspec;	/* type specifier */
-	u_int	t_aincompl : 1;	/* incomplete array type */
+	bool	t_aincompl : 1;	/* incomplete array type */
-	u_int	t_const : 1;	/* const modifier */
+	bool	t_const : 1;	/* const modifier */
-	u_int	t_volatile : 1;	/* volatile modifier */
+	bool	t_volatile : 1;	/* volatile modifier */
-	u_int	t_proto : 1;	/* function prototype (t_args valid) */
+	bool	t_proto : 1;	/* function prototype (t_args valid) */
-	u_int	t_vararg : 1;	/* prototype with ... */
+	bool	t_vararg : 1;	/* prototype with ... */
-	u_int	t_typedef : 1;	/* type defined with typedef */
+	bool	t_typedef : 1;	/* type defined with typedef */
-	u_int	t_isfield : 1;	/* type is bitfield */
+	bool	t_isfield : 1;	/* type is bitfield */
-	u_int	t_isenum : 1;	/* type is (or was) enum (t_enum valid) */
+	bool	t_isenum : 1;	/* type is (or was) enum (t_enum valid) */
-	u_int	t_ispacked : 1;	/* type is packed */
+	bool	t_ispacked : 1;	/* type is packed */
 	union {
 		int	_t_dim;		/* dimension */
 		str_t	*_t_str;	/* struct/union tag */
 		tenum_t	*_t_enum;	/* enum tag */
 		struct	sym *_t_args;	/* arguments (if t_proto) */
 	} t_u;
 	struct {
 		u_int	_t_flen : 8;	/* length of bit-field */
 		u_int	_t_foffs : 24;	/* offset of bit-field */
 	} t_b;
 	struct	type *t_subt;	/* element type (arrays), return value
 				   (functions), or type pointer points to */
 };
 @@ -216,36 +216,36 @@ typedef enum {
  * symbol table entry
  */
 typedef	struct sym {
 	const	char *s_name;
 	const	char *s_rename;	/* renamed symbol's given name */
 	pos_t	s_def_pos;	/* position of last (prototype) definition,
 				   prototype declaration, no-prototype-def.,
 				   tentative definition or declaration,
 				   in this order */
 	pos_t	s_set_pos;	/* position of first initialisation */
 	pos_t	s_use_pos;	/* position of first use */
 	symt_t	s_kind;		/* type of symbol */
 	void   *s_keyword;
-	u_int	s_bitfield : 1;
+	bool	s_bitfield : 1;
-	u_int	s_set : 1;	/* variable set, label defined */
+	bool	s_set : 1;	/* variable set, label defined */
-	u_int	s_used : 1;	/* variable/label used */
+	bool	s_used : 1;	/* variable/label used */
-	u_int	s_arg : 1;	/* symbol is function argument */
+	bool	s_arg : 1;	/* symbol is function argument */
-	u_int	s_reg : 1;	/* symbol is register variable */
+	bool	s_reg : 1;	/* symbol is register variable */
-	u_int	s_defarg : 1;	/* undefined symbol in old style function
+	bool	s_defarg : 1;	/* undefined symbol in old style function
 				   definition */
-	u_int	s_rimpl : 1;	/* return value of function implicit decl. */
+	bool	s_rimpl : 1;	/* return value of function implicit decl. */
-	u_int	s_osdef : 1;	/* symbol stems from old style function def. */
+	bool	s_osdef : 1;	/* symbol stems from old style function def. */
-	u_int	s_inline : 1;	/* true if this is an inline function */
+	bool	s_inline : 1;	/* true if this is an inline function */
 	struct	sym *s_ext_sym;	/* for local declared external symbols pointer
 				   to external symbol with same name */
 	def_t	s_def;		/* declared, tentative defined, defined */
 	scl_t	s_scl;		/* storage class */
 	int	s_blklev;	/* level of declaration, -1 if not in symbol
 				   table */
 	type_t	*s_type;
 	val_t	s_value;	/* value (if enum constant) */
 	union {
 		str_t	*_s_st;	/* tag, if it is a struct/union member */
 		tenum_t	*_s_et;	/* tag, if it is an enumerator */
 		tspec_t	_s_tsp;	/* type (only for keywords) */
 		tqual_t	_s_tqu;	/* qualifier (only for keywords) */
 @@ -274,29 +274,29 @@ typedef	struct sbuf {
 	size_t	sb_len;			/* length (without '\0') */
 	int	sb_hash;		/* hash value */
 	sym_t	*sb_sym;		/* symbol table entry */
 	struct	sbuf *sb_next;		/* for freelist */
 } sbuf_t;
 /*
  * tree node
  */
 typedef	struct tnode {
 	op_t	tn_op;		/* operator */
 	type_t	*tn_type;	/* type */
-	u_int	tn_lvalue : 1;	/* node is lvalue */
+	bool	tn_lvalue : 1;	/* node is lvalue */
-	u_int	tn_cast : 1;	/* if tn_op == CVT, it's an explicit cast */
+	bool	tn_cast : 1;	/* if tn_op == CVT, it's an explicit cast */
-	u_int	tn_parenthesized : 1; /* node parenthesized */
+	bool	tn_parenthesized : 1;
 	union {
 		struct {
 			struct	tnode *_tn_left;	/* (left) operand */
 			struct	tnode *_tn_right;	/* right operand */
 		} tn_s;
 		sym_t	*_tn_sym;	/* symbol if op == NAME */
 		val_t	*_tn_val;	/* value if op == CON */
 		strg_t	*_tn_string;	/* string if op == STRING */
 	} tn_u;
 } tnode_t;
 #define	tn_left	tn_u.tn_s._tn_left
 #define tn_right tn_u.tn_s._tn_right
 @@ -322,82 +322,82 @@ typedef	struct tnode {
  */
 typedef	struct dinfo {
 	tspec_t	d_atyp;		/* VOID, CHAR, INT, or COMPLEX */
 	tspec_t	d_cmod;		/* FLOAT, or DOUBLE */
 	tspec_t	d_smod;		/* SIGNED or UNSIGN */
 	tspec_t	d_lmod;		/* SHORT, LONG or QUAD */
 	scl_t	d_scl;		/* storage class */
 	type_t	*d_type;	/* after deftyp() pointer to the type used
 				   for all declarators */
 	sym_t	*d_rdcsym;	/* redeclared symbol */
 	int	d_offset;	/* offset of next structure member */
 	int	d_stralign;	/* alignment required for current structure */
 	scl_t	d_ctx;		/* context of declaration */
-	u_int	d_const : 1;	/* const in declaration specifiers */
+	bool	d_const : 1;	/* const in declaration specifiers */
-	u_int	d_volatile : 1;	/* volatile in declaration specifiers */
+	bool	d_volatile : 1;	/* volatile in declaration specifiers */
-	u_int	d_inline : 1;	/* inline in declaration specifiers */
+	bool	d_inline : 1;	/* inline in declaration specifiers */
-	u_int	d_mscl : 1;	/* multiple storage classes */
+	bool	d_mscl : 1;	/* multiple storage classes */
-	u_int	d_terr : 1;	/* invalid type combination */
+	bool	d_terr : 1;	/* invalid type combination */
-	u_int	d_nedecl : 1;	/* 1 if at least a tag is declared */
+	bool	d_nedecl : 1;	/* if at least one tag is declared */
-	u_int	d_vararg : 1;	/* ... in in current function decl. */
+	bool	d_vararg : 1;	/* ... in in current function decl. */
-	u_int	d_proto : 1;	/* current funct. decl. is prototype */
+	bool	d_proto : 1;	/* current function decl. is prototype */
-	u_int	d_notyp : 1;	/* set if no type specifier was present */
+	bool	d_notyp : 1;	/* set if no type specifier was present */
-	u_int	d_asm : 1;	/* set if d_ctx == AUTO and asm() present */
+	bool	d_asm : 1;	/* set if d_ctx == AUTO and asm() present */
-	u_int	d_ispacked : 1;	/* packed */
+	bool	d_ispacked : 1;	/* packed */
-	u_int	d_used : 1;	/* used */
+	bool	d_used : 1;	/* used */
 	type_t	*d_tagtyp;	/* tag during member declaration */
 	sym_t	*d_fargs;	/* list of arguments during function def. */
 	pos_t	d_fdpos;	/* position of function definition */
 	sym_t	*d_dlsyms;	/* first symbol declared at this level */
 	sym_t	**d_ldlsym;	/* points to s_dlnxt in last symbol decl.
 				   at this level */
 	sym_t	*d_fpsyms;	/* symbols defined in prototype */
 	struct	dinfo *d_next;	/* next level */
 } dinfo_t;
 /*
  * Used to collect information about pointers and qualifiers in
  * declarators.
  */
 typedef	struct pqinf {
 	int	p_pcnt;			/* number of asterisks */
-	u_int	p_const : 1;
+	bool	p_const : 1;
-	u_int	p_volatile : 1;
+	bool	p_volatile : 1;
 	struct	pqinf *p_next;
 } pqinf_t;
 /*
  * Case values are stored in a list of type clst_t.
  */
 typedef	struct clst {
 	val_t	cl_val;
 	struct	clst *cl_next;
 } clst_t;
 /*
  * Used to keep information about nested control statements.
  */
 typedef struct cstk {
 	int	c_env;			/* type of statement (T_IF, ...) */
-	u_int	c_loop : 1;		/* continue && break are valid */
+	bool	c_loop : 1;		/* continue && break are valid */
-	u_int	c_switch : 1;		/* case && break are valid */
+	bool	c_switch : 1;		/* case && break are valid */
-	u_int	c_break : 1;		/* loop/switch has break */
+	bool	c_break : 1;		/* loop/switch has break */
-	u_int	c_cont : 1;		/* loop has continue */
+	bool	c_cont : 1;		/* loop has continue */
-	u_int	c_default : 1;		/* switch has default */
+	bool	c_default : 1;		/* switch has default */
-	u_int	c_infinite : 1;		/* break condition always false
+	bool	c_infinite : 1;		/* break condition always false
 					   (for (;;), while (1)) */
-	u_int	c_rchif : 1;		/* end of if-branch reached */
+	bool	c_rchif : 1;		/* end of if-branch reached */
-	u_int	c_noretval : 1;		/* had "return;" */
+	bool	c_noretval : 1;		/* had "return;" */
-	u_int	c_retval : 1;		/* had "return (e);" */
+	bool	c_retval : 1;		/* had "return (e);" */
 	type_t	*c_swtype;		/* type of switch expression */
 	clst_t	*c_clst;		/* list of case values */
 	struct	mbl *c_fexprm;		/* saved memory for end of loop
 					   expression in for() */
 	tnode_t	*c_f3expr;		/* end of loop expr in for() */
 	pos_t	c_fpos;			/* position of end of loop expr */
 	pos_t	c_cfpos;	        /* same for csrc_pos */
 	struct	cstk *c_next;		/* outer control statement */
 } cstk_t;
 typedef struct {
 	size_t lo;
 	size_t hi;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: op.h,v 1.7 2020/12/28 19:38:54 rillig Exp $	*/
+/*	$NetBSD: op.h,v 1.8 2021/01/02 01:06:15 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,41 +21,43 @@
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND 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 AUTHOR 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.
  */
 #include <stdbool.h>
 /*
  * Various information about operators
  */
 typedef	struct {
-	u_int	m_binary : 1;	/* binary operator */
+	bool	m_binary : 1;	/* binary operator */
-	u_int	m_logical : 1;	/* logical operator, result is int */
+	bool	m_logical : 1;	/* logical operator, result is int */
-	u_int	m_requires_integer : 1;
+	bool	m_requires_integer : 1;
-	u_int	m_requires_scalar : 1;
+	bool	m_requires_scalar : 1;
-	u_int	m_requires_arith : 1;
+	bool	m_requires_arith : 1;
-	u_int	m_fold : 1;	/* operands should be folded */
+	bool	m_fold : 1;	/* operands should be folded */
-	u_int	m_vctx : 1;	/* value context for left operand */
+	bool	m_vctx : 1;	/* value context for left operand */
-	u_int	m_tctx : 1;	/* test context for left operand */
+	bool	m_tctx : 1;	/* test context for left operand */
-	u_int	m_balance : 1;	/* operator requires balancing */
+	bool	m_balance : 1;	/* operator requires balancing */
-	u_int	m_sideeff : 1;	/* operator has side effect */
+	bool	m_sideeff : 1;	/* operator has side effect */
-	u_int	m_tlansiu : 1;	/* warn if left op. is unsign. in ANSI C */
+	bool	m_tlansiu : 1;	/* warn if left op. is unsign. in ANSI C */
-	u_int	m_transiu : 1;	/* warn if right op. is unsign. in ANSI C */
+	bool	m_transiu : 1;	/* warn if right op. is unsign. in ANSI C */
-	u_int	m_tpconf : 1;	/* test possible precedence confusion */
+	bool	m_tpconf : 1;	/* test possible precedence confusion */
-	u_int	m_comp : 1;	/* operator performs comparison */
+	bool	m_comp : 1;	/* operator performs comparison */
-	u_int	m_valid_on_enum : 1;	/* valid operation on enums */
+	bool	m_valid_on_enum : 1;	/* valid operation on enums */
-	u_int	m_bad_on_enum : 1;	/* dubious operation on enums */
+	bool	m_bad_on_enum : 1;	/* dubious operation on enums */
-	u_int	m_eqwarn : 1;	/* warning if on operand stems from == */
+	bool	m_eqwarn : 1;	/* warning if on operand stems from == */
-	u_int	m_requires_integer_or_complex : 1;
+	bool	m_requires_integer_or_complex : 1;
 	const char *m_name;	/* name of op. */
 } mod_t;
 extern mod_t   modtab[];
 #include "ops.h"

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: scan.l,v 1.109 2021/01/01 11:51:15 rillig Exp $ */
+/* $NetBSD: scan.l,v 1.110 2021/01/02 01:06:15 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -25,27 +25,27 @@
  * 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 AUTHOR 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.
  */
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.109 2021/01/01 11:51:15 rillig Exp $");
+__RCSID("$NetBSD: scan.l,v 1.110 2021/01/02 01:06:15 rillig Exp $");
 #endif
 #include <ctype.h>
 #include <errno.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 @@ -189,30 +189,30 @@ badchar(int c)
 	error(250, c);
+}
 /*
  * Keywords.
  * During initialisation they are written to the symbol table.
  */
 static	struct	kwtab {
 	const	char *kw_name;	/* keyword */
 	int	kw_token;	/* token returned by yylex() */
 	scl_t	kw_scl;		/* storage class if kw_token T_SCLASS */
 	tspec_t	kw_tspec;	/* type spec. if kw_token T_TYPE or T_SOU */
 	tqual_t	kw_tqual;	/* type qual. fi kw_token T_QUAL */
-	u_int	kw_c89 : 1;	/* c89 keyword */
+	bool	kw_c89 : 1;	/* C89 keyword */
-	u_int	kw_c99 : 1;	/* c99 keyword */
+	bool	kw_c99 : 1;	/* C99 keyword */
-	u_int	kw_gcc : 1;	/* GCC keyword */
+	bool	kw_gcc : 1;	/* GCC keyword */
-	u_int	kw_attr : 1;	/* GCC attribute, keyword */
+	bool	kw_attr : 1;	/* GCC attribute, keyword */
 	u_int	kw_deco : 3;	/* 1 = name, 2 = __name, 4 = __name__ */
 } kwtab[] = {
 #ifdef INT128_SIZE
 	{ "__int128_t",	T_TYPE,		0,	INT128,	0,	  0,1,0,0,1 },
 	{ "__uint128_t",T_TYPE,		0,	UINT128,0,	  0,1,0,0,1 },
 #endif
 	{ "__thread",	T_QUAL,		0,	0,	THREAD,	  0,0,1,0,1 },
 	{ "_Alignof",	T_ALIGNOF,	0,	0,	0,	  0,0,0,0,1 },
 	{ "_Bool",	T_TYPE,		0,	BOOL,	0,	  0,1,0,0,1 },
 	{ "_Complex",	T_TYPE,		0,	COMPLEX,0,	  0,1,0,0,1 },
 	{ "_Generic",	T_GENERIC,	0,	0,	0,	  0,1,0,0,1 },
 	{ "_Noreturn",	T_NORETURN,	0,	0,	0,	  0,1,0,0,1 },
 	{ "_Thread_local",T_QUAL,	0,	0,	THREAD,	  0,1,0,0,1 },

 @@ -1,14 +1,14 @@
-/* $NetBSD: lint2.h,v 1.11 2020/12/30 10:46:11 rillig Exp $ */
+/* $NetBSD: lint2.h,v 1.12 2021/01/02 01:06:15 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -29,34 +29,34 @@
  * 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.
  */
 #include "lint.h"
 /*
  * Types are described by structures of type type_t.
  */
 struct type {
 	tspec_t	t_tspec;	/* type specifier */
-	u_int	t_const : 1;	/* constant */
+	bool	t_const : 1;	/* constant */
-	u_int	t_volatile : 1;	/* volatile */
+	bool	t_volatile : 1;	/* volatile */
-	u_int	t_vararg : 1;	/* function has variable number of arguments */
+	bool	t_vararg : 1;	/* function has variable number of arguments */
-	u_int	t_isenum : 1;	/* enum type */
+	bool	t_isenum : 1;	/* enum type */
-	u_int	t_proto : 1;	/* this is a prototype */
+	bool	t_proto : 1;	/* this is a prototype */
-	u_int	t_istag : 1;	/* tag with _t_tag valid */
+	bool	t_istag : 1;	/* tag with _t_tag valid */
-	u_int	t_istynam : 1;	/* tag with _t_tynam valid */
+	bool	t_istynam : 1;	/* tag with _t_tynam valid */
-	u_int	t_isuniqpos : 1; /* tag with _t_uniqpos valid */
+	bool	t_isuniqpos : 1; /* tag with _t_uniqpos valid */
 	union {
 		int	_t_dim;		/* if the type is an ARRAY than this
 					   is the dimension of the array. */
 		struct	hte *_t_tag;	/* hash table entry of tag if
 					   t_isenum, STRUCT or UNION */
 		struct	hte *_t_tynam;	/* hash table entry of typename if
 					   t_isenum, STRUCT or UNION */
 		struct {
 			int p_line;
 			short p_file;
 			int p_uniq;
 		} _t_uniqpos;		/* unique position, for untagged
 					   untyped STRUCTs, UNIONS, and ENUMs,
 @@ -72,30 +72,30 @@ struct type {
 #define	t_tag		t_u._t_tag
 #define	t_tynam		t_u._t_tynam
 #define	t_uniqpos	t_u._t_uniqpos
 #define	t_args		t_u._t_args
 /*
  * argument information
+ *
  * Such a structure is created for each argument of a function call
  * which is an integer constant or a constant string.
  */
 typedef	struct arginf {
 	int	a_num;		/* # of argument (1..) */
-	u_int	a_zero : 1;	/* argument is 0 */
+	bool	a_zero : 1;	/* argument is 0 */
-	u_int	a_pcon : 1;	/* msb of argument is not set */
+	bool	a_pcon : 1;	/* msb of argument is not set */
-	u_int	a_ncon : 1;	/* msb of argument is set */
+	bool	a_ncon : 1;	/* msb of argument is set */
-	u_int	a_fmt : 1;	/* a_fstrg points to format string */
+	bool	a_fmt : 1;	/* a_fstrg points to format string */
 	char	*a_fstrg;	/* format string */
 	struct	arginf *a_next;	/* information for next const. argument */
 } arginf_t;
 /*
  * Keeps information about position in source file.
  */
 typedef	struct {
 	u_short	p_src;		/* index of name of translation unit
 				   (the name which was specified at the
 				   command line) */
 	u_short	p_line;		/* line number in p_src */
 	u_short	p_isrc;		/* index of (included) file */
 @@ -108,82 +108,82 @@ typedef	struct {
  * To save memory, variable sized structures are used. If
  * all s_va, s_prfl and s_scfl are not set, the memory allocated
  * for a symbol is only large enough to keep the first member of
  * struct sym, s_s.
  */
 typedef	struct sym {
 	struct {
 		pos_t	s_pos;		/* pos of def./decl. */
 #ifndef lint
 		u_int	s_def : 3;	/* DECL, TDEF or DEF */
 #else
 		def_t	s_def;
 #endif
-		u_int	s_rval : 1;	/* function has return value */
+		bool	s_rval : 1;	/* function has return value */
-		u_int	s_inline : 1;	/* function is inline */
+		bool	s_inline : 1;	/* function is inline */
-		u_int	s_osdef : 1;	/* old style function definition */
+		bool	s_osdef : 1;	/* old style function definition */
-		u_int	s_static : 1;	/* symbol is static */
+		bool	s_static : 1;	/* symbol is static */
-		u_int	s_va : 1;	/* check only first s_nva arguments */
+		bool	s_va : 1;	/* check only first s_nva arguments */
-		u_int	s_prfl : 1;	/* printflike */
+		bool	s_prfl : 1;	/* printflike */
-		u_int	s_scfl : 1;	/* scanflike */
+		bool	s_scfl : 1;	/* scanflike */
 		u_short	s_type;		/* type */
 		struct	sym *s_next;	/* next symbol with same name */
 	} s_s;
 	short	s_nva;
 	short	s_nprfl;
 	short	s_nscfl;
 } sym_t;
 #define s_pos		s_s.s_pos
 #define s_rval		s_s.s_rval
 #define s_osdef		s_s.s_osdef
 #define s_inline	s_s.s_inline
 #define s_static	s_s.s_static
 #define s_def		s_s.s_def
 #define s_va		s_s.s_va
 #define s_prfl		s_s.s_prfl
 #define s_scfl		s_s.s_scfl
 #define s_type		s_s.s_type
 #define s_next		s_s.s_next
 /*
  * Used to store information about function calls.
  */
 typedef	struct fcall {
 	pos_t	f_pos;		/* position of call */
-	u_int	f_rused : 1;	/* return value used */
+	bool	f_rused : 1;	/* return value used */
-	u_int	f_rdisc : 1;	/* return value discarded (casted to void) */
+	bool	f_rdisc : 1;	/* return value discarded (casted to void) */
 	u_short	f_type;		/* types of expected return value and args */
 	arginf_t *f_args;	/* information about constant arguments */
 	struct	fcall *f_next;	/* next call of same function */
 } fcall_t;
 /*
  * Used to store information about usage of symbols other
  * than for function calls.
  */
 typedef	struct usym {
 	pos_t	u_pos;		/* position */
 	struct	usym *u_next;	/* next usage */
 } usym_t;
 /*
  * hash table entry
  */
 typedef	struct hte {
 	const	char *h_name;	/* name */
-	u_int	h_used : 1;	/* symbol is used */
+	bool	h_used : 1;	/* symbol is used */
-	u_int	h_def : 1;	/* symbol is defined */
+	bool	h_def : 1;	/* symbol is defined */
-	u_int	h_static : 1;	/* static symbol */
+	bool	h_static : 1;	/* static symbol */
 	sym_t	*h_syms;	/* declarations and definitions */
 	sym_t	**h_lsym;	/* points to s_next of last decl./def. */
 	fcall_t	*h_calls;	/* function calls */
 	fcall_t	**h_lcall;	/* points to f_next of last call */
 	usym_t	*h_usyms;	/* usage info */
 	usym_t	**h_lusym;	/* points to u_next of last usage info */
 	struct	hte *h_link;	/* next hte with same hash function */
 	struct  hte *h_hte;	/* pointer to other htes (for renames */
 } hte_t;
 /* maps type indices into pointers to type structs */
 #define TP(idx)		(tlst[idx])