Skip to content

Commit ddebdad

Browse files
owen-mcowen-mc
committed
c++: Inline expectation should have space before $
1 parent 6001c73 commit ddebdad

File tree

7 files changed

+111
-111
lines changed

7 files changed

+111
-111
lines changed

‎cpp/ql/test/library-tests/dataflow/fields/simple.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void single_field_test()
6464
A a;
6565
a.i = user_input();
6666
A a2 = a;
67-
sink(a2.i); //$ ast,ir
67+
sink(a2.i); // $ ast,ir
6868
}
6969

7070
struct C {
@@ -81,7 +81,7 @@ struct C2
8181

8282
void m() {
8383
f2.f1 = user_input();
84-
sink(getf2f1()); //$ ast,ir
84+
sink(getf2f1()); // $ ast,ir
8585
}
8686
};
8787

@@ -91,7 +91,7 @@ void single_field_test_typedef(A_typedef a)
9191
{
9292
a.i = user_input();
9393
A_typedef a2 = a;
94-
sink(a2.i); //$ ast,ir
94+
sink(a2.i); // $ ast,ir
9595
}
9696

9797
namespace TestAdditionalCallTargets {
@@ -168,4 +168,4 @@ void test_union_with_two_instantiations_of_different_sizes() {
168168
sink(u_int.y); // $ MISSING: ir
169169
}
170170

171-
} // namespace Simple
171+
} // namespace Simple

‎cpp/ql/test/library-tests/dataflow/fields/struct_init.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ struct Outer {
1212
};
1313

1414
void absink(struct AB *ab) {
15-
sink(ab->a); //$ ast,ir=20:20 ast,ir=27:7 ast,ir=40:20
15+
sink(ab->a); // $ ast,ir=20:20 ast,ir=27:7 ast,ir=40:20
1616
sink(ab->b); // no flow
1717
}
1818

