Module Name: src
Committed By: rillig
Date: Mon Apr 5 01:35:34 UTC 2021
Modified Files:
src/tests/usr.bin/xlint: check-expect.lua
src/tests/usr.bin/xlint/lint1: d_c99_bool_strict.c
d_c99_bool_strict_syshdr.c d_decl_old_style_arguments.c
d_fold_test.c d_gcc_extension.c d_type_conv3.c msg_004.c msg_006.c
msg_019.c msg_035.c msg_051.c msg_057.c msg_060.c msg_071.c
msg_074.c msg_096.c msg_098.c msg_109.c msg_117.c msg_120.c
msg_126.c msg_142.c msg_163.c msg_170.c msg_176.c msg_204.c
msg_224.c msg_239.c msg_308.c msg_330.c msg_331.c msg_332.c
msg_336.c msg_337.c msg_338.c msg_339.c
Log Message:
tests/lint: one comment per expected diagnostic
This makes it possible to check for diagnostics that contain commas.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/check-expect.lua
cvs rdiff -u -r1.27 -r1.28 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c
cvs rdiff -u -r1.8 -r1.9 \
src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c
cvs rdiff -u -r1.2 -r1.3 \
src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c \
src/tests/usr.bin/xlint/lint1/msg_163.c \
src/tests/usr.bin/xlint/lint1/msg_224.c \
src/tests/usr.bin/xlint/lint1/msg_331.c \
src/tests/usr.bin/xlint/lint1/msg_332.c \
src/tests/usr.bin/xlint/lint1/msg_336.c \
src/tests/usr.bin/xlint/lint1/msg_337.c \
src/tests/usr.bin/xlint/lint1/msg_338.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/d_fold_test.c \
src/tests/usr.bin/xlint/lint1/d_type_conv3.c \
src/tests/usr.bin/xlint/lint1/msg_004.c \
src/tests/usr.bin/xlint/lint1/msg_006.c \
src/tests/usr.bin/xlint/lint1/msg_019.c \
src/tests/usr.bin/xlint/lint1/msg_051.c \
src/tests/usr.bin/xlint/lint1/msg_057.c \
src/tests/usr.bin/xlint/lint1/msg_060.c \
src/tests/usr.bin/xlint/lint1/msg_071.c \
src/tests/usr.bin/xlint/lint1/msg_074.c \
src/tests/usr.bin/xlint/lint1/msg_096.c \
src/tests/usr.bin/xlint/lint1/msg_098.c \
src/tests/usr.bin/xlint/lint1/msg_109.c \
src/tests/usr.bin/xlint/lint1/msg_142.c \
src/tests/usr.bin/xlint/lint1/msg_170.c \
src/tests/usr.bin/xlint/lint1/msg_176.c \
src/tests/usr.bin/xlint/lint1/msg_330.c
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/d_gcc_extension.c \
src/tests/usr.bin/xlint/lint1/msg_117.c \
src/tests/usr.bin/xlint/lint1/msg_120.c \
src/tests/usr.bin/xlint/lint1/msg_126.c \
src/tests/usr.bin/xlint/lint1/msg_239.c
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/msg_035.c
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_204.c \
src/tests/usr.bin/xlint/lint1/msg_308.c
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_339.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/check-expect.lua
diff -u src/tests/usr.bin/xlint/check-expect.lua:1.6 src/tests/usr.bin/xlint/check-expect.lua:1.7
--- src/tests/usr.bin/xlint/check-expect.lua:1.6 Sun Feb 28 01:20:54 2021
+++ src/tests/usr.bin/xlint/check-expect.lua Mon Apr 5 01:35:34 2021
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: check-expect.lua,v 1.6 2021/02/28 01:20:54 rillig Exp $
+-- $NetBSD: check-expect.lua,v 1.7 2021/04/05 01:35:34 rillig Exp $
--[[
@@ -43,16 +43,12 @@ local function load_expect_comments_from
for lineno, line in ipairs(lines) do
- for offset, comments in line:gmatch("/%* expect([+%-]%d+): (.-) %*/") do
- for comment in comments:gmatch("[^,]+") do
- add_expectation(lineno + tonumber(offset), comment)
- end
+ for offset, comment in line:gmatch("/%* expect([+%-]%d+): (.-) %*/") do
+ add_expectation(lineno + tonumber(offset), comment)
end
- for comments in line:gmatch("/%* expect: (.-) %*/") do
- for comment in comments:gmatch("[^,]+") do
- add_expectation(lineno, comment)
- end
+ for comment in line:gmatch("/%* expect: (.-) %*/") do
+ add_expectation(lineno, comment)
end
local pp_lineno, pp_fname = line:match("^#%s*(%d+)%s+\"([^\"]+)\"")
Index: src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.27 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.28
--- src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.27 Tue Mar 23 23:12:21 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_bool_strict.c,v 1.27 2021/03/23 23:12:21 rillig Exp $ */
+/* $NetBSD: d_c99_bool_strict.c,v 1.28 2021/04/05 01:35:34 rillig Exp $ */
# 3 "d_c99_bool_strict.c"
/*
@@ -166,7 +166,7 @@ enum strict_bool_constant_expressions {
* The parenthesized expression has type int and thus cannot be
* used as the controlling expression in the '?:' operator.
*/
- Q2 = (13 > 12 ? 1 : 7) ? 100 : 101, /* expect: 161, 331 */
+ Q2 = (13 > 12 ? 1 : 7) ? 100 : 101, /* expect: 161 *//* expect: 331 */
BINAND_BOOL = __lint_false & __lint_true, /* expect: 55 */
BINAND_INT = 0 & 1,
@@ -177,11 +177,11 @@ enum strict_bool_constant_expressions {
BINOR_BOOL = __lint_false | __lint_true, /* expect: 55 */
BINOR_INT = 0 | 1,
- LOGOR_BOOL = __lint_false || __lint_true, /* expect: 161, 55 */
- LOGOR_INT = 0 || 1, /* expect: 331, 332 */
+ LOGOR_BOOL = __lint_false || __lint_true, /* expect: 161 *//* expect: 55 */
+ LOGOR_INT = 0 || 1, /* expect: 331 *//* expect: 332 */
- LOGAND_BOOL = __lint_false && __lint_true, /* expect: 161, 55 */
- LOGAND_INT = 0 && 1, /* expect: 331, 332 */
+ LOGAND_BOOL = __lint_false && __lint_true, /* expect: 161 *//* expect: 55 */
+ LOGAND_INT = 0 && 1, /* expect: 331 *//* expect: 332 */
};
/*
@@ -298,13 +298,13 @@ strict_bool_conversion_function_argument
take_arguments(b, i, p);
/* Implicitly converting bool to other scalar types. */
- take_arguments(b, b, b); /* expect: 334, 334 */
+ take_arguments(b, b, b); /* expect: 334 *//* expect: 334 */
/* Implicitly converting int to bool (arg #1). */
- take_arguments(i, i, i); /* expect: 334, 154 */
+ take_arguments(i, i, i); /* expect: 334 *//* expect: 154 */
/* Implicitly converting pointer to bool (arg #1). */
- take_arguments(p, p, p); /* expect: 334, 154 */
+ take_arguments(p, p, p); /* expect: 334 *//* expect: 154 */
/* Passing bool as vararg. */
take_arguments(b, i, p, b, i, p); /* TODO: expect: arg#4 */
@@ -416,8 +416,8 @@ strict_bool_operand_unary_not(void)
b = !b;
b = !!!b;
- b = !__lint_false; /* expect: 161, 239 */
- b = !__lint_true; /* expect: 161, 239 */
+ b = !__lint_false; /* expect: 161 *//* expect: 239 */
+ b = !__lint_true; /* expect: 161 *//* expect: 239 */
int i = 0;
@@ -500,8 +500,8 @@ strict_bool_operand_binary(bool b, int i
* scalar to bool.
*/
b = !i; /* expect: 330 */
- b = i && i; /* expect: 331, 332 */
- b = i || i; /* expect: 331, 332 */
+ b = i && i; /* expect: 331 *//* expect: 332 */
+ b = i || i; /* expect: 331 *//* expect: 332 */
b = b && 0; /* expect: 332 */
b = 0 && b; /* expect: 331 */
@@ -523,18 +523,18 @@ strict_bool_operand_binary_all(bool b, u
b = +b; /* expect: 335 */
b = -b; /* expect: 335 */
- b = b * b; /* expect: 336, 337 */
- b = b / b; /* expect: 336, 337 */
- b = b % b; /* expect: 336, 337 */
- b = b + b; /* expect: 336, 337 */
- b = b - b; /* expect: 336, 337 */
- b = b << b; /* expect: 336, 337 */
- b = b >> b; /* expect: 336, 337 */
-
- b = b < b; /* expect: 336, 337 */
- b = b <= b; /* expect: 336, 337 */
- b = b > b; /* expect: 336, 337 */
- b = b >= b; /* expect: 336, 337 */
+ b = b * b; /* expect: 336 *//* expect: 337 */
+ b = b / b; /* expect: 336 *//* expect: 337 */
+ b = b % b; /* expect: 336 *//* expect: 337 */
+ b = b + b; /* expect: 336 *//* expect: 337 */
+ b = b - b; /* expect: 336 *//* expect: 337 */
+ b = b << b; /* expect: 336 *//* expect: 337 */
+ b = b >> b; /* expect: 336 *//* expect: 337 */
+
+ b = b < b; /* expect: 336 *//* expect: 337 */
+ b = b <= b; /* expect: 336 *//* expect: 337 */
+ b = b > b; /* expect: 336 *//* expect: 337 */
+ b = b >= b; /* expect: 336 *//* expect: 337 */
b = b == b;
b = b != b;
@@ -546,13 +546,13 @@ strict_bool_operand_binary_all(bool b, u
b = b ? b : b;
b = b;
- b *= b; /* expect: 336, 337 */
- b /= b; /* expect: 336, 337 */
- b %= b; /* expect: 336, 337 */
- b += b; /* expect: 336, 337 */
- b -= b; /* expect: 336, 337 */
- b <<= b; /* expect: 336, 337 */
- b >>= b; /* expect: 336, 337 */
+ b *= b; /* expect: 336 *//* expect: 337 */
+ b /= b; /* expect: 336 *//* expect: 337 */
+ b %= b; /* expect: 336 *//* expect: 337 */
+ b += b; /* expect: 336 *//* expect: 337 */
+ b -= b; /* expect: 336 *//* expect: 337 */
+ b <<= b; /* expect: 336 *//* expect: 337 */
+ b >>= b; /* expect: 336 *//* expect: 337 */
b &= b;
b ^= b;
b |= b;
Index: src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c:1.8 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c:1.9
--- src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c:1.8 Sun Jan 24 09:18:42 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_bool_strict_syshdr.c,v 1.8 2021/01/24 09:18:42 rillig Exp $ */
+/* $NetBSD: d_c99_bool_strict_syshdr.c,v 1.9 2021/04/05 01:35:34 rillig Exp $ */
# 3 "d_c99_bool_strict_syshdr.c"
/*
@@ -172,7 +172,7 @@ call_finite_good(double d)
_Bool
str_equal_bad(const char *s1, const char *s2)
{
- return !strcmp(s1, s2); /* expect: 330, 214 */
+ return !strcmp(s1, s2); /* expect: 330 *//* expect: 214 */
}
_Bool
Index: src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c
diff -u src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c:1.2 src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c:1.2 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c Mon Apr 5 01:35:34 2021
@@ -7,9 +7,9 @@
void func(int a, int b, int c);
-void func(num, ptr, dbl, def) /* expect: 231, 231, 231, 231 */
+void func(num, ptr, dbl, def) /* expect: 231 *//* expect: 231 *//* expect: 231 *//* expect: 231 */
int num;
char *ptr;
double dbl;
-{ /* expect: 32, 51 */
+{ /* expect: 32 *//* expect: 51 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_163.c
diff -u src/tests/usr.bin/xlint/lint1/msg_163.c:1.2 src/tests/usr.bin/xlint/lint1/msg_163.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_163.c:1.2 Sun Jan 17 16:16:09 2021
+++ src/tests/usr.bin/xlint/lint1/msg_163.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_163.c,v 1.2 2021/01/17 16:16:09 rillig Exp $ */
+/* $NetBSD: msg_163.c,v 1.3 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_163.c"
// Test for message: a cast does not yield an lvalue [163]
@@ -9,5 +9,5 @@ example(char *p, int i)
p++;
((char *)p)++; /* XXX: why is this ok? */
i++;
- ((int)i)++; /* expect: 163, 114 */
+ ((int)i)++; /* expect: 163 *//* expect: 114 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_224.c
diff -u src/tests/usr.bin/xlint/lint1/msg_224.c:1.2 src/tests/usr.bin/xlint/lint1/msg_224.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_224.c:1.2 Sat Jan 30 17:02:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_224.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_224.c,v 1.2 2021/01/30 17:02:58 rillig Exp $ */
+/* $NetBSD: msg_224.c,v 1.3 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_224.c"
// Test for message: cannot recover from previous errors [224]
@@ -7,5 +7,5 @@ void example1(void) { "syntax" error; }
void example2(void) { "syntax" error; } /* expect: 249 */
void example3(void) { "syntax" error; } /* expect: 249 */
void example4(void) { "syntax" error; } /* expect: 249 */
-void example5(void) { "syntax" error; } /* expect: 249, 224 */
+void example5(void) { "syntax" error; } /* expect: 249 *//* expect: 224 */
void example6(void) { "syntax" error; }
Index: src/tests/usr.bin/xlint/lint1/msg_331.c
diff -u src/tests/usr.bin/xlint/lint1/msg_331.c:1.2 src/tests/usr.bin/xlint/lint1/msg_331.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_331.c:1.2 Sat Jan 16 16:03:47 2021
+++ src/tests/usr.bin/xlint/lint1/msg_331.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_331.c,v 1.2 2021/01/16 16:03:47 rillig Exp $ */
+/* $NetBSD: msg_331.c,v 1.3 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_331.c"
// Test for message: left operand of '%s' must be bool, not '%s' [331]
@@ -16,8 +16,8 @@ void
example(bool b, char c, int i)
{
test(b && b);
- test(c && b); /* expect: 331, 334 */
- test(i && b); /* expect: 331, 334 */
+ test(c && b); /* expect: 331 *//* expect: 334 */
+ test(i && b); /* expect: 331 *//* expect: 334 */
test(c != '\0');
test(i != 0);
Index: src/tests/usr.bin/xlint/lint1/msg_332.c
diff -u src/tests/usr.bin/xlint/lint1/msg_332.c:1.2 src/tests/usr.bin/xlint/lint1/msg_332.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_332.c:1.2 Sat Jan 16 16:03:47 2021
+++ src/tests/usr.bin/xlint/lint1/msg_332.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_332.c,v 1.2 2021/01/16 16:03:47 rillig Exp $ */
+/* $NetBSD: msg_332.c,v 1.3 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_332.c"
// Test for message: right operand of '%s' must be bool, not '%s' [332]
@@ -16,8 +16,8 @@ void
example(bool b, char c, int i)
{
test(b && b);
- test(b && c); /* expect: 332, 334 */
- test(b && i); /* expect: 332, 334 */
+ test(b && c); /* expect: 332 *//* expect: 334 */
+ test(b && i); /* expect: 332 *//* expect: 334 */
test(c != '\0');
test(i != 0);
Index: src/tests/usr.bin/xlint/lint1/msg_336.c
diff -u src/tests/usr.bin/xlint/lint1/msg_336.c:1.2 src/tests/usr.bin/xlint/lint1/msg_336.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_336.c:1.2 Sat Jan 16 16:03:47 2021
+++ src/tests/usr.bin/xlint/lint1/msg_336.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_336.c,v 1.2 2021/01/16 16:03:47 rillig Exp $ */
+/* $NetBSD: msg_336.c,v 1.3 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_336.c"
// Test for message: left operand of '%s' must not be bool [336]
@@ -15,7 +15,7 @@ test(bool);
void
example(bool b, int i)
{
- test(b + i); /* expect: 336, 334 */
+ test(b + i); /* expect: 336 *//* expect: 334 */
test(b);
test(i != 0);
}
Index: src/tests/usr.bin/xlint/lint1/msg_337.c
diff -u src/tests/usr.bin/xlint/lint1/msg_337.c:1.2 src/tests/usr.bin/xlint/lint1/msg_337.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_337.c:1.2 Sat Jan 16 16:03:47 2021
+++ src/tests/usr.bin/xlint/lint1/msg_337.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_337.c,v 1.2 2021/01/16 16:03:47 rillig Exp $ */
+/* $NetBSD: msg_337.c,v 1.3 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_337.c"
// Test for message: right operand of '%s' must not be bool [337]
@@ -15,7 +15,7 @@ test(bool);
void
example(bool b, int i)
{
- test(i + b); /* expect: 337, 334 */
+ test(i + b); /* expect: 337 *//* expect: 334 */
test(b);
test(i != 0);
}
Index: src/tests/usr.bin/xlint/lint1/msg_338.c
diff -u src/tests/usr.bin/xlint/lint1/msg_338.c:1.2 src/tests/usr.bin/xlint/lint1/msg_338.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_338.c:1.2 Sat Feb 20 09:40:42 2021
+++ src/tests/usr.bin/xlint/lint1/msg_338.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_338.c,v 1.2 2021/02/20 09:40:42 rillig Exp $ */
+/* $NetBSD: msg_338.c,v 1.3 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_338.c"
// Test for message: option '%c' should be handled in the switch [338]
@@ -11,7 +11,7 @@ main(int argc, char **argv)
{
int o;
- while ((o = getopt(argc, argv, "a:bc:d")) != -1) { /* expect: 338, 338 */
+ while ((o = getopt(argc, argv, "a:bc:d")) != -1) { /* expect: 338 *//* expect: 338 */
switch (o) {
case 'a':
break;
Index: src/tests/usr.bin/xlint/lint1/d_fold_test.c
diff -u src/tests/usr.bin/xlint/lint1/d_fold_test.c:1.3 src/tests/usr.bin/xlint/lint1/d_fold_test.c:1.4
--- src/tests/usr.bin/xlint/lint1/d_fold_test.c:1.3 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/d_fold_test.c Mon Apr 5 01:35:34 2021
@@ -56,15 +56,15 @@ void if_enum(enum e e) { if (e) return
/* C99 6.2.5p20 */
void if_array(struct arr arr) { if (arr.arr) return; }
-void if_struct(struct s s) { if (s) return; } /* expect: 204, 231 */
-void if_union(union u u) { if (u) return; } /* expect: 204, 231 */
+void if_struct(struct s s) { if (s) return; } /* expect: 204 *//* expect: 231 */
+void if_union(union u u) { if (u) return; } /* expect: 204 *//* expect: 231 */
void if_function(void) { if (if_function) return; }
void if_pointer(void *p) { if (p) return; }
/* C99 6.8.5 */
-void while_struct(struct s s) { while (s) return; } /* expect: 204, 231 */
-void for_struct(struct s s) { for (;s;) return; } /* expect: 204, 223, 231 */
-void do_while_struct(struct s s) { do { return; } while (s); } /* expect: 204, 231 */
+void while_struct(struct s s) { while (s) return; } /* expect: 204 *//* expect: 231 */
+void for_struct(struct s s) { for (;s;) return; } /* expect: 204 *//* expect: 223 *//* expect: 231 */
+void do_while_struct(struct s s) { do { return; } while (s); } /* expect: 204 *//* expect: 231 */
/* C99 6.5.15 does not require a scalar type, curiously. */
-int conditional_struct(struct s s) { return s ? 1 : 2; } /* expect: 170, 214, 231 */
+int conditional_struct(struct s s) { return s ? 1 : 2; } /* expect: 170 *//* expect: 214 *//* expect: 231 */
Index: src/tests/usr.bin/xlint/lint1/d_type_conv3.c
diff -u src/tests/usr.bin/xlint/lint1/d_type_conv3.c:1.3 src/tests/usr.bin/xlint/lint1/d_type_conv3.c:1.4
--- src/tests/usr.bin/xlint/lint1/d_type_conv3.c:1.3 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/d_type_conv3.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_type_conv3.c,v 1.3 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: d_type_conv3.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "d_type_conv3.c"
/* Flag information-losing type conversion in argument lists */
@@ -9,5 +9,5 @@ void
should_fail()
{
- f(0x7fffffffffffffffLL); /* expect: 259, 295 */
+ f(0x7fffffffffffffffLL); /* expect: 259 *//* expect: 295 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_004.c
diff -u src/tests/usr.bin/xlint/lint1/msg_004.c:1.3 src/tests/usr.bin/xlint/lint1/msg_004.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_004.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_004.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_004.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_004.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_004.c"
// Test for message: illegal type combination [4]
@@ -10,7 +10,7 @@ int ok_int;
double ok_double;
float _Complex ok_float_complex;
-int _Complex illegal_int_complex; /* expect: 4, 308 */
+int _Complex illegal_int_complex; /* expect: 4 *//* expect: 308 */
char enum {
CHAR
Index: src/tests/usr.bin/xlint/lint1/msg_006.c
diff -u src/tests/usr.bin/xlint/lint1/msg_006.c:1.3 src/tests/usr.bin/xlint/lint1/msg_006.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_006.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_006.c Mon Apr 5 01:35:34 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_006.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_006.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_006.c"
// Test for message: use 'double' instead of 'long float' [6]
-long float x; /* expect: 6, 4 */
+long float x; /* expect: 6 *//* expect: 4 */
double x;
Index: src/tests/usr.bin/xlint/lint1/msg_019.c
diff -u src/tests/usr.bin/xlint/lint1/msg_019.c:1.3 src/tests/usr.bin/xlint/lint1/msg_019.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_019.c:1.3 Sun Jan 31 11:23:01 2021
+++ src/tests/usr.bin/xlint/lint1/msg_019.c Mon Apr 5 01:35:34 2021
@@ -1,14 +1,14 @@
-/* $NetBSD: msg_019.c,v 1.3 2021/01/31 11:23:01 rillig Exp $ */
+/* $NetBSD: msg_019.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_019.c"
// Test for message: void type for '%s' [19]
void global_variable; /* expect: 19 */
-static void unit_variable; /* expect: 19, 226 */
+static void unit_variable; /* expect: 19 *//* expect: 226 */
void
-function(void parameter) /* expect: 61, 231 */
+function(void parameter) /* expect: 61 *//* expect: 231 */
{
void local_variable; /* expect: 19 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_051.c
diff -u src/tests/usr.bin/xlint/lint1/msg_051.c:1.3 src/tests/usr.bin/xlint/lint1/msg_051.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_051.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_051.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_051.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_051.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_051.c"
// Test for message: parameter mismatch: %d declared, %d defined [51]
@@ -7,7 +7,7 @@ void
example(int, int);
void
-example(a, b, c) /* expect: 231, 231, 231 */
+example(a, b, c) /* expect: 231 *//* expect: 231 *//* expect: 231 */
int a, b, c;
{ /* expect: 51 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_057.c
diff -u src/tests/usr.bin/xlint/lint1/msg_057.c:1.3 src/tests/usr.bin/xlint/lint1/msg_057.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_057.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_057.c Mon Apr 5 01:35:34 2021
@@ -1,13 +1,13 @@
-/* $NetBSD: msg_057.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_057.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_057.c"
// Test for message: enumeration constant hides parameter: %s [57]
long
-rgb(int red, int green, int blue) /* expect: 231, 231, 231 */
+rgb(int red, int green, int blue) /* expect: 231 *//* expect: 231 *//* expect: 231 */
{
enum color {
- red, green, blue /* expect: 57, 57 */
+ red, green, blue /* expect: 57 *//* expect: 57 */
}; /* expect: 57 */
return red + green + blue;
Index: src/tests/usr.bin/xlint/lint1/msg_060.c
diff -u src/tests/usr.bin/xlint/lint1/msg_060.c:1.3 src/tests/usr.bin/xlint/lint1/msg_060.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_060.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_060.c Mon Apr 5 01:35:34 2021
@@ -1,8 +1,8 @@
-/* $NetBSD: msg_060.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_060.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_060.c"
// Test for message: void must be sole parameter [60]
void example_1(void);
void example_2(int, void); /* expect: 60 */
-void example_3(void, void, void); /* expect: 60, 60, 60 */
+void example_3(void, void, void); /* expect: 60 *//* expect: 60 *//* expect: 60 */
Index: src/tests/usr.bin/xlint/lint1/msg_071.c
diff -u src/tests/usr.bin/xlint/lint1/msg_071.c:1.3 src/tests/usr.bin/xlint/lint1/msg_071.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_071.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_071.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_071.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_071.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_071.c"
// Test for message: too many characters in character constant [71]
@@ -8,4 +8,4 @@
* sequence of characters that can constitute the escape sequence.
*/
char valid_multi_digit_hex = '\x0000000000000000000000a';
-char invalid_multi_digit_hex = '\x000g000000000000000000a'; /* expect: 71, 178 */
+char invalid_multi_digit_hex = '\x000g000000000000000000a'; /* expect: 71 *//* expect: 178 */
Index: src/tests/usr.bin/xlint/lint1/msg_074.c
diff -u src/tests/usr.bin/xlint/lint1/msg_074.c:1.3 src/tests/usr.bin/xlint/lint1/msg_074.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_074.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_074.c Mon Apr 5 01:35:34 2021
@@ -1,9 +1,9 @@
-/* $NetBSD: msg_074.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_074.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_074.c"
// Test for message: no hex digits follow \x [74]
char invalid_hex = '\x'; /* expect: 74 */
-char invalid_hex_letter = '\xg'; /* expect: 74, 294 */
+char invalid_hex_letter = '\xg'; /* expect: 74 *//* expect: 294 */
char valid_hex = '\xff';
char valid_single_digit_hex = '\xa';
Index: src/tests/usr.bin/xlint/lint1/msg_096.c
diff -u src/tests/usr.bin/xlint/lint1/msg_096.c:1.3 src/tests/usr.bin/xlint/lint1/msg_096.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_096.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_096.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_096.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_096.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_096.c"
// Test for message: cannot dereference non-pointer type [96]
@@ -18,5 +18,5 @@ unary_minus(int i)
int
unary_asterisk(int i) /* expect: 231 */
{
- return *i; /* expect: 96, 214 */
+ return *i; /* expect: 96 *//* expect: 214 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_098.c
diff -u src/tests/usr.bin/xlint/lint1/msg_098.c:1.3 src/tests/usr.bin/xlint/lint1/msg_098.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_098.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_098.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_098.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_098.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_098.c"
/* Test for message: suffixes F and L are illegal in traditional C [98] */
@@ -16,5 +16,5 @@ example()
double d_U = 1234.5U; /* expect: 249 */
long double ld = 1234.5; /* expect: 266 */
- long double ld_L = 1234.5L; /* expect: 98, 266 */
+ long double ld_L = 1234.5L; /* expect: 98 *//* expect: 266 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_109.c
diff -u src/tests/usr.bin/xlint/lint1/msg_109.c:1.3 src/tests/usr.bin/xlint/lint1/msg_109.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_109.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_109.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_109.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_109.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_109.c"
// Test for message: void type illegal in expression [109]
@@ -6,5 +6,5 @@
int
example(int arg) /* expect: 231 */
{
- return arg + (void)4; /* expect: 109, 214 */
+ return arg + (void)4; /* expect: 109 *//* expect: 214 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_142.c
diff -u src/tests/usr.bin/xlint/lint1/msg_142.c:1.3 src/tests/usr.bin/xlint/lint1/msg_142.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_142.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_142.c Mon Apr 5 01:35:34 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: msg_142.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_142.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_142.c"
// Test for message: floating point overflow detected, op %s [142]
-double dbl = 1e100 * 1e100 * 1e100 * 1e100 * 1e100; /* expect: 142, 142 */
+double dbl = 1e100 * 1e100 * 1e100 * 1e100 * 1e100; /* expect: 142 *//* expect: 142 */
Index: src/tests/usr.bin/xlint/lint1/msg_170.c
diff -u src/tests/usr.bin/xlint/lint1/msg_170.c:1.3 src/tests/usr.bin/xlint/lint1/msg_170.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_170.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_170.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_170.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_170.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_170.c"
// Test for message: first operand must have scalar type, op ? : [170]
@@ -10,5 +10,5 @@ struct number {
_Bool
example(const struct number *num) /* expect: 231 */
{
- return *num ? 1 : 0; /* expect: 170, 214 */
+ return *num ? 1 : 0; /* expect: 170 *//* expect: 214 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_176.c
diff -u src/tests/usr.bin/xlint/lint1/msg_176.c:1.3 src/tests/usr.bin/xlint/lint1/msg_176.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_176.c:1.3 Sun Mar 28 14:01:50 2021
+++ src/tests/usr.bin/xlint/lint1/msg_176.c Mon Apr 5 01:35:34 2021
@@ -1,10 +1,10 @@
-/* $NetBSD: msg_176.c,v 1.3 2021/03/28 14:01:50 rillig Exp $ */
+/* $NetBSD: msg_176.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_176.c"
// Test for message: invalid initializer type %s [176]
/*
- * Before init.c 1.161 from 2021-03-28, lint wronly complained about
+ * Before init.c 1.161 from 2021-03-28, lint wrongly complained about
* initializers with redundant braces.
*
* C99 allows these, both GCC and Clang warn about them since they are unusual
Index: src/tests/usr.bin/xlint/lint1/msg_330.c
diff -u src/tests/usr.bin/xlint/lint1/msg_330.c:1.3 src/tests/usr.bin/xlint/lint1/msg_330.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_330.c:1.3 Sat Jan 16 16:03:47 2021
+++ src/tests/usr.bin/xlint/lint1/msg_330.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_330.c,v 1.3 2021/01/16 16:03:47 rillig Exp $ */
+/* $NetBSD: msg_330.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_330.c"
// Test for message: operand of '%s' must be bool, not '%s' [330]
@@ -17,6 +17,6 @@ void
example(bool b, char c, int i)
{
called(!b);
- called(!c); /* expect: 330, 334 */
- called(!i); /* expect: 330, 334 */
+ called(!c); /* expect: 330 *//* expect: 334 */
+ called(!i); /* expect: 330 *//* expect: 334 */
}
Index: src/tests/usr.bin/xlint/lint1/d_gcc_extension.c
diff -u src/tests/usr.bin/xlint/lint1/d_gcc_extension.c:1.4 src/tests/usr.bin/xlint/lint1/d_gcc_extension.c:1.5
--- src/tests/usr.bin/xlint/lint1/d_gcc_extension.c:1.4 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/d_gcc_extension.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_gcc_extension.c,v 1.4 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: d_gcc_extension.c,v 1.5 2021/04/05 01:35:34 rillig Exp $ */
# 3 "d_gcc_extension.c"
/* extension */
@@ -8,7 +8,7 @@ a(void)
double __logbw = 1;
if (__extension__(({
__typeof((__logbw)) x_ = (__logbw);
- !__builtin_isinf((x_)) && !__builtin_isnan((x_)); /* expect: 259, 259 */
+ !__builtin_isinf((x_)) && !__builtin_isnan((x_)); /* expect: 259 *//* expect: 259 */
})))
__logbw = 1;
}
Index: src/tests/usr.bin/xlint/lint1/msg_117.c
diff -u src/tests/usr.bin/xlint/lint1/msg_117.c:1.4 src/tests/usr.bin/xlint/lint1/msg_117.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_117.c:1.4 Sun Jan 31 11:44:48 2021
+++ src/tests/usr.bin/xlint/lint1/msg_117.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_117.c,v 1.4 2021/01/31 11:44:48 rillig Exp $ */
+/* $NetBSD: msg_117.c,v 1.5 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_117.c"
// Test for message: bitwise '%s' on signed value possibly nonportable [117]
@@ -26,11 +26,11 @@ shr_lhs_constant_negative(int a)
int
shr_rhs_constant_positive(int a)
{
- return a >> 0x1234; /* expect: 117, 122 */
+ return a >> 0x1234; /* expect: 117 *//* expect: 122 */
}
int
shr_rhs_constant_negative(int a)
{
- return a >> -0x1234; /* expect: 117, 121 */
+ return a >> -0x1234; /* expect: 117 *//* expect: 121 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_120.c
diff -u src/tests/usr.bin/xlint/lint1/msg_120.c:1.4 src/tests/usr.bin/xlint/lint1/msg_120.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_120.c:1.4 Sun Jan 31 11:44:48 2021
+++ src/tests/usr.bin/xlint/lint1/msg_120.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_120.c,v 1.4 2021/01/31 11:44:48 rillig Exp $ */
+/* $NetBSD: msg_120.c,v 1.5 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_120.c"
// Test for message: bitwise '%s' on signed value nonportable [120]
@@ -26,11 +26,11 @@ shr_lhs_constant_negative(int a)
int
shr_rhs_constant_positive(int a)
{
- return a >> 0x1234; /* expect: 117, 122 */
+ return a >> 0x1234; /* expect: 117 *//* expect: 122 */
}
int
shr_rhs_constant_negative(int a)
{
- return a >> -0x1234; /* expect: 117, 121 */
+ return a >> -0x1234; /* expect: 117 *//* expect: 121 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_126.c
diff -u src/tests/usr.bin/xlint/lint1/msg_126.c:1.4 src/tests/usr.bin/xlint/lint1/msg_126.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_126.c:1.4 Sun Feb 28 12:40:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_126.c Mon Apr 5 01:35:34 2021
@@ -1,10 +1,10 @@
-/* $NetBSD: msg_126.c,v 1.4 2021/02/28 12:40:00 rillig Exp $ */
+/* $NetBSD: msg_126.c,v 1.5 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_126.c"
// Test for message: incompatible types '%s' and '%s' in conditional [126]
int
-max(int cond, void *ptr, double dbl) /* expect: 231, 231, 231 */
+max(int cond, void *ptr, double dbl) /* expect: 231 *//* expect: 231 *//* expect: 231 */
{
- return cond ? ptr : dbl; /* expect: 126, 214 */
+ return cond ? ptr : dbl; /* expect: 126 *//* expect: 214 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_239.c
diff -u src/tests/usr.bin/xlint/lint1/msg_239.c:1.4 src/tests/usr.bin/xlint/lint1/msg_239.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_239.c:1.4 Fri Apr 2 22:41:54 2021
+++ src/tests/usr.bin/xlint/lint1/msg_239.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_239.c,v 1.4 2021/04/02 22:41:54 rillig Exp $ */
+/* $NetBSD: msg_239.c,v 1.5 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_239.c"
// Test for message: constant argument to '!' [239]
@@ -10,8 +10,8 @@ example(int n)
{
_Bool b;
- b = !0; /* expect: constant in conditional context, 239 */
- b = !1; /* expect: constant in conditional context, 239 */
+ b = !0; /* expect: constant in conditional context *//* expect: 239 */
+ b = !1; /* expect: constant in conditional context *//* expect: 239 */
b = !(n > 1);
return b;
Index: src/tests/usr.bin/xlint/lint1/msg_035.c
diff -u src/tests/usr.bin/xlint/lint1/msg_035.c:1.7 src/tests/usr.bin/xlint/lint1/msg_035.c:1.8
--- src/tests/usr.bin/xlint/lint1/msg_035.c:1.7 Sun Feb 28 02:45:37 2021
+++ src/tests/usr.bin/xlint/lint1/msg_035.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_035.c,v 1.7 2021/02/28 02:45:37 rillig Exp $ */
+/* $NetBSD: msg_035.c,v 1.8 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_035.c"
// Test for message: illegal bit-field type '%s' [35]
@@ -47,14 +47,14 @@ struct example {
float float_flag: 1; /* expect: 35 */
double double_flag: 1; /* expect: 35 */
long double long_double_flag: 1; /* expect: 35 */
- void void_flag: 1; /* expect: 19, 37 */
+ void void_flag: 1; /* expect: 19 *//* expect: 37 */
example_struct struct_flag: 1; /* expect: 35 */
example_union union_flag: 1; /* expect: 35 */
example_enum enum_flag: 1;
void *pointer_flag: 1; /* expect: 35 */
unsigned int array_flag[4]: 1; /* expect: 35 */
example_function function_flag: 1; /* expect: 35 */
- _Complex complex_flag: 1; /* expect: 35, 308 */
+ _Complex complex_flag: 1; /* expect: 35 *//* expect: 308 */
float _Complex float_complex_flag: 1; /* expect: 35 */
double _Complex double_complex_flag: 1; /* expect: 35 */
long double _Complex long_double_complex_flag: 1; /* expect: 35 */
Index: src/tests/usr.bin/xlint/lint1/msg_204.c
diff -u src/tests/usr.bin/xlint/lint1/msg_204.c:1.5 src/tests/usr.bin/xlint/lint1/msg_204.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_204.c:1.5 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_204.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_204.c,v 1.5 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_204.c,v 1.6 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_204.c"
// Test for message: controlling expressions must have scalar type [204]
@@ -84,18 +84,18 @@ void if_enum(enum e e) { if (e) return
/* C99 6.2.5p20 */
void if_array(struct arr arr) { if (arr.arr) return; }
-void if_struct(struct s s) { if (s) return; } /* expect: 204, 231 */
-void if_union(union u u) { if (u) return; } /* expect: 204, 231 */
+void if_struct(struct s s) { if (s) return; } /* expect: 204 *//* expect: 231 */
+void if_union(union u u) { if (u) return; } /* expect: 204 *//* expect: 231 */
void if_function(void) { if (if_function) return; }
void if_pointer(void *p) { if (p) return; }
/* C99 6.8.5 */
-void while_struct(struct s s) { while (s) return; } /* expect: 204, 231 */
-void for_struct(struct s s) { for (;s;) return; } /* expect: 204, 223, 231 */
-void do_while_struct(struct s s) { do { return; } while (s); } /* expect: 204, 231 */
+void while_struct(struct s s) { while (s) return; } /* expect: 204 *//* expect: 231 */
+void for_struct(struct s s) { for (;s;) return; } /* expect: 204 *//* expect: 223 *//* expect: 231 */
+void do_while_struct(struct s s) { do { return; } while (s); } /* expect: 204 *//* expect: 231 */
/*
* C99 6.5.15 for the '?:' operator does not explicitly mention that the
* controlling expression must have a scalar type, curiously.
*/
-int conditional_struct(struct s s) { return s ? 1 : 2; } /* expect: 170, 214, 231 */
+int conditional_struct(struct s s) { return s ? 1 : 2; } /* expect: 170 *//* expect: 214 *//* expect: 231 */
Index: src/tests/usr.bin/xlint/lint1/msg_308.c
diff -u src/tests/usr.bin/xlint/lint1/msg_308.c:1.5 src/tests/usr.bin/xlint/lint1/msg_308.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_308.c:1.5 Sun Feb 28 12:40:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_308.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_308.c,v 1.5 2021/02/28 12:40:00 rillig Exp $ */
+/* $NetBSD: msg_308.c,v 1.6 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_308.c"
// Test for message: invalid type for _Complex [308]
@@ -7,4 +7,4 @@ float _Complex float_complex;
double _Complex double_complex;
long double _Complex long_double_complex;
_Complex plain_complex; /* expect: 308 */
-int _Complex int_complex; /* expect: 308, 4 */
+int _Complex int_complex; /* expect: 308 *//* expect: 4 */
Index: src/tests/usr.bin/xlint/lint1/msg_339.c
diff -u src/tests/usr.bin/xlint/lint1/msg_339.c:1.1 src/tests/usr.bin/xlint/lint1/msg_339.c:1.2
--- src/tests/usr.bin/xlint/lint1/msg_339.c:1.1 Fri Feb 19 12:28:56 2021
+++ src/tests/usr.bin/xlint/lint1/msg_339.c Mon Apr 5 01:35:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_339.c,v 1.1 2021/02/19 12:28:56 rillig Exp $ */
+/* $NetBSD: msg_339.c,v 1.2 2021/04/05 01:35:34 rillig Exp $ */
# 3 "msg_339.c"
// Test for message: option '%c' should be listed in the options string [339]
@@ -11,7 +11,7 @@ main(int argc, char **argv)
{
int o;
- while ((o = getopt(argc, argv, "a:bc:d")) != -1) { /* expect: 338, 338 */
+ while ((o = getopt(argc, argv, "a:bc:d")) != -1) { /* expect: 338 *//* expect: 338 */
switch (o) {
case 'a':
break;
