 @@ -1,14 +1,14 @@
-/* $NetBSD: decl.c,v 1.204 2021/07/15 23:07:05 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.205 2021/07/15 23:42:49 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.204 2021/07/15 23:07:05 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.205 2021/07/15 23:42:49 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;
 @@ -736,27 +736,31 @@ dcs_adjust_storage_class(void)
 			/* illegal storage class */
 			error(8);
 			dcs->d_scl = NOSCL;
+		}
 	} else if (dcs->d_ctx == ARG || dcs->d_ctx == PROTO_ARG) {
 		if (dcs->d_scl != NOSCL && dcs->d_scl != REG) {
 			/* only register valid as formal parameter storage... */
 			error(9);
 			dcs->d_scl = NOSCL;
+		}
+	}
+}
-/* Merge the declaration specifiers from dcs into dcs->d_type. */
+/*
  * Merge the declaration specifiers from dcs into dcs->d_type.
+ *
  * See C99 6.7.2 "Type specifiers".
  */
 static void
 dcs_merge_declaration_specifiers(void)
+{
 	tspec_t	t, s, l, c;
 	type_t	*tp;
 	t = dcs->d_abstract_type; /* VOID, BOOL, CHAR, INT or COMPLEX */
 	c = dcs->d_complex_mod;	/* FLOAT or DOUBLE */
 	s = dcs->d_sign_mod;	/* SIGNED or UNSIGN */
 	l = dcs->d_rank_mod;	/* SHORT, LONG or QUAD */
 	tp = dcs->d_type;
 #ifdef DEBUG
 @@ -766,75 +770,54 @@ dcs_merge_declaration_specifiers(void)
 	    tp == NULL)
 		dcs->d_notyp = true;
 	if (t == NOTSPEC && s == NOTSPEC && (l == NOTSPEC || l == LONG) &&
 	    tp == NULL)
 		t = c;
 	if (tp != NULL) {
 		lint_assert(t == NOTSPEC);
 		lint_assert(s == NOTSPEC);
 		lint_assert(l == NOTSPEC);
 		return;
+	}
-	switch (t) {
+	if (t == NOTSPEC)
 	case BOOL:
 		break;
 	case NOTSPEC:
 		t = INT;
-		/* FALLTHROUGH */
+	if (s == NOTSPEC && t == INT)
-	case INT:
+		s = SIGNED;
-		if (s == NOTSPEC)
+	if (l != NOTSPEC && t == CHAR) {
-			s = SIGNED;
+		dcs->d_terr = true;
-		break;
+		l = NOTSPEC;
 	case CHAR:
-		if (l != NOTSPEC) {
+	if (l == LONG && t == FLOAT) {
-			dcs->d_terr = true;
+		l = NOTSPEC;
-			l = NOTSPEC;
+		t = DOUBLE;
 		if (!tflag)
-		break;
+			/* use 'double' instead of 'long float' */
-	case FLOAT:
+			warning(6);
 		if (l == LONG) {
-			l = NOTSPEC;
+	if ((l == LONG && t == DOUBLE) || t == LDOUBLE) {
 			t = DOUBLE;
 			if (!tflag)
 				/* use 'double' instead of 'long float' */
 				warning(6);
 		break;
 	case DOUBLE:
 		if (l != LONG)
 			break;
 		/* FALLTHROUGH */
 	case LDOUBLE:
 		l = NOTSPEC;
 		t = LDOUBLE;
 		if (tflag)
 			/* 'long double' is illegal in traditional C */
 			warning(266);
 		break;
 	case DCOMPLEX:
 		if (l == LONG) {
 			l = NOTSPEC;
 			t = LCOMPLEX;
 		break;
 	case VOID:
 	case FCOMPLEX:
 	case LCOMPLEX:
 		break;
 	default:
 		lint_assert(is_integer(t));
+	}
 	if (t == LDOUBLE && tflag) {
 		/* 'long double' is illegal in traditional C */
 		warning(266);
+	}
 	if (l == LONG && t == DCOMPLEX) {
 		l = NOTSPEC;
 		t = LCOMPLEX;
+	}
 	if (t != INT && t != CHAR && (s != NOTSPEC || l != NOTSPEC)) {
 		dcs->d_terr = true;
 		l = s = NOTSPEC;
+	}
 	if (l != NOTSPEC)
 		t = l;
 	dcs->d_type = gettyp(merge_type_specifiers(t, s));
+}
 /*
  * Create a type structure from the information gathered in
  * the declaration stack.
  * Complain about storage classes which are not possible in current