1919
int struct_init(void) {
2020
struct AB ab = { user_input(), 0 };
2121

22-
sink(ab.a); //$ ast,ir
22+
sink(ab.a); // $ ast,ir
2323
sink(ab.b); // no flow
2424
absink(&ab);
2525

@@ -28,9 +28,9 @@ int struct_init(void) {
2828
&ab,
2929
};
3030

31-
sink(outer.nestedAB.a); //$ ast,ir
31+
sink(outer.nestedAB.a); // $ ast,ir
3232
sink(outer.nestedAB.b); // no flow
33-
sink(outer.pointerAB->a); //$ ast,ir
33+
sink(outer.pointerAB->a); // $ ast,ir
3434
sink(outer.pointerAB->b); // no flow
3535

3636
absink(&outer.nestedAB);

‎cpp/ql/test/library-tests/ir/points_to/points_to.cpp‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,64 +24,64 @@ struct DerivedVI : virtual Base1 {
2424
};
2525

2626
void Locals() {
27-
Point pt = { //$ussa=pt
28-
1, //$ussa=pt[0..4)<int>
29-
2 //$ussa=pt[4..8)<int>
27+
Point pt = { // $ ussa=pt
28+
1, // $ ussa=pt[0..4)<int>
29+
2 // $ ussa=pt[4..8)<int>
3030
};
31-
int i = pt.x; //$ussa=pt[0..4)<int>
32-
i = pt.y; //$ussa=pt[4..8)<int>
31+
int i = pt.x; // $ ussa=pt[0..4)<int>
32+
i = pt.y; // $ ussa=pt[4..8)<int>
3333
int* p = &pt.x;
34-
i = *p; //$ussa=pt[0..4)<int>
34+
i = *p; // $ ussa=pt[0..4)<int>
3535
p = &pt.y;
36-
i = *p; //$ussa=pt[4..8)<int>
36+
i = *p; // $ ussa=pt[4..8)<int>
3737
}
3838

3939
void PointsTo(
40-
int a, //$raw=a
41-
Point& b, //$raw=b ussa=*b
42-
Point* c, //$raw=c ussa=*c
43-
int* d, //$raw=d ussa=*d
44-
DerivedSI* e, //$raw=e ussa=*e
45-
DerivedMI* f, //$raw=f ussa=*f
46-
DerivedVI* g //$raw=g ussa=*g
40+
int a, // $ raw=a
41+
Point& b, // $ raw=b ussa=*b
42+
Point* c, // $ raw=c ussa=*c
43+
int* d, // $ raw=d ussa=*d
44+
DerivedSI* e, // $ raw=e ussa=*e
45+
DerivedMI* f, // $ raw=f ussa=*f
46+
DerivedVI* g // $ raw=g ussa=*g
4747
) {
4848

49-
int i = a; //$raw=a
50-
i = *&a; //$raw=a
51-
i = *(&a + 0); //$raw=a
52-
i = b.x; //$raw=b ussa=*b[0..4)<int>
53-
i = b.y; //$raw=b ussa=*b[4..8)<int>
54-
i = c->x; //$raw=c ussa=*c[0..4)<int>
55-
i = c->y; //$raw=c ussa=*c[4..8)<int>
56-
i = *d; //$raw=d ussa=*d[0..4)<int>
57-
i = *(d + 0); //$raw=d ussa=*d[0..4)<int>
58-
i = d[5]; //$raw=d ussa=*d[20..24)<int>
59-
i = 5[d]; //$raw=d ussa=*d[20..24)<int>
60-
i = d[a]; //$raw=d raw=a ussa=*d[?..?)<int>
61-
i = a[d]; //$raw=d raw=a ussa=*d[?..?)<int>
49+
int i = a; // $ raw=a
50+
i = *&a; // $ raw=a
51+
i = *(&a + 0); // $ raw=a
52+
i = b.x; // $ raw=b ussa=*b[0..4)<int>
53+
i = b.y; // $ raw=b ussa=*b[4..8)<int>
54+
i = c->x; // $ raw=c ussa=*c[0..4)<int>
55+
i = c->y; // $ raw=c ussa=*c[4..8)<int>
56+
i = *d; // $ raw=d ussa=*d[0..4)<int>
57+
i = *(d + 0); // $ raw=d ussa=*d[0..4)<int>
58+
i = d[5]; // $ raw=d ussa=*d[20..24)<int>
59+
i = 5[d]; // $ raw=d ussa=*d[20..24)<int>
60+
i = d[a]; // $ raw=d raw=a ussa=*d[?..?)<int>
61+
i = a[d]; // $ raw=d raw=a ussa=*d[?..?)<int>
6262

63-
int* p = &b.x; //$raw=b
64-
i = *p; //$ussa=*b[0..4)<int>
65-
p = &b.y; //$raw=b
66-
i = *p; //$ussa=*b[4..8)<int>
67-
p = &c->x; //$raw=c
68-
i = *p; //$ussa=*c[0..4)<int>
69-
p = &c->y; //$raw=c
70-
i = *p; //$ussa=*c[4..8)<int>
71-
p = &d[5]; //$raw=d
72-
i = *p; //$ussa=*d[20..24)<int>
73-
p = &d[a]; //$raw=d raw=a
74-
i = *p; //$ussa=*d[?..?)<int>
63+
int* p = &b.x; // $ raw=b
64+
i = *p; // $ ussa=*b[0..4)<int>
65+
p = &b.y; // $ raw=b
66+
i = *p; // $ ussa=*b[4..8)<int>
67+
p = &c->x; // $ raw=c
68+
i = *p; // $ ussa=*c[0..4)<int>
69+
p = &c->y; // $ raw=c
70+
i = *p; // $ ussa=*c[4..8)<int>
71+
p = &d[5]; // $ raw=d
72+
i = *p; // $ ussa=*d[20..24)<int>
73+
p = &d[a]; // $ raw=d raw=a
74+
i = *p; // $ ussa=*d[?..?)<int>
7575

76-
Point* q = &c[a]; //$raw=c raw=a
77-
i = q->x; //$ussa=*c[?..?)<int>
78-
i = q->y; //$ussa=*c[?..?)<int>
76+
Point* q = &c[a]; // $ raw=c raw=a
77+
i = q->x; // $ ussa=*c[?..?)<int>
78+
i = q->y; // $ ussa=*c[?..?)<int>
7979

80-
i = e->b1; //$raw=e ussa=*e[0..4)<int>
81-
i = e->dsi; //$raw=e ussa=*e[4..8)<int>
82-
i = f->b1; //$raw=f ussa=*f[0..4)<int>
83-
i = f->b2; //$raw=f ussa=*f[4..8)<int>
84-
i = f->dmi; //$raw=f ussa=*f[8..12)<int>
85-
i = g->b1; //$raw=g ussa=*g[?..?)<int>
86-
i = g->dvi; //$raw=g ussa=*g[8..12)<int>
87-
}
80+
i = e->b1; // $ raw=e ussa=*e[0..4)<int>
81+
i = e->dsi; // $ raw=e ussa=*e[4..8)<int>
82+
i = f->b1; // $ raw=f ussa=*f[0..4)<int>
83+
i = f->b2; // $ raw=f ussa=*f[4..8)<int>
84+
i = f->dmi; // $ raw=f ussa=*f[8..12)<int>
85+
i = g->b1; // $ raw=g ussa=*g[?..?)<int>
86+
i = g->dvi; // $ raw=g ussa=*g[8..12)<int>
87+
}

‎cpp/ql/test/library-tests/ir/points_to/smart_pointer.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@ struct S {
1010

1111
void unique_ptr_init(S s) {
1212
unique_ptr<S> p(new S); // MISSING: $ussa=dynamic{1}
13-
int i = (*p).x; //$ MISSING: ussa=dynamic{1}[0..4)<int>
14-
*p = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
13+
int i = (*p).x; // $ MISSING: ussa=dynamic{1}[0..4)<int>
14+
*p = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
1515
unique_ptr<S> q = std::move(p);
16-
*(q.get()) = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
16+
*(q.get()) = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
1717
shared_ptr<S> t(std::move(q));
18-
t->x = 5; //$ MISSING: ussa=dynamic{1}[0..4)<int>
19-
*t = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
20-
*(t.get()) = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
18+
t->x = 5; // $ MISSING: ussa=dynamic{1}[0..4)<int>
19+
*t = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
20+
*(t.get()) = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
2121
}
2222

2323
void shared_ptr_init(S s) {
24-
shared_ptr<S> p(new S); //$ MISSING: ussa=dynamic{1}
25-
int i = (*p).x; //$ MISSING: ussa=dynamic{1}[0..4)<int>
26-
*p = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
24+
shared_ptr<S> p(new S); // $ MISSING: ussa=dynamic{1}
25+
int i = (*p).x; // $ MISSING: ussa=dynamic{1}[0..4)<int>
26+
*p = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
2727
shared_ptr<S> q = std::move(p);
28-
*(q.get()) = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
28+
*(q.get()) = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
2929
shared_ptr<S> t(q);
30-
t->x = 5; //$ MISSING: ussa=dynamic{1}[0..4)<int>
31-
*t = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
32-
*(t.get()) = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
30+
t->x = 5; // $ MISSING: ussa=dynamic{1}[0..4)<int>
31+
*t = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
32+
*(t.get()) = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
3333
}

‎cpp/ql/test/library-tests/ir/types/complex.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
void Complex(void) {
2-
_Complex float cf; //$irtype=cfloat8
3-
_Complex double cd; //$irtype=cfloat16
4-
_Complex long double cld; //$irtype=cfloat32
2+
_Complex float cf; // $ irtype=cfloat8
3+
_Complex double cd; // $ irtype=cfloat16
4+
_Complex long double cld; // $ irtype=cfloat32
55
// _Complex __float128 cf128;
66
}
77

88
void Imaginary(void) {
9-
_Imaginary float jf; //$irtype=ifloat4
10-
_Imaginary double jd; //$irtype=ifloat8
11-
_Imaginary long double jld; //$irtype=ifloat16
9+
_Imaginary float jf; // $ irtype=ifloat4
10+
_Imaginary double jd; // $ irtype=ifloat8
11+
_Imaginary long double jld; // $ irtype=ifloat16
1212
// _Imaginary __float128 jf128;
1313
}
1414

‎cpp/ql/test/library-tests/ir/types/irtypes.cpp‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,44 +22,44 @@ enum class ScopedE {
2222
};
2323

2424
void IRTypes() {
25-
char c; //$irtype=int1
26-
signed char sc; //$irtype=int1
27-
unsigned char uc; //$irtype=uint1
28-
short s; //$irtype=int2
29-
signed short ss; //$irtype=int2
30-
unsigned short us; //$irtype=uint2
31-
int i; //$irtype=int4
32-
signed int si; //$irtype=int4
33-
unsigned int ui; //$irtype=uint4
34-
long l; //$irtype=int8
35-
signed long sl; //$irtype=int8
36-
unsigned long ul; //$irtype=uint8
37-
long long ll; //$irtype=int8
38-
signed long long sll; //$irtype=int8
39-
unsigned long long ull; //$irtype=uint8
40-
bool b; //$irtype=bool1
41-
float f; //$irtype=float4
42-
double d; //$irtype=float8
43-
long double ld; //$irtype=float16
44-
__float128 f128; //$irtype=float16
25+
char c; // $ irtype=int1
26+
signed char sc; // $ irtype=int1
27+
unsigned char uc; // $ irtype=uint1
28+
short s; // $ irtype=int2
29+
signed short ss; // $ irtype=int2
30+
unsigned short us; // $ irtype=uint2
31+
int i; // $ irtype=int4
32+
signed int si; // $ irtype=int4
33+
unsigned int ui; // $ irtype=uint4
34+
long l; // $ irtype=int8
35+
signed long sl; // $ irtype=int8
36+
unsigned long ul; // $ irtype=uint8
37+
long long ll; // $ irtype=int8
38+
signed long long sll; // $ irtype=int8
39+
unsigned long long ull; // $ irtype=uint8
40+
bool b; // $ irtype=bool1
41+
float f; // $ irtype=float4
42+
double d; // $ irtype=float8
43+
long double ld; // $ irtype=float16
44+
__float128 f128; // $ irtype=float16
4545

46-
wchar_t wc; //$irtype=uint4
47-
// char8_t c8; //$irtype=uint1
48-
char16_t c16; //$irtype=uint2
49-
char32_t c32; //$irtype=uint4
46+
wchar_t wc; // $ irtype=uint4
47+
// char8_t c8; // $ irtype=uint1
48+
char16_t c16; // $ irtype=uint2
49+
char32_t c32; // $ irtype=uint4
5050

51-
int* pi; //$irtype=addr8
52-
int& ri = i; //$irtype=addr8
53-
void (*pfn)() = nullptr; //$irtype=func8
54-
void (&rfn)() = IRTypes; //$irtype=func8
51+
int* pi; // $ irtype=addr8
52+
int& ri = i; // $ irtype=addr8
53+
void (*pfn)() = nullptr; // $ irtype=func8
54+
void (&rfn)() = IRTypes; // $ irtype=func8
5555

56-
A s_a; //$irtype=opaque4{A}
57-
B s_b; //$irtype=opaque16{B}
56+
A s_a; // $ irtype=opaque4{A}
57+
B s_b; // $ irtype=opaque16{B}
5858

59-
E e; //$irtype=uint4
60-
ScopedE se; //$irtype=uint4
59+
E e; // $ irtype=uint4
60+
ScopedE se; // $ irtype=uint4
6161

62-
B a_b[10]; //$irtype=opaque160{B[10]}
62+
B a_b[10]; // $ irtype=opaque160{B[10]}
6363
}
6464

6565
// semmle-extractor-options: -std=c++17 --clang

‎cpp/ql/test/query-tests/Likely Bugs/Leap Year/UncheckedLeapYearAfterYearModification/test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ void indirect_time_conversion_check(WORD year, WORD offset){
13381338
void set_time(WORD year, WORD month, WORD day){
13391339
SYSTEMTIME tmp;
13401340

1341-
tmp.wYear = year; //$ Alert[cpp/leap-year/unchecked-after-arithmetic-year-modification]
1341+
tmp.wYear = year; // $ Alert[cpp/leap-year/unchecked-after-arithmetic-year-modification]
13421342
tmp.wMonth = month;
13431343
tmp.wDay = day;
13441344
}

0 commit comments

Comments
 (0)