Skip to content

Commit e555b6b

Browse files
igfooigfoo
authored
Merge pull request #4380 from github/igfoo/unnamed
C++: Accept test changes in unnamed entity naming
2 parents c027f3b + d5f8cbc commit e555b6b

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎cpp/ql/test/library-tests/lambdas/captures/elements.expected‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
| captures.cpp:3:5:3:5 | (constructor) |
1414
| captures.cpp:3:5:3:5 | (constructor) |
1515
| captures.cpp:3:5:3:5 | (constructor) |
16-
| captures.cpp:3:5:3:5 | declaration of (null) |
17-
| captures.cpp:3:5:3:5 | declaration of (null) |
18-
| captures.cpp:3:5:3:5 | definition of (null) |
16+
| captures.cpp:3:5:3:5 | declaration of (constructor) |
17+
| captures.cpp:3:5:3:5 | declaration of (constructor) |
18+
| captures.cpp:3:5:3:5 | definition of (constructor) |
1919
| captures.cpp:3:5:3:5 | definition of operator= |
2020
| captures.cpp:3:5:3:5 | operator= |
2121
| captures.cpp:3:5:5:5 | [...](...){...} |
@@ -50,9 +50,9 @@
5050
| captures.cpp:9:5:9:5 | (constructor) |
5151
| captures.cpp:9:5:9:5 | (constructor) |
5252
| captures.cpp:9:5:9:5 | (constructor) |
53-
| captures.cpp:9:5:9:5 | declaration of (null) |
54-
| captures.cpp:9:5:9:5 | declaration of (null) |
55-
| captures.cpp:9:5:9:5 | definition of (null) |
53+
| captures.cpp:9:5:9:5 | declaration of (constructor) |
54+
| captures.cpp:9:5:9:5 | declaration of (constructor) |
55+
| captures.cpp:9:5:9:5 | definition of (constructor) |
5656
| captures.cpp:9:5:9:5 | definition of operator= |
5757
| captures.cpp:9:5:9:5 | operator= |
5858
| captures.cpp:9:5:11:5 | [...](...){...} |
@@ -87,9 +87,9 @@
8787
| captures.cpp:15:5:15:5 | (constructor) |
8888
| captures.cpp:15:5:15:5 | (constructor) |
8989
| captures.cpp:15:5:15:5 | (constructor) |
90-
| captures.cpp:15:5:15:5 | declaration of (null) |
91-
| captures.cpp:15:5:15:5 | declaration of (null) |
92-
| captures.cpp:15:5:15:5 | definition of (null) |
90+
| captures.cpp:15:5:15:5 | declaration of (constructor) |
91+
| captures.cpp:15:5:15:5 | declaration of (constructor) |
92+
| captures.cpp:15:5:15:5 | definition of (constructor) |
9393
| captures.cpp:15:5:15:5 | definition of operator= |
9494
| captures.cpp:15:5:15:5 | operator= |
9595
| captures.cpp:15:5:17:5 | [...](...){...} |
@@ -129,9 +129,9 @@
129129
| captures.cpp:22:19:22:19 | Unknown literal |
130130
| captures.cpp:22:19:22:19 | constructor init of field x |
131131
| captures.cpp:22:19:22:19 | constructor init of field y |
132-
| captures.cpp:22:19:22:19 | declaration of (null) |
133-
| captures.cpp:22:19:22:19 | definition of (null) |
134-
| captures.cpp:22:19:22:19 | definition of (null) |
132+
| captures.cpp:22:19:22:19 | declaration of (constructor) |
133+
| captures.cpp:22:19:22:19 | definition of (constructor) |
134+
| captures.cpp:22:19:22:19 | definition of (constructor) |
135135
| captures.cpp:22:19:22:19 | definition of operator= |
136136
| captures.cpp:22:19:22:19 | operator= |
137137
| captures.cpp:22:19:22:19 | return ... |
@@ -187,9 +187,9 @@
187187
| end_pos.cpp:9:15:9:15 | (constructor) |
188188
| end_pos.cpp:9:15:9:15 | Unknown literal |
189189
| end_pos.cpp:9:15:9:15 | constructor init of field ii |
190-
| end_pos.cpp:9:15:9:15 | declaration of (null) |
191-
| end_pos.cpp:9:15:9:15 | definition of (null) |
192-
| end_pos.cpp:9:15:9:15 | definition of (null) |
190+
| end_pos.cpp:9:15:9:15 | declaration of (constructor) |
191+
| end_pos.cpp:9:15:9:15 | definition of (constructor) |
192+
| end_pos.cpp:9:15:9:15 | definition of (constructor) |
193193
| end_pos.cpp:9:15:9:15 | definition of operator= |
194194
| end_pos.cpp:9:15:9:15 | operator= |
195195
| end_pos.cpp:9:15:9:15 | return ... |

