Skip to content

Commit 795bf0d

Browse files
author
Matthew Gretton-Dann
committed
Update tests for extractor changes with ctors
1 parent 9296a12 commit 795bf0d

File tree

23 files changed

+672
-557
lines changed

23 files changed

+672
-557
lines changed

‎cpp/ql/test/examples/expressions/PrintAST.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ Conversion4.c:
350350
# 2| ValueCategory = prvalue
351351
# 3| 1: [ReturnStmt] return ...
352352
DestructorCall.cpp:
353+
# 1| [Constructor] void C::C()
354+
# 1| params:
353355
# 3| [Destructor] void C::~C()
354356
# 3| params:
355357
# 3| body: [BlockStmt] { ... }

‎cpp/ql/test/header-variant-tests/deduplication/functions.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
| foo.h:1:13:1:15 | foo | Function | 1 | <none> |
88
| foo.h:1:13:1:15 | foo | MemberFunction | 1 | C |
99
| foo.h:1:13:1:15 | foo | MemberFunction | 1 | C |
10+
| main2.cpp:7:7:7:7 | C | MemberFunction | 0 | C |
11+
| main2.cpp:7:7:7:7 | C | MemberFunction | 0 | C |
1012
| main2.cpp:7:7:7:7 | operator= | MemberFunction | 0 | C |
1113
| main2.cpp:7:7:7:7 | operator= | MemberFunction | 0 | C |
1214
| main2.cpp:7:7:7:7 | operator= | MemberFunction | 0 | C |

