 @@ -1,14 +1,14 @@
-/* $NetBSD: decl.c,v 1.171 2021/04/09 20:12:00 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.172 2021/04/10 18:06:53 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
 @@ -28,27 +28,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: decl.c,v 1.171 2021/04/09 20:12:00 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.172 2021/04/10 18:06:53 rillig Exp $");
 #endif
 #include <sys/param.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 const	char *unnamed = "<unnamed>";
 /* shared type structures for arithmetic types and void */
 static	type_t	*typetab;
 @@ -131,26 +131,27 @@ initdecl(void)
+}
 /*
  * Returns a shared type structure for arithmetic types and void.
+ *
  * It's important to duplicate this structure (using dup_type() or
  * expr_dup_type()) if it is to be modified (adding qualifiers or anything
  * else).
  */
 type_t *
 gettyp(tspec_t t)
+{
 	/* TODO: make the return type 'const' */
 	return &typetab[t];
+}
 type_t *
 dup_type(const type_t *tp)
+{
 	type_t	*ntp;
 	ntp = getblk(sizeof(*ntp));
 	*ntp = *tp;
 	return ntp;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: func.c,v 1.102 2021/04/02 15:06:35 rillig Exp $	*/
+/*	$NetBSD: func.c,v 1.103 2021/04/10 18:06:53 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: func.c,v 1.102 2021/04/02 15:06:35 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.103 2021/04/10 18:06:53 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 /*
  * Contains a pointer to the symbol table entry of the current function
  * definition.
  */
 sym_t	*funcsym;
 @@ -509,30 +509,27 @@ check_case_label(tnode_t *tn, cstk_t *ci
 	for (cl = ci->c_case_labels; cl != NULL; cl = cl->cl_next) {
 		if (cl->cl_val.v_quad == nv.v_quad)
 			break;
+	}
 	if (cl != NULL && is_uinteger(nv.v_tspec)) {
 		/* duplicate case in switch: %lu */
 		error(200, (u_long)nv.v_quad);
 	} else if (cl != NULL) {
 		/* duplicate case in switch: %ld */
 		error(199, (long)nv.v_quad);
 	} else {
 		check_getopt_case_label(nv.v_quad);
-		/*
+		/* append the value to the list of case values */
 		 * append the value to the list of
 		 * case values
 		 */
 		cl = xcalloc(1, sizeof(*cl));
 		cl->cl_val = nv;
 		cl->cl_next = ci->c_case_labels;
 		ci->c_case_labels = cl;
+	}
+}
 void
 case_label(tnode_t *tn)
+{
 	cstk_t	*ci;
 	/* find the innermost switch statement */

 @@ -1,14 +1,14 @@
-/* $NetBSD: lint1.h,v 1.92 2021/04/02 22:05:43 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.93 2021/04/10 18:06:53 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
 @@ -135,28 +135,28 @@ typedef	struct {
 } struct_or_union;
 /*
  * same as above for enums
  */
 typedef	struct {
 	bool	en_incomplete : 1;
 	struct	sym *en_first_enumerator;
 	struct	sym *en_tag;
 	struct	sym *en_first_typedef;
 } enumeration;
 /*
- * Types are represented by concatenation of structures of type type_t
+ * The type of an expression or object. Complex types are formed via t_subt
- * via t_subt.
+ * (for arrays, pointers and functions), as well as t_str.
  */
 struct type {
 	tspec_t	t_tspec;	/* type specifier */
 	bool	t_incomplete_array : 1;
 	bool	t_const : 1;	/* const modifier */
 	bool	t_volatile : 1;	/* volatile modifier */
 	bool	t_proto : 1;	/* function prototype (t_args valid) */
 	bool	t_vararg : 1;	/* prototype with '...' */
 	bool	t_typedef : 1;	/* type defined with typedef */
 	bool	t_bitfield : 1;
 	bool	t_is_enum : 1;	/* type is (or was) enum (t_enum valid) */
 	bool	t_packed : 1;
 	union {
 @@ -361,27 +361,28 @@ typedef	struct dinfo {
 /*
  * Used to collect information about pointers and qualifiers in
  * declarators.
  */
 typedef	struct pqinf {
 	int	p_pcnt;			/* number of asterisks */
 	bool	p_const : 1;
 	bool	p_volatile : 1;
 	struct	pqinf *p_next;
 } pqinf_t;
 /*
- * Case values are stored in a list of type case_label_t.
+ * The values of the 'case' labels, linked via cl_next in reverse order of
  * appearance in the code, that is from bottom to top.
  */
 typedef	struct case_label {
 	val_t	cl_val;
 	struct case_label *cl_next;
 } case_label_t;
 typedef enum {
 	CS_DO_WHILE,
 	CS_FOR,
 	CS_FUNCTION_BODY,
 	CS_IF,
 	CS_SWITCH,
 	CS_WHILE

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.275 2021/04/09 21:42:12 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.276 2021/04/10 18:06:53 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: tree.c,v 1.275 2021/04/09 21:42:12 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.276 2021/04/10 18:06:53 rillig Exp $");
 #endif
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 static	tnode_t	*expr_new_integer_constant(tspec_t, int64_t);
 @@ -2101,26 +2101,30 @@ check_pointer_conversion(tnode_t *tn, ty
  * nv		new constant
  * v		old constant
  */
 void
 convert_constant(op_t op, int arg, const type_t *tp, val_t *nv, val_t *v)
+{
 	tspec_t	ot, nt;
 	ldbl_t	max = 0.0, min = 0.0;
 	int	sz;
 	bool	rchk;
 	int64_t	xmask, xmsk1;
 	int	osz, nsz;
 	/*
 	 * TODO: make 'v' const; the name of this function does not suggest
 	 *  that it modifies 'v'.
 	 */
 	ot = v->v_tspec;
 	nt = nv->v_tspec = tp->t_tspec;
 	rchk = false;
 	if (nt == BOOL) {	/* C99 6.3.1.2 */
 		nv->v_ansiu = false;
 		nv->v_quad = is_nonzero_val(v) ? 1 : 0;
 		return;
+	}
 	if (ot == FLOAT || ot == DOUBLE || ot == LDOUBLE) {
 		switch (nt) {
 		case CHAR: