From 1a876f77627001944830f762016aaaa9f78e8bd8 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Thu, 13 Apr 2023 11:18:41 +0200 Subject: [PATCH] C++: Update test expectations after extractor changes --- .../type_attributes/type_attributes.expected | 4 ++-- .../constants/constants/aggregates.expected | 2 +- .../structs/compatible_c/compatible.expected | 12 ++++++------ .../structs/compatible_c/compatible_types.expected | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes.expected b/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes.expected index 7002f036019..19a65b83ba4 100644 --- a/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes.expected +++ b/cpp/ql/test/library-tests/attributes/type_attributes/type_attributes.expected @@ -1,7 +1,7 @@ | file://:0:0:0:0 | short __attribute((__may_alias__)) | type_attributes.c:25:30:25:42 | may_alias | | type_attributes.c:5:36:5:51 | my_packed_struct | type_attributes.c:5:23:5:32 | packed | -| type_attributes.c:10:54:10:54 | union | type_attributes.c:10:30:10:50 | transparent_union | -| type_attributes.c:16:54:16:54 | union | type_attributes.c:16:30:16:50 | transparent_union | +| type_attributes.c:10:54:10:54 | (unnamed class/struct/union) | type_attributes.c:10:30:10:50 | transparent_union | +| type_attributes.c:16:54:16:54 | (unnamed class/struct/union) | type_attributes.c:16:30:16:50 | transparent_union | | type_attributes.c:21:37:21:45 | unusedInt | type_attributes.c:21:24:21:29 | unused | | type_attributes.c:23:13:23:18 | depInt | type_attributes.c:23:36:23:45 | deprecated | | type_attributes_ms.cpp:1:29:1:29 | X | type_attributes_ms.cpp:1:19:1:26 | novtable | diff --git a/cpp/ql/test/library-tests/constants/constants/aggregates.expected b/cpp/ql/test/library-tests/constants/constants/aggregates.expected index 9c1e212c637..176230b73d7 100644 --- a/cpp/ql/test/library-tests/constants/constants/aggregates.expected +++ b/cpp/ql/test/library-tests/constants/constants/aggregates.expected @@ -1,4 +1,4 @@ +| (unnamed class/struct/union) | | float[3] | | float[3][3] | | foo[1] | -| struct | diff --git a/cpp/ql/test/library-tests/structs/compatible_c/compatible.expected b/cpp/ql/test/library-tests/structs/compatible_c/compatible.expected index 23397167f04..bafb2131e74 100644 --- a/cpp/ql/test/library-tests/structs/compatible_c/compatible.expected +++ b/cpp/ql/test/library-tests/structs/compatible_c/compatible.expected @@ -1,6 +1,6 @@ -| a1.c:6:16:6:16 | struct | 0 members | 2 locations | -1 | | -| a1.c:10:16:10:16 | struct | 1 members | 2 locations | 0 | x | -| a1.c:17:16:17:16 | struct | 1 members | 2 locations | 0 | x | +| a1.c:6:16:6:16 | (unnamed class/struct/union) | 0 members | 2 locations | -1 | | +| a1.c:10:16:10:16 | (unnamed class/struct/union) | 1 members | 2 locations | 0 | x | +| a1.c:17:16:17:16 | (unnamed class/struct/union) | 1 members | 2 locations | 0 | x | | a1.c:24:8:24:10 | Foo | 3 members | 2 locations | 0 | empty | | a1.c:24:8:24:10 | Foo | 3 members | 2 locations | 1 | nonempty | | a1.c:24:8:24:10 | Foo | 3 members | 2 locations | 2 | i | @@ -9,9 +9,9 @@ | a1.c:36:8:36:10 | Bar | 3 members | 2 locations | 0 | empty | | a1.c:36:8:36:10 | Bar | 3 members | 2 locations | 1 | nonempty | | a1.c:36:8:36:10 | Bar | 3 members | 2 locations | 2 | i | -| a2.c:6:16:6:16 | struct | 0 members | 2 locations | -1 | | -| a2.c:10:16:10:16 | struct | 1 members | 2 locations | 0 | x | -| a2.c:17:16:17:16 | struct | 1 members | 2 locations | 0 | x | +| a2.c:6:16:6:16 | (unnamed class/struct/union) | 0 members | 2 locations | -1 | | +| a2.c:10:16:10:16 | (unnamed class/struct/union) | 1 members | 2 locations | 0 | x | +| a2.c:17:16:17:16 | (unnamed class/struct/union) | 1 members | 2 locations | 0 | x | | a2.c:24:8:24:10 | Foo | 3 members | 2 locations | 0 | empty | | a2.c:24:8:24:10 | Foo | 3 members | 2 locations | 1 | nonempty | | a2.c:24:8:24:10 | Foo | 3 members | 2 locations | 2 | i | diff --git a/cpp/ql/test/library-tests/structs/compatible_c/compatible_types.expected b/cpp/ql/test/library-tests/structs/compatible_c/compatible_types.expected index 1151179e58d..45f52c73fd1 100644 --- a/cpp/ql/test/library-tests/structs/compatible_c/compatible_types.expected +++ b/cpp/ql/test/library-tests/structs/compatible_c/compatible_types.expected @@ -1,5 +1,5 @@ -| a1.c:10:16:10:16 | struct | 0 | file://:0:0:0:0 | int | 1 types | -| a1.c:17:16:17:16 | struct | 0 | file://:0:0:0:0 | int | 1 types | +| a1.c:10:16:10:16 | (unnamed class/struct/union) | 0 | file://:0:0:0:0 | int | 1 types | +| a1.c:17:16:17:16 | (unnamed class/struct/union) | 0 | file://:0:0:0:0 | int | 1 types | | a1.c:24:8:24:10 | Foo | 0 | file://:0:0:0:0 | anon_empty_t * | 1 types | | a1.c:24:8:24:10 | Foo | 1 | file://:0:0:0:0 | anon_nonempty_t * | 1 types | | a1.c:24:8:24:10 | Foo | 2 | file://:0:0:0:0 | int | 1 types | @@ -7,8 +7,8 @@ | a1.c:36:8:36:10 | Bar | 0 | file://:0:0:0:0 | Empty * | 1 types | | a1.c:36:8:36:10 | Bar | 1 | file://:0:0:0:0 | NonEmpty * | 1 types | | a1.c:36:8:36:10 | Bar | 2 | file://:0:0:0:0 | int | 1 types | -| a2.c:10:16:10:16 | struct | 0 | file://:0:0:0:0 | int | 1 types | -| a2.c:17:16:17:16 | struct | 0 | file://:0:0:0:0 | int | 1 types | +| a2.c:10:16:10:16 | (unnamed class/struct/union) | 0 | file://:0:0:0:0 | int | 1 types | +| a2.c:17:16:17:16 | (unnamed class/struct/union) | 0 | file://:0:0:0:0 | int | 1 types | | a2.c:24:8:24:10 | Foo | 0 | file://:0:0:0:0 | anon_empty_t * | 1 types | | a2.c:24:8:24:10 | Foo | 1 | file://:0:0:0:0 | anon_nonempty_t * | 1 types | | a2.c:24:8:24:10 | Foo | 2 | file://:0:0:0:0 | int | 1 types |