‎cpp/ql/test/library-tests/access/canAccessMember/canAccessMember.expected‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,89 +8,143 @@
88
| direct_friend::D::f | Can access D::f |
99
| direct_friend::D::f | Can access D::operator= |
1010
| direct_friend::D::f | Can access D::x |
11+
| field_and_base::P::f | Can access B::B |
1112
| field_and_base::P::f | Can access B::operator= |
13+
| field_and_base::P::f | Can access P::B |
14+
| field_and_base::P::f | Can access P::P |
1215
| field_and_base::P::f | Can access P::f |
1316
| field_and_base::P::f | Can access P::fieldB |
1417
| field_and_base::P::f | Can access P::m |
1518
| field_and_base::P::f | Can access P::m_static |
1619
| field_and_base::P::f | Can access P::operator= |
20+
| friend_class::B::fun | Can access B::B |
1721
| friend_class::B::fun | Can access B::a |
1822
| friend_class::B::fun | Can access B::b |
1923
| friend_class::B::fun | Can access B::fun |
2024
| friend_class::B::fun | Can access B::operator= |
25+
| friend_class::B::fun | Can access C::C |
2126
| friend_class::B::fun | Can access C::operator= |
27+
| friend_class::B::fun | Can access D1::D1 |
2228
| friend_class::B::fun | Can access D1::operator= |
29+
| friend_class::B::fun | Can access D2::D2 |
2330
| friend_class::B::fun | Can access D2::operator= |
31+
| friend_class::C::fun | Can access B::B |
2432
| friend_class::C::fun | Can access B::operator= |
33+
| friend_class::C::fun | Can access C::B |
34+
| friend_class::C::fun | Can access C::C |
2535
| friend_class::C::fun | Can access C::fun |
2636
| friend_class::C::fun | Can access C::operator= |
2737
| friend_class::C::fun | Can access C::x |
2838
| friend_class::C::fun | Can access C::y |
39+
| friend_class::C::fun | Can access D1::D1 |
2940
| friend_class::C::fun | Can access D1::operator= |
41+
| friend_class::C::fun | Can access D2::D2 |
3042
| friend_class::C::fun | Can access D2::operator= |
43+
| friend_class::D1::fun | Can access B::B |
3144
| friend_class::D1::fun | Can access B::a |
3245
| friend_class::D1::fun | Can access B::b |
3346
| friend_class::D1::fun | Can access B::fun |
3447
| friend_class::D1::fun | Can access B::operator= |
48+
| friend_class::D1::fun | Can access C::C |
3549
| friend_class::D1::fun | Can access C::operator= |
50+
| friend_class::D1::fun | Can access D1::C |
51+
| friend_class::D1::fun | Can access D1::D1 |
3652
| friend_class::D1::fun | Can access D1::fun |
3753
| friend_class::D1::fun | Can access D1::operator= |
54+
| friend_class::D1::fun | Can access D2::D2 |
3855
| friend_class::D1::fun | Can access D2::operator= |
56+
| friend_class::D2::fun | Can access B::B |
3957
| friend_class::D2::fun | Can access B::a |
4058
| friend_class::D2::fun | Can access B::b |
4159
| friend_class::D2::fun | Can access B::fun |
4260
| friend_class::D2::fun | Can access B::operator= |
61+
| friend_class::D2::fun | Can access C::C |
4362
| friend_class::D2::fun | Can access C::operator= |
63+
| friend_class::D2::fun | Can access D1::D1 |
4464
| friend_class::D2::fun | Can access D1::operator= |
65+
| friend_class::D2::fun | Can access D2::B |
66+
| friend_class::D2::fun | Can access D2::D2 |
4567
| friend_class::D2::fun | Can access D2::a |
4668
| friend_class::D2::fun | Can access D2::b |
4769
| friend_class::D2::fun | Can access D2::fun |
4870
| friend_class::D2::fun | Can access D2::operator= |
4971
| friend_fun::fun1 | Can access A::operator= |
72+
| friend_fun::fun1 | Can access B::B |
5073
| friend_fun::fun1 | Can access B::operator= |
5174
| friend_fun::fun2 | Can access A::operator= |
75+
| friend_fun::fun2 | Can access B::B |
5276
| friend_fun::fun2 | Can access B::operator= |
5377
| friend_fun::fun2 | Can access B::x |
5478
| friend_fun::fun2 | Can access B::y |
79+
| mixed::B::fun | Can access A::A |
5580
| mixed::B::fun | Can access A::operator= |
81+
| mixed::B::fun | Can access B::A |
82+
| mixed::B::fun | Can access B::B |
5683
| mixed::B::fun | Can access B::fun |
5784
| mixed::B::fun | Can access B::operator= |
85+
| mixed::B::fun | Can access C::C |
5886
| mixed::B::fun | Can access C::operator= |
87+
| mixed::B::fun | Can access D::C |
88+
| mixed::B::fun | Can access D::D |
5989
| mixed::B::fun | Can access D::operator= |
90+
| mixed::C::fun | Can access A::A |
6091
| mixed::C::fun | Can access A::operator= |
92+
| mixed::C::fun | Can access B::B |
6193
| mixed::C::fun | Can access B::operator= |
94+
| mixed::C::fun | Can access C::B |
95+
| mixed::C::fun | Can access C::C |
6296
| mixed::C::fun | Can access C::fun |
6397
| mixed::C::fun | Can access C::operator= |
98+
| mixed::C::fun | Can access D::B |
99+
| mixed::C::fun | Can access D::C |
100+
| mixed::C::fun | Can access D::D |
64101
| mixed::C::fun | Can access D::fun |
65102
| mixed::C::fun | Can access D::operator= |
103+
| mixed::D::fun | Can access A::A |
66104
| mixed::D::fun | Can access A::operator= |
105+
| mixed::D::fun | Can access B::B |
67106
| mixed::D::fun | Can access B::operator= |
107+
| mixed::D::fun | Can access C::B |
108+
| mixed::D::fun | Can access C::C |
68109
| mixed::D::fun | Can access C::operator= |
110+
| mixed::D::fun | Can access D::B |
111+
| mixed::D::fun | Can access D::C |
112+
| mixed::D::fun | Can access D::D |
69113
| mixed::D::fun | Can access D::fun |
70114
| mixed::D::fun | Can access D::operator= |
71115
| protected_derived::BP::f | Can access B::m |
72116
| protected_derived::BP::f | Can access B::operator= |
117+
| protected_derived::BP::f | Can access BN::BN |
73118
| protected_derived::BP::f | Can access BN::operator= |
119+
| protected_derived::BP::f | Can access BP::BP |
74120
| protected_derived::BP::f | Can access BP::f |
75121
| protected_derived::BP::f | Can access BP::m |
76122
| protected_derived::BP::f | Can access BP::operator= |
123+
| protected_derived::BP::f | Can access BPNprot::BPNprot |
77124
| protected_derived::BP::f | Can access BPNprot::operator= |
125+
| protected_derived::BP::f | Can access BPNpub::BP |
126+
| protected_derived::BP::f | Can access BPNpub::BPNpub |
78127
| protected_derived::BP::f | Can access BPNpub::f |
79128
| protected_derived::BP::f | Can access BPNpub::m |
80129
| protected_derived::BP::f | Can access BPNpub::operator= |
130+
| protected_virtual::P::f | Can access B::B |
81131
| protected_virtual::P::f | Can access B::operator= |
82132
| protected_virtual::P::f | Can access Nprot::Nprot |
83133
| protected_virtual::P::f | Can access Nprot::operator= |
134+
| protected_virtual::P::f | Can access Npub::B |
84135
| protected_virtual::P::f | Can access Npub::Npub |
85136
| protected_virtual::P::f | Can access Npub::m |
86137
| protected_virtual::P::f | Can access Npub::operator= |
138+
| protected_virtual::P::f | Can access P::B |
87139
| protected_virtual::P::f | Can access P::P |
88140
| protected_virtual::P::f | Can access P::f |
89141
| protected_virtual::P::f | Can access P::m |
90142
| protected_virtual::P::f | Can access P::operator= |
91143
| simple::Derived::castme | Can access Base::operator= |
144+
| simple::Derived::castme | Can access Derived::Derived |
92145
| simple::Derived::castme | Can access Derived::castme |
93146
| simple::Derived::castme | Can access Derived::operator= |
94147
| simple::top | Can access Base::operator= |
148+
| simple::top | Can access Derived::Derived |
95149
| simple::top | Can access Derived::castme |
96150
| simple::top | Can access Derived::operator= |

