 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg_130.c,v 1.7 2021/03/05 16:35:52 rillig Exp $	*/
+/*	$NetBSD: msg_130.c,v 1.8 2021/03/05 17:10:06 rillig Exp $	*/
 # 3 "msg_130.c"
 // Test for message: enum type mismatch: '%s' '%s' '%s' [130]
 /* See also msg_241.c, which covers unusual operators on enums. */
 enum color {
 	RED	= 1 << 0,
 	GREEN	= 1 << 1,
 	BLUE	= 1 << 2
 };
 enum size {
 @@ -34,21 +34,22 @@ example(_Bool cond, enum color c, enum s
 	sink((c | MEDIUM) != 0);	/* might be useful to warn about */
 	c |= MEDIUM;			/* might be useful to warn about */
 	c &= MEDIUM;			/* might be useful to warn about */
 	/* The cast to unsigned is required by GCC at WARNS=6. */
 	c &= ~(unsigned)MEDIUM;		/* might be useful to warn about */
+}
 void
 switch_example(enum color c)
+{
 	switch (c) {
-	case EVENING:			/* TODO: 130 */
+	case EVENING:			/* expect: 130 */
-	case LARGE:			/* TODO: 130 */
+	case LARGE:			/* expect: 130 */
 	case 0:				/* expect: 130 */
 		sink(1 == 1);
 		break;
 	default:
 		break;
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: func.c,v 1.74 2021/02/28 19:16:05 rillig Exp $	*/
+/*	$NetBSD: func.c,v 1.75 2021/03/05 17:10:05 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.74 2021/02/28 19:16:05 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.75 2021/03/05 17:10:05 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;
 @@ -417,51 +417,69 @@ named_label(sym_t *sym)
+{
 	if (sym->s_set) {
 		/* label %s redefined */
 		error(194, sym->s_name);
 	} else {
 		mark_as_set(sym);
+	}
 	reached = true;
+}
 static void
 check_case_label_enum(const tnode_t *tn, const cstk_t *ci)
+{
 	/* similar to typeok_enum in tree.c */
 	if (!(tn->tn_type->t_is_enum || ci->c_swtype->t_is_enum))
 		return;
 	if (tn->tn_type->t_is_enum && ci->c_swtype->t_is_enum &&
 	    tn->tn_type->t_enum == ci->c_swtype->t_enum)
 		return;
 	/* enum type mismatch: '%s' '%s' '%s' */
 	warning(130, type_name(ci->c_swtype), getopname(EQ),
 	    type_name(tn->tn_type));
+}
 static void
 check_case_label(tnode_t *tn, cstk_t *ci)
+{
 	clst_t	*cl;
 	val_t	*v;
 	val_t	nv;
 	tspec_t	t;
 	if (ci == NULL) {
 		/* case not in switch */
 		error(195);
 		return;
+	}
 	if (tn != NULL && tn->tn_op != CON) {
 		/* non-constant case expression */
 		error(197);
 		return;
+	}
 	if (tn != NULL && !is_integer(tn->tn_type->t_tspec)) {
 		/* non-integral case expression */
 		error(198);
 		return;
+	}
 	check_case_label_enum(tn, ci);
 	lint_assert(ci->c_swtype != NULL);
 	if (reached && !ftflg) {
 		if (hflag)
 			/* fallthrough on case statement */
 			warning(220);
+	}
 	t = tn->tn_type->t_tspec;
 	if (t == LONG || t == ULONG ||
 	    t == QUAD || t == UQUAD) {
 		if (tflag)
 			/* case label must be of type `int' in traditional C */

 @@ -1,3 +1,6 @@
 msg_130.c(29): warning: enum type mismatch: 'enum color' ':' 'enum daytime' [130]
 msg_130.c(31): warning: enum type mismatch: 'enum color' '!=' 'enum size' [130]
 msg_130.c(32): warning: enum type mismatch: 'enum color' '==' 'enum size' [130]
 msg_130.c(47): warning: enum type mismatch: 'enum color' '==' 'enum daytime' [130]
 msg_130.c(48): warning: enum type mismatch: 'enum color' '==' 'enum size' [130]
 msg_130.c(49): warning: enum type mismatch: 'enum color' '==' 'int' [130]