 @@ -1,14 +1,14 @@
-/* $NetBSD: lex.c,v 1.201 2024/01/27 12:14:58 rillig Exp $ */
+/* $NetBSD: lex.c,v 1.202 2024/01/27 15:53:27 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)
-__RCSID("$NetBSD: lex.c,v 1.201 2024/01/27 12:14:58 rillig Exp $");
+__RCSID("$NetBSD: lex.c,v 1.202 2024/01/27 15:53:27 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"
 @@ -492,26 +492,87 @@ lex_name(const char *yytext, size_t yyle
 static bool
 is_unsigned_since_c90(tspec_t typ, uint64_t ui, int base)
+{
 	if (!(allow_trad && allow_c90))
 		return false;
 	if (typ == INT) {
 		if (ui > TARG_INT_MAX && ui <= TARG_UINT_MAX && base != 10)
 			return true;
 		return ui > TARG_LONG_MAX;
+	}
 	return typ == LONG && ui > TARG_LONG_MAX;
+}
 static tspec_t
 integer_constant_type(tspec_t typ, uint64_t ui, int base, bool warned)
+{
 	switch (typ) {
 	case INT:
 		if (ui <= TARG_INT_MAX) {
 			/* ok */
 		} else if (ui <= TARG_UINT_MAX && base != 10) {
 			typ = UINT;
 		} else if (ui <= TARG_LONG_MAX) {
 			typ = LONG;
 		} else {
 			typ = ULONG;
 			if (ui > TARG_ULONG_MAX && !warned) {
 				/* integer constant out of range */
 				warning(252);
+			}
+		}
 		if ((typ == UINT || typ == ULONG) && !allow_c90)
 			typ = LONG;
 		break;
 	case UINT:
 		if (ui > TARG_UINT_MAX) {
 			typ = ULONG;
 			if (ui > TARG_ULONG_MAX && !warned) {
 				/* integer constant out of range */
 				warning(252);
+			}
+		}
 		break;
 	case LONG:
 		if (ui > TARG_LONG_MAX && allow_c90) {
 			typ = ULONG;
 			if (ui > TARG_ULONG_MAX && !warned) {
 				/* integer constant out of range */
 				warning(252);
+			}
+		}
 		break;
 	case ULONG:
 		if (ui > TARG_ULONG_MAX && !warned) {
 			/* integer constant out of range */
 			warning(252);
+		}
 		break;
 	case LLONG:
 		if (ui > TARG_LLONG_MAX && allow_c90)
 			typ = ULLONG;
 		break;
 	case ULLONG:
 		if (ui > TARG_ULLONG_MAX && !warned) {
 			/* integer constant out of range */
 			warning(252);
+		}
 		break;
 	default:
 		break;
+	}
 	return typ;
+}
 int
 lex_integer_constant(const char *yytext, size_t yyleng, int base)
+{
 	/* C11 6.4.4.1p5 */
 	static const tspec_t suffix_type[2][3] = {
 		{ INT,  LONG,  LLONG, },
 		{ UINT, ULONG, ULLONG, }
 	};
 	const char *cp = yytext;
 	size_t len = yyleng;
 	/* skip 0[xX] or 0[bB] */
 @@ -533,105 +594,51 @@ lex_integer_constant(const char *yytext,
+	}
 	if (l_suffix > 2 || u_suffix > 1) {
 		/* malformed integer constant */
 		warning(251);
 		if (l_suffix > 2)
 			l_suffix = 2;
 		if (u_suffix > 1)
 			u_suffix = 1;
+	}
 	if (!allow_c90 && u_suffix > 0) {
 		/* suffix 'U' is illegal in traditional C */
 		warning(97);
+	}
-	tspec_t typ = suffix_type[u_suffix][l_suffix];
+	tspec_t ct = suffix_type[u_suffix][l_suffix];
 	bool warned = false;
 	errno = 0;
 	char *eptr;
 	uint64_t ui = (uint64_t)strtoull(cp, &eptr, base);
 	lint_assert(eptr == cp + len);
 	if (errno != 0) {
 		/* integer constant out of range */
 		warning(252);
 		warned = true;
+	}
 	if (any_query_enabled && base == 8 && ui != 0) {
 		/* octal number '%.*s' */
 		query_message(8, (int)len, cp);
+	}
-	bool ansiu = is_unsigned_since_c90(typ, ui, base);
+	bool ansiu = is_unsigned_since_c90(ct, ui, base);
 	switch (typ) {
 	case INT:
 		if (ui <= TARG_INT_MAX) {
 			/* ok */
 		} else if (ui <= TARG_UINT_MAX && base != 10) {
 			typ = UINT;
 		} else if (ui <= TARG_LONG_MAX) {
 			typ = LONG;
 		} else {
 			typ = ULONG;
 			if (ui > TARG_ULONG_MAX && !warned) {
 				/* integer constant out of range */
 				warning(252);
 		if ((typ == UINT || typ == ULONG) && !allow_c90)
 			typ = LONG;
 		break;
 	case UINT:
 		if (ui > TARG_UINT_MAX) {
 			typ = ULONG;
 			if (ui > TARG_ULONG_MAX && !warned) {
 				/* integer constant out of range */
 				warning(252);
 		break;
 	case LONG:
 		if (ui > TARG_LONG_MAX && allow_c90) {
 			typ = ULONG;
 			if (ui > TARG_ULONG_MAX && !warned) {
 				/* integer constant out of range */
 				warning(252);
 		break;
 	case ULONG:
 		if (ui > TARG_ULONG_MAX && !warned) {
 			/* integer constant out of range */
 			warning(252);
 		break;
 	case LLONG:
 		if (ui > TARG_LLONG_MAX && allow_c90)
 			typ = ULLONG;
 		break;
 	case ULLONG:
 		if (ui > TARG_ULLONG_MAX && !warned) {
 			/* integer constant out of range */
 			warning(252);
 		break;
 	default:
 		break;
-	ui = (uint64_t)convert_integer((int64_t)ui, typ, 0);
+	tspec_t t = integer_constant_type(ct, ui, base, warned);
 	ui = (uint64_t)convert_integer((int64_t)ui, t, 0);
 	yylval.y_val = xcalloc(1, sizeof(*yylval.y_val));
-	yylval.y_val->v_tspec = typ;
+	yylval.y_val->v_tspec = t;
 	yylval.y_val->v_unsigned_since_c90 = ansiu;
 	yylval.y_val->u.integer = (int64_t)ui;
 	return T_CON;
+}
 /*
  * Extend or truncate si to match t.  If t is signed, sign-extend.
+ *
  * len is the number of significant bits. If len is 0, len is set
  * to the width of type t.
  */
 int64_t