‎cpp/ql/test/library-tests/declaration/IsMember.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
| declaration.cpp:32:7:32:7 | operator= |
44
| declaration.cpp:32:7:32:7 | operator= |
55
| declaration.cpp:34:7:34:14 | myField0 |
6+
| declaration.cpp:36:9:36:9 | MyNestedClass |
67
| declaration.cpp:36:9:36:9 | operator= |
78
| declaration.cpp:36:9:36:9 | operator= |
89
| declaration.cpp:36:9:36:21 | MyNestedClass |
@@ -28,6 +29,7 @@
2829
| declaration.cpp:100:7:100:7 | operator= |
2930
| declaration.cpp:100:7:100:7 | operator= |
3031
| declaration.cpp:102:7:102:14 | myField1 |
32+
| declaration.cpp:104:9:104:9 | MyNestedClass |
3133
| declaration.cpp:104:9:104:9 | operator= |
3234
| declaration.cpp:104:9:104:9 | operator= |
3335
| declaration.cpp:104:9:104:21 | MyNestedClass |

‎cpp/ql/test/library-tests/declarationEntry/more/declarationEntry.expected‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
| test.cpp:20:6:20:20 | definition of tmplProtoAndDef |
2828
| test.cpp:20:24:20:24 | declaration of t |
2929
| test.cpp:20:24:20:24 | definition of t |
30+
| test.cpp:22:7:22:7 | declaration of Cl |
3031
| test.cpp:22:7:22:7 | declaration of operator= |
3132
| test.cpp:22:7:22:7 | declaration of operator= |
3233
| test.cpp:22:7:22:8 | definition of Cl |
@@ -75,6 +76,8 @@
7576
| test.cpp:67:7:67:7 | declaration of operator= |
7677
| test.cpp:67:7:67:7 | declaration of operator= |
7778
| test.cpp:67:7:67:7 | declaration of operator= |
79+
| test.cpp:67:7:67:7 | definition of tmplInstantiatedClass |
80+
| test.cpp:67:7:67:7 | definition of tmplInstantiatedClass |
7881
| test.cpp:67:7:67:27 | definition of tmplInstantiatedClass<T> |
7982
| test.cpp:68:7:68:7 | definition of t |
8083
| test.cpp:68:7:68:7 | definition of t |

‎cpp/ql/test/library-tests/fun_decl/test.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
| compile1.cpp:3:6:3:10 | func1 |
2+
| compile2.cpp:3:7:3:7 | classA |
23
| compile2.cpp:3:7:3:7 | operator= |
34
| compile2.cpp:5:2:5:8 | ~classA |
45
| compile2.cpp:8:9:8:19 | create_an_a |