‎cpp/ql/test/library-tests/noexcept/copy_from_prototype/copy_from_prototype.expected‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
| copy_from_prototype.cpp:3:7:3:7 | a | a<int>::a(const a<int> &) -> void | copy_from_prototype.cpp:3:7:3:7 | a<int> | <no expr> |
33
| copy_from_prototype.cpp:3:7:3:7 | operator= | a<int>::operator=(a<int> &&) -> a<int> & | copy_from_prototype.cpp:3:7:3:7 | a<int> | <no expr> |
44
| copy_from_prototype.cpp:3:7:3:7 | operator= | a<int>::operator=(const a<int> &) -> a<int> & | copy_from_prototype.cpp:3:7:3:7 | a<int> | <no expr> |
5-
| copy_from_prototype.cpp:4:26:4:26 | a | a<<unnamed>>::a<(unnamed)>() -> void | copy_from_prototype.cpp:3:7:3:7 | a<<unnamed>> | 123 |
6-
| copy_from_prototype.cpp:4:26:4:26 | a | a<int>::a<(unnamed)>() -> void | copy_from_prototype.cpp:3:7:3:7 | a<int> | <no expr> |
5+
| copy_from_prototype.cpp:4:26:4:26 | a | a<<unnamed>>::a<(unnamed template parameter)>() -> void | copy_from_prototype.cpp:3:7:3:7 | a<<unnamed>> | 123 |
6+
| copy_from_prototype.cpp:4:26:4:26 | a | a<int>::a<(unnamed template parameter)>() -> void | copy_from_prototype.cpp:3:7:3:7 | a<int> | <no expr> |
77
| copy_from_prototype.cpp:7:7:7:7 | b | b::b() -> void | copy_from_prototype.cpp:7:7:7:7 | b | <no expr> |
88
| copy_from_prototype.cpp:7:7:7:7 | b | b::b(b &&) -> void | copy_from_prototype.cpp:7:7:7:7 | b | <no expr> |
99
| copy_from_prototype.cpp:7:7:7:7 | b | b::b(const b &) -> void | copy_from_prototype.cpp:7:7:7:7 | b | <no expr> |
@@ -13,8 +13,8 @@
1313
| copy_from_prototype.cpp:13:7:13:7 | c | c<int>::c(const c<int> &) -> void | copy_from_prototype.cpp:13:7:13:7 | c<int> | <no expr> |
1414
| copy_from_prototype.cpp:13:7:13:7 | operator= | c<int>::operator=(c<int> &&) -> c<int> & | copy_from_prototype.cpp:13:7:13:7 | c<int> | <no expr> |
1515
| copy_from_prototype.cpp:13:7:13:7 | operator= | c<int>::operator=(const c<int> &) -> c<int> & | copy_from_prototype.cpp:13:7:13:7 | c<int> | <no expr> |
16-
| copy_from_prototype.cpp:14:26:14:26 | c | c<T>::c<(unnamed)>() -> void | copy_from_prototype.cpp:13:7:13:7 | c<T> | X |
17-
| copy_from_prototype.cpp:14:26:14:26 | c | c<int>::c<(unnamed)>() -> void | copy_from_prototype.cpp:13:7:13:7 | c<int> | <no expr> |
16+
| copy_from_prototype.cpp:14:26:14:26 | c | c<T>::c<(unnamed template parameter)>() -> void | copy_from_prototype.cpp:13:7:13:7 | c<T> | X |
17+
| copy_from_prototype.cpp:14:26:14:26 | c | c<int>::c<(unnamed template parameter)>() -> void | copy_from_prototype.cpp:13:7:13:7 | c<int> | <no expr> |
1818
| copy_from_prototype.cpp:17:7:17:7 | d | d::d() -> void | copy_from_prototype.cpp:17:7:17:7 | d | <no expr> |
1919
| copy_from_prototype.cpp:17:7:17:7 | d | d::d(const d &) -> void | copy_from_prototype.cpp:17:7:17:7 | d | <no expr> |
2020
| copy_from_prototype.cpp:17:7:17:7 | d | d::d(d &&) -> void | copy_from_prototype.cpp:17:7:17:7 | d | <no expr> |
@@ -24,7 +24,7 @@
2424
| copy_from_prototype.cpp:22:8:22:8 | e | e<int>::e(e<int> &&) -> void | copy_from_prototype.cpp:22:8:22:8 | e<int> | <no expr> |
2525
| copy_from_prototype.cpp:22:8:22:8 | operator= | e<int>::operator=(const e<int> &) -> e<int> & | copy_from_prototype.cpp:22:8:22:8 | e<int> | <no expr> |
2626
| copy_from_prototype.cpp:22:8:22:8 | operator= | e<int>::operator=(e<int> &&) -> e<int> & | copy_from_prototype.cpp:22:8:22:8 | e<int> | <no expr> |
27-
| copy_from_prototype.cpp:23:26:23:26 | e | e<T>::e<(unnamed)>() -> void | copy_from_prototype.cpp:22:8:22:8 | e<T> | 456 |
28-
| copy_from_prototype.cpp:26:35:26:43 | e | e<int>::e<(unnamed)>() -> void | copy_from_prototype.cpp:22:8:22:8 | e<int> | 456 |
27+
| copy_from_prototype.cpp:23:26:23:26 | e | e<T>::e<(unnamed template parameter)>() -> void | copy_from_prototype.cpp:22:8:22:8 | e<T> | 456 |
28+
| copy_from_prototype.cpp:26:35:26:43 | e | e<int>::e<(unnamed template parameter)>() -> void | copy_from_prototype.cpp:22:8:22:8 | e<int> | 456 |
2929
| file://:0:0:0:0 | operator= | __va_list_tag::operator=(__va_list_tag &&) -> __va_list_tag & | file://:0:0:0:0 | __va_list_tag | <none> |
3030
| file://:0:0:0:0 | operator= | __va_list_tag::operator=(const __va_list_tag &) -> __va_list_tag & | file://:0:0:0:0 | __va_list_tag | <none> |

‎cpp/ql/test/library-tests/templates/CPP-202/template_args.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
| file://:0:0:0:0 | __va_list_tag | <none> |
22
| test.cpp:3:8:3:9 | s1<<expression>> | {...} |
3-
| test.cpp:3:8:3:9 | s1<<unnamed>> | (null) |
3+
| test.cpp:3:8:3:9 | s1<<unnamed>> | (unnamed template parameter constant) |
44
| test.cpp:5:8:5:9 | s2<T> | T |
55
| test.cpp:5:8:5:9 | s2<T> | T |
6-
| test.cpp:7:8:7:9 | s3<T, <unnamed>> | (unnamed) |
6+
| test.cpp:7:8:7:9 | s3<T, <unnamed>> | (unnamed template parameter) |
77
| test.cpp:7:8:7:9 | s3<T, <unnamed>> | T |

‎cpp/ql/test/library-tests/templates/decls/decls.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
| decls.cpp:4:30:4:34 | p#0 |
88
| decls.cpp:4:30:4:34 | p#0 |
99
| decls.cpp:6:17:6:17 | f |
10-
| decls.cpp:8:18:8:18 | (unnamed) |
10+
| decls.cpp:8:18:8:18 | (unnamed template parameter) |
1111
| decls.cpp:8:25:8:25 | g |
1212
| file://:0:0:0:0 | __va_list_tag |
1313
| file://:0:0:0:0 | auto |

‎cpp/ql/test/library-tests/unnamed/elements.expected‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| file://:0:0:0:0 | | Other |
22
| file://:0:0:0:0 | (global namespace) | Other |
3-
| file://:0:0:0:0 | <unnamed> | Other |
3+
| file://:0:0:0:0 | (unnamed global/namespace variable) | Other |
44
| file://:0:0:0:0 | _Complex __float128 | Other |
55
| file://:0:0:0:0 | _Complex double | Other |
66
| file://:0:0:0:0 | _Complex float | Other |
@@ -111,8 +111,8 @@
111111
| test.c:0:0:0:0 | test.c | Other |
112112
| test.c:2:6:2:6 | a | Other |
113113
| test.c:2:6:2:6 | definition of a | Other |
114-
| test.c:2:10:2:18 | <unnamed> | Variable access |
114+
| test.c:2:10:2:18 | (unnamed global/namespace variable) | Variable access |
115115
| test.c:2:10:2:18 | array to pointer conversion | Other |
116116
| test.c:2:10:2:18 | initializer for a | Other |
117-
| test.c:2:17:2:18 | initializer for <unnamed> | Other |
117+
| test.c:2:17:2:18 | initializer for (unnamed global/namespace variable) | Other |
118118
| test.c:2:17:2:18 | {...} | Other |

0 commit comments

Comments
 (0)