Module Name: src
Committed By: rillig
Date: Sun Jan 28 08:26:07 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: check-expect.lua platform_ilp32_c90.c
platform_ilp32_c99.c platform_ilp32_trad.c
Log Message:
tests/lint: sort diagnostics in ilp32 tests chronologically
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/xlint/lint1/check-expect.lua
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c \
src/tests/usr.bin/xlint/lint1/platform_ilp32_c99.c \
src/tests/usr.bin/xlint/lint1/platform_ilp32_trad.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/check-expect.lua
diff -u src/tests/usr.bin/xlint/lint1/check-expect.lua:1.10 src/tests/usr.bin/xlint/lint1/check-expect.lua:1.11
--- src/tests/usr.bin/xlint/lint1/check-expect.lua:1.10 Sun Jan 28 08:17:27 2024
+++ src/tests/usr.bin/xlint/lint1/check-expect.lua Sun Jan 28 08:26:07 2024
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: check-expect.lua,v 1.10 2024/01/28 08:17:27 rillig Exp $
+-- $NetBSD: check-expect.lua,v 1.11 2024/01/28 08:26:07 rillig Exp $
--[[
@@ -212,7 +212,6 @@ local function insert_missing(missing)
local indent = (lines[lineno] or ""):match("^([ \t]*)")
local offset = 1 + (seen[lineno] or 0)
local line = ("%s/* expect+%d: %s */"):format(indent, offset, message)
- print(("insert %s:%d %s"):format(fname, lineno, line))
table.insert(lines, lineno, line)
seen[lineno] = (seen[lineno] or 0) + 1
end
Index: src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c
diff -u src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c:1.2 src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c:1.3
--- src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c:1.2 Sat Jan 27 20:03:14 2024
+++ src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c Sun Jan 28 08:26:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_ilp32_c90.c,v 1.2 2024/01/27 20:03:14 rillig Exp $ */
+/* $NetBSD: platform_ilp32_c90.c,v 1.3 2024/01/28 08:26:07 rillig Exp $ */
# 3 "platform_ilp32_c90.c"
/*
@@ -27,27 +27,27 @@ void *lex_integer[] = {
4294967296,
/* expect+1: warning: integer constant out of range [252] */
0x0000000100000000,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
9223372036854775807,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0x7fffffffffffffff,
/* expect+1: warning: integer constant out of range [252] */
9223372036854775808,
/* expect+1: warning: integer constant out of range [252] */
0x8000000000000000,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
18446744073709551615,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0xffffffffffffffff,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
18446744073709551616,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0x00010000000000000000,
/* expect+1: ... integer 'unsigned int' ... */
@@ -66,8 +66,8 @@ void *lex_integer[] = {
4294967296U,
/* expect+1: warning: integer constant out of range [252] */
0x0000000100000000U,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
9223372036854775807U,
/* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'unsigned long' ... */
@@ -76,17 +76,17 @@ void *lex_integer[] = {
9223372036854775808U,
/* expect+1: warning: integer constant out of range [252] */
0x8000000000000000U,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
18446744073709551615U,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0xffffffffffffffffU,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
18446744073709551616U,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0x00010000000000000000U,
/* expect+1: ... integer 'long' ... */
@@ -107,18 +107,18 @@ void *lex_integer[] = {
4294967296L,
/* expect+1: warning: integer constant out of range [252] */
0x0000000100000000L,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
9223372036854775807L,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0x7fffffffffffffffL,
/* expect+1: warning: integer constant out of range [252] */
9223372036854775808L,
/* expect+1: warning: integer constant out of range [252] */
0x8000000000000000L,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
18446744073709551615L,
/* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'unsigned long' ... */
@@ -126,8 +126,8 @@ void *lex_integer[] = {
/* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'unsigned long' ... */
18446744073709551616L,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0x00010000000000000000L,
/* expect+1: ... integer 'unsigned long' ... */
@@ -146,27 +146,27 @@ void *lex_integer[] = {
4294967296UL,
/* expect+1: warning: integer constant out of range [252] */
0x0000000100000000UL,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
9223372036854775807UL,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0x7fffffffffffffffUL,
/* expect+1: warning: integer constant out of range [252] */
9223372036854775808UL,
/* expect+1: warning: integer constant out of range [252] */
0x8000000000000000UL,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
18446744073709551615UL,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0xffffffffffffffffUL,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
18446744073709551616UL,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0x00010000000000000000UL,
/* expect+1: ... integer 'long long' ... */
@@ -199,11 +199,11 @@ void *lex_integer[] = {
18446744073709551615LL,
/* expect+1: ... integer 'unsigned long long' ... */
0xffffffffffffffffLL,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
18446744073709551616LL,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
0x00010000000000000000LL,
/* expect+1: ... integer 'unsigned long long' ... */
@@ -234,8 +234,8 @@ void *lex_integer[] = {
18446744073709551615ULL,
/* expect+1: ... integer 'unsigned long long' ... */
0xffffffffffffffffULL,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
18446744073709551616ULL,
/* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'unsigned long long' ... */
Index: src/tests/usr.bin/xlint/lint1/platform_ilp32_c99.c
diff -u src/tests/usr.bin/xlint/lint1/platform_ilp32_c99.c:1.2 src/tests/usr.bin/xlint/lint1/platform_ilp32_c99.c:1.3
--- src/tests/usr.bin/xlint/lint1/platform_ilp32_c99.c:1.2 Sat Jan 27 20:03:14 2024
+++ src/tests/usr.bin/xlint/lint1/platform_ilp32_c99.c Sun Jan 28 08:26:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_ilp32_c99.c,v 1.2 2024/01/27 20:03:14 rillig Exp $ */
+/* $NetBSD: platform_ilp32_c99.c,v 1.3 2024/01/28 08:26:07 rillig Exp $ */
# 3 "platform_ilp32_c99.c"
/*
@@ -29,21 +29,21 @@ void *lex_integer[] = {
9223372036854775807,
/* expect+1: ... integer 'long long' ... */
0x7fffffffffffffff,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
9223372036854775808,
/* expect+1: ... integer 'unsigned long long' ... */
0x8000000000000000,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
18446744073709551615,
/* expect+1: ... integer 'unsigned long long' ... */
0xffffffffffffffff,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
18446744073709551616,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
0x00010000000000000000,
/* expect+1: ... integer 'unsigned int' ... */
@@ -74,11 +74,11 @@ void *lex_integer[] = {
18446744073709551615U,
/* expect+1: ... integer 'unsigned long long' ... */
0xffffffffffffffffU,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
18446744073709551616U,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
0x00010000000000000000U,
/* expect+1: ... integer 'long' ... */
@@ -101,21 +101,21 @@ void *lex_integer[] = {
9223372036854775807L,
/* expect+1: ... integer 'long long' ... */
0x7fffffffffffffffL,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
9223372036854775808L,
/* expect+1: ... integer 'unsigned long long' ... */
0x8000000000000000L,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
18446744073709551615L,
/* expect+1: ... integer 'unsigned long long' ... */
0xffffffffffffffffL,
/* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'unsigned long long' ... */
18446744073709551616L,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
0x00010000000000000000L,
/* expect+1: ... integer 'unsigned long' ... */
@@ -146,11 +146,11 @@ void *lex_integer[] = {
18446744073709551615UL,
/* expect+1: ... integer 'unsigned long long' ... */
0xffffffffffffffffUL,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
18446744073709551616UL,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
0x00010000000000000000UL,
/* expect+1: ... integer 'long long' ... */
@@ -183,11 +183,11 @@ void *lex_integer[] = {
18446744073709551615LL,
/* expect+1: ... integer 'unsigned long long' ... */
0xffffffffffffffffLL,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
18446744073709551616LL,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
0x00010000000000000000LL,
/* expect+1: ... integer 'unsigned long long' ... */
@@ -218,8 +218,8 @@ void *lex_integer[] = {
18446744073709551615ULL,
/* expect+1: ... integer 'unsigned long long' ... */
0xffffffffffffffffULL,
- /* expect+2: ... integer 'unsigned long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long long' ... */
18446744073709551616ULL,
/* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'unsigned long long' ... */
Index: src/tests/usr.bin/xlint/lint1/platform_ilp32_trad.c
diff -u src/tests/usr.bin/xlint/lint1/platform_ilp32_trad.c:1.2 src/tests/usr.bin/xlint/lint1/platform_ilp32_trad.c:1.3
--- src/tests/usr.bin/xlint/lint1/platform_ilp32_trad.c:1.2 Sat Jan 27 20:03:14 2024
+++ src/tests/usr.bin/xlint/lint1/platform_ilp32_trad.c Sun Jan 28 08:26:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_ilp32_trad.c,v 1.2 2024/01/27 20:03:14 rillig Exp $ */
+/* $NetBSD: platform_ilp32_trad.c,v 1.3 2024/01/28 08:26:07 rillig Exp $ */
# 3 "platform_ilp32_trad.c"
/*
@@ -25,27 +25,27 @@ void *lex_integer[] = {
4294967296,
/* expect+1: warning: integer constant out of range [252] */
0x0000000100000000,
- /* expect+2: ... integer 'long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long' ... */
9223372036854775807,
- /* expect+2: ... integer 'long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long' ... */
0x7fffffffffffffff,
/* expect+1: warning: integer constant out of range [252] */
9223372036854775808,
/* expect+1: warning: integer constant out of range [252] */
0x8000000000000000,
- /* expect+2: ... integer 'long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long' ... */
18446744073709551615,
- /* expect+2: ... integer 'long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long' ... */
0xffffffffffffffff,
- /* expect+2: ... integer 'long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long' ... */
18446744073709551616,
- /* expect+2: ... integer 'long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long' ... */
0x00010000000000000000,
/* expect+1: ... integer 'long' ... */
@@ -66,18 +66,18 @@ void *lex_integer[] = {
4294967296L,
/* expect+1: warning: integer constant out of range [252] */
0x0000000100000000L,
- /* expect+2: ... integer 'long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long' ... */
9223372036854775807L,
- /* expect+2: ... integer 'long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long' ... */
0x7fffffffffffffffL,
/* expect+1: warning: integer constant out of range [252] */
9223372036854775808L,
/* expect+1: warning: integer constant out of range [252] */
0x8000000000000000L,
- /* expect+2: ... integer 'long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long' ... */
18446744073709551615L,
/* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'long' ... */
@@ -85,8 +85,8 @@ void *lex_integer[] = {
/* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'long' ... */
18446744073709551616L,
- /* expect+2: ... integer 'long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long' ... */
0x00010000000000000000L,
/* expect+1: ... integer 'long long' ... */
@@ -119,10 +119,10 @@ void *lex_integer[] = {
18446744073709551615LL,
/* expect+1: ... integer 'long long' ... */
0xffffffffffffffffLL,
- /* expect+2: ... integer 'long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long long' ... */
18446744073709551616LL,
- /* expect+2: ... integer 'long long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'long long' ... */
0x00010000000000000000LL,
};