‎cpp/ql/test/library-tests/functions/functions/Functions1.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
| ODASA-5186.cpp:4:8:4:8 | MyClass | MyClass | | declaration:ODASA-5186.cpp:4:8:4:8, definition:ODASA-5186.cpp:4:8:4:8 |
12
| ODASA-5186.cpp:4:8:4:8 | operator= | operator= | MyClass<int> && p#0 | declaration:ODASA-5186.cpp:4:8:4:8 |
23
| ODASA-5186.cpp:4:8:4:8 | operator= | operator= | const MyClass<int> & p#0 | declaration:ODASA-5186.cpp:4:8:4:8 |
34
| ODASA-5186.cpp:5:8:5:8 | operator== | operator== | const MyClass<int> & other | declaration:ODASA-5186.cpp:5:8:5:8, definition:ODASA-5186.cpp:5:8:5:8 |
@@ -13,6 +14,7 @@
1314
| functions.cpp:8:7:8:8 | af | af | | declaration:functions.cpp:8:7:8:8, definition:functions.cpp:8:7:8:8 |
1415
| functions.cpp:11:7:11:8 | ag | ag | | declaration:functions.cpp:11:7:11:8 |
1516
| functions.cpp:14:6:14:6 | g | g | | TopLevelFunction, declaration:functions.cpp:14:6:14:6, declaration:functions.cpp:5:6:5:6, definition:functions.cpp:14:6:14:6, isTopLevel |
17+
| functions.cpp:19:7:19:7 | Name | Name | | declaration:functions.cpp:19:7:19:7 |
1618
| functions.cpp:19:7:19:7 | operator= | operator= | Name && p#0 | declaration:functions.cpp:19:7:19:7 |
1719
| functions.cpp:19:7:19:7 | operator= | operator= | const Name & p#0 | declaration:functions.cpp:19:7:19:7 |
1820
| functions.cpp:23:7:23:7 | Table | Table | const Table & p#0 | declaration:functions.cpp:23:7:23:7 |

‎cpp/ql/test/library-tests/functions/functions/Functions2.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
| ODASA-5186.cpp:4:8:4:14 | MyClass<T> | Class | ODASA-5186.cpp:5:8:5:17 | operator== | |
2+
| ODASA-5186.cpp:4:8:4:14 | MyClass<int> | Struct | ODASA-5186.cpp:4:8:4:8 | MyClass | Constructor, NoArgConstructor, getAConstructor() |
23
| ODASA-5186.cpp:4:8:4:14 | MyClass<int> | Struct | ODASA-5186.cpp:4:8:4:8 | operator= | |
34
| ODASA-5186.cpp:4:8:4:14 | MyClass<int> | Struct | ODASA-5186.cpp:4:8:4:8 | operator= | |
45
| ODASA-5186.cpp:4:8:4:14 | MyClass<int> | Struct | ODASA-5186.cpp:5:8:5:8 | operator== | |
@@ -10,6 +11,7 @@
1011
| functions.cpp:7:8:7:8 | A | Struct | functions.cpp:7:8:7:8 | operator= | |
1112
| functions.cpp:7:8:7:8 | A | Struct | functions.cpp:8:7:8:8 | af | |
1213
| functions.cpp:7:8:7:8 | A | Struct | functions.cpp:11:7:11:8 | ag | |
14+
| functions.cpp:19:7:19:10 | Name | Class | functions.cpp:19:7:19:7 | Name | Constructor, NoArgConstructor, getAConstructor() |
1315
| functions.cpp:19:7:19:10 | Name | Class | functions.cpp:19:7:19:7 | operator= | |
1416
| functions.cpp:19:7:19:10 | Name | Class | functions.cpp:19:7:19:7 | operator= | |
1517
| functions.cpp:23:7:23:11 | Table | Class | functions.cpp:23:7:23:7 | Table | Constructor, CopyConstructor, getAConstructor() |

‎cpp/ql/test/library-tests/identifiers/qualified_names/unnamed.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
| qualifiedNames.cpp:3:25:3:27 | p#0 |
22
| qualifiedNames.cpp:4:25:4:28 | p#0 |
33
| qualifiedNames.cpp:18:18:18:31 | Nested's friend |
4+
| qualifiedNames.cpp:26:9:26:9 | LocalClass |
45
| qualifiedNames.cpp:26:9:26:9 | operator= |
56
| qualifiedNames.cpp:26:9:26:9 | operator= |
67
| qualifiedNames.cpp:26:9:26:18 | LocalClass |

‎cpp/ql/test/library-tests/instantiations/test.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
| file://:0:0:0:0 | operator new |
33
| file://:0:0:0:0 | operator= |
44
| file://:0:0:0:0 | operator= |
5+
| test.cpp:2:7:2:7 | A |
56
| test.cpp:2:7:2:7 | operator= |
67
| test.cpp:2:19:2:20 | ~A |
78
| test.cpp:4:7:4:7 | X |

0 commit comments

Comments
 (0)