Skip to content

Commit 3bb5505

Browse files
redsun82redsun82
committed
Swift: expand and fix VarDecl tests
1 parent 41977d1 commit 3bb5505

19 files changed

+218
-0
lines changed

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,18 @@
55
| var_decls.swift:20:7:20:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | getIntroducerInt: | 1 |
66
| var_decls.swift:24:15:24:15 | _wrapped | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | X<Y> | getName: | _wrapped | getType: | X<Y> | getIntroducerInt: | 1 |
77
| var_decls.swift:24:15:24:15 | wrapped | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | wrapped | getType: | Int | getIntroducerInt: | 1 |
8+
| var_decls.swift:28:7:28:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | getIntroducerInt: | 1 |
9+
| var_decls.swift:34:7:34:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | getIntroducerInt: | 1 |
10+
| var_decls.swift:35:7:35:7 | projectedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Bool | getName: | projectedValue | getType: | Bool | getIntroducerInt: | 1 |
11+
| var_decls.swift:39:7:39:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | getIntroducerInt: | 1 |
12+
| var_decls.swift:40:7:40:7 | projectedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Bool | getName: | projectedValue | getType: | Bool | getIntroducerInt: | 1 |
13+
| var_decls.swift:54:10:54:10 | _w1 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | X<Int> | getName: | _w1 | getType: | X<Int> | getIntroducerInt: | 1 |
14+
| var_decls.swift:54:10:54:10 | w1 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | w1 | getType: | Int | getIntroducerInt: | 1 |
15+
| var_decls.swift:55:24:55:24 | _w2 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | WrapperWithInit | getName: | _w2 | getType: | WrapperWithInit | getIntroducerInt: | 1 |
16+
| var_decls.swift:55:24:55:24 | w2 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | w2 | getType: | Int | getIntroducerInt: | 1 |
17+
| var_decls.swift:56:29:56:29 | $w3 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Bool | getName: | $w3 | getType: | Bool | getIntroducerInt: | 1 |
18+
| var_decls.swift:56:29:56:29 | _w3 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | WrapperWithProjected | getName: | _w3 | getType: | WrapperWithProjected | getIntroducerInt: | 1 |
19+
| var_decls.swift:56:29:56:29 | w3 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | w3 | getType: | Int | getIntroducerInt: | 1 |
20+
| var_decls.swift:57:36:57:36 | $w4 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Bool | getName: | $w4 | getType: | Bool | getIntroducerInt: | 1 |
21+
| var_decls.swift:57:36:57:36 | _w4 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | WrapperWithProjectedAndInit | getName: | _w4 | getType: | WrapperWithProjectedAndInit | getIntroducerInt: | 1 |
22+
| var_decls.swift:57:36:57:36 | w4 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | w4 | getType: | Int | getIntroducerInt: | 1 |

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getAccessorDecl.expected

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,30 @@
1111
| var_decls.swift:24:15:24:15 | wrapped | 0 | var_decls.swift:24:15:24:15 | get |
1212
| var_decls.swift:24:15:24:15 | wrapped | 1 | var_decls.swift:24:15:24:15 | set |
1313
| var_decls.swift:24:15:24:15 | wrapped | 2 | var_decls.swift:24:15:24:15 | (unnamed function decl) |
14+
| var_decls.swift:28:7:28:7 | wrappedValue | 0 | var_decls.swift:28:7:28:7 | get |
15+
| var_decls.swift:28:7:28:7 | wrappedValue | 1 | var_decls.swift:28:7:28:7 | set |
16+
| var_decls.swift:28:7:28:7 | wrappedValue | 2 | var_decls.swift:28:7:28:7 | (unnamed function decl) |
17+
| var_decls.swift:34:7:34:7 | wrappedValue | 0 | var_decls.swift:34:7:34:7 | get |
18+
| var_decls.swift:34:7:34:7 | wrappedValue | 1 | var_decls.swift:34:7:34:7 | set |
19+
| var_decls.swift:34:7:34:7 | wrappedValue | 2 | var_decls.swift:34:7:34:7 | (unnamed function decl) |
20+
| var_decls.swift:35:7:35:7 | projectedValue | 0 | var_decls.swift:35:7:35:7 | get |
21+
| var_decls.swift:35:7:35:7 | projectedValue | 1 | var_decls.swift:35:7:35:7 | set |
22+
| var_decls.swift:35:7:35:7 | projectedValue | 2 | var_decls.swift:35:7:35:7 | (unnamed function decl) |
23+
| var_decls.swift:39:7:39:7 | wrappedValue | 0 | var_decls.swift:39:7:39:7 | get |
24+
| var_decls.swift:39:7:39:7 | wrappedValue | 1 | var_decls.swift:39:7:39:7 | set |
25+
| var_decls.swift:39:7:39:7 | wrappedValue | 2 | var_decls.swift:39:7:39:7 | (unnamed function decl) |
26+
| var_decls.swift:40:7:40:7 | projectedValue | 0 | var_decls.swift:40:7:40:7 | get |
27+
| var_decls.swift:40:7:40:7 | projectedValue | 1 | var_decls.swift:40:7:40:7 | set |
28+
| var_decls.swift:40:7:40:7 | projectedValue | 2 | var_decls.swift:40:7:40:7 | (unnamed function decl) |
29+
| var_decls.swift:54:10:54:10 | w1 | 0 | var_decls.swift:54:10:54:10 | get |
30+
| var_decls.swift:54:10:54:10 | w1 | 1 | var_decls.swift:54:10:54:10 | set |
31+
| var_decls.swift:55:24:55:24 | w2 | 0 | var_decls.swift:55:24:55:24 | get |
32+
| var_decls.swift:55:24:55:24 | w2 | 1 | var_decls.swift:55:24:55:24 | set |
33+
| var_decls.swift:56:29:56:29 | $w3 | 0 | var_decls.swift:56:29:56:29 | get |
34+
| var_decls.swift:56:29:56:29 | $w3 | 1 | var_decls.swift:56:29:56:29 | set |
35+
| var_decls.swift:56:29:56:29 | w3 | 0 | var_decls.swift:56:29:56:29 | get |
36+
| var_decls.swift:56:29:56:29 | w3 | 1 | var_decls.swift:56:29:56:29 | set |
37+
| var_decls.swift:57:36:57:36 | $w4 | 0 | var_decls.swift:57:36:57:36 | get |
38+
| var_decls.swift:57:36:57:36 | $w4 | 1 | var_decls.swift:57:36:57:36 | set |
39+
| var_decls.swift:57:36:57:36 | w4 | 0 | var_decls.swift:57:36:57:36 | get |
40+
| var_decls.swift:57:36:57:36 | w4 | 1 | var_decls.swift:57:36:57:36 | set |

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getAttachedPropertyWrapperType.expected

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
| var_decls.swift:24:15:24:15 | wrapped | X<Y> |
2+
| var_decls.swift:54:10:54:10 | w1 | X<Int> |
3+
| var_decls.swift:55:24:55:24 | w2 | WrapperWithInit |
4+
| var_decls.swift:56:29:56:29 | w3 | WrapperWithProjected |
5+
| var_decls.swift:57:36:57:36 | w4 | WrapperWithProjectedAndInit |

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentInitializer.expected

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
| var_decls.swift:4:7:4:7 | i | var_decls.swift:4:11:4:11 | 0 |
22
| var_decls.swift:7:5:7:5 | numbers | var_decls.swift:7:15:7:18 | [...] |
33
| var_decls.swift:10:12:10:12 | numbers | var_decls.swift:10:22:10:35 | [...] |
4+
| var_decls.swift:34:7:34:7 | wrappedValue | var_decls.swift:34:28:34:28 | 42 |
5+
| var_decls.swift:35:7:35:7 | projectedValue | var_decls.swift:35:31:35:31 | false |
6+
| var_decls.swift:54:10:54:10 | _w1 | var_decls.swift:54:4:54:15 | call to init(wrappedValue:) |
7+
| var_decls.swift:54:10:54:10 | w1 | var_decls.swift:54:4:54:15 | call to init(wrappedValue:) |
8+
| var_decls.swift:55:24:55:24 | _w2 | var_decls.swift:55:4:55:29 | call to init(wrappedValue:) |
9+
| var_decls.swift:55:24:55:24 | w2 | var_decls.swift:55:4:55:29 | call to init(wrappedValue:) |
10+
| var_decls.swift:56:29:56:29 | _w3 | var_decls.swift:56:4:56:34 | call to init(wrappedValue:projectedValue:) |
11+
| var_decls.swift:56:29:56:29 | w3 | var_decls.swift:56:4:56:34 | call to init(wrappedValue:projectedValue:) |
12+
| var_decls.swift:57:36:57:36 | _w4 | var_decls.swift:57:4:57:41 | call to init(wrappedValue:) |
13+
| var_decls.swift:57:36:57:36 | w4 | var_decls.swift:57:4:57:41 | call to init(wrappedValue:) |

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentPattern.expected

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,18 @@
55
| var_decls.swift:20:7:20:7 | wrappedValue | var_decls.swift:20:7:20:21 | ... as ... |
66
| var_decls.swift:24:15:24:15 | _wrapped | var_decls.swift:24:15:24:15 | ... as ... |
77
| var_decls.swift:24:15:24:15 | wrapped | var_decls.swift:24:15:24:25 | ... as ... |
8+
| var_decls.swift:28:7:28:7 | wrappedValue | var_decls.swift:28:7:28:22 | ... as ... |
9+
| var_decls.swift:34:7:34:7 | wrappedValue | var_decls.swift:34:7:34:22 | ... as ... |
10+
| var_decls.swift:35:7:35:7 | projectedValue | var_decls.swift:35:7:35:24 | ... as ... |
11+
| var_decls.swift:39:7:39:7 | wrappedValue | var_decls.swift:39:7:39:22 | ... as ... |
12+
| var_decls.swift:40:7:40:7 | projectedValue | var_decls.swift:40:7:40:24 | ... as ... |
13+
| var_decls.swift:54:10:54:10 | _w1 | var_decls.swift:54:10:54:10 | ... as ... |
14+
| var_decls.swift:54:10:54:10 | w1 | var_decls.swift:54:10:54:10 | w1 |
15+
| var_decls.swift:55:24:55:24 | _w2 | var_decls.swift:55:24:55:24 | ... as ... |
16+
| var_decls.swift:55:24:55:24 | w2 | var_decls.swift:55:24:55:24 | w2 |
17+
| var_decls.swift:56:29:56:29 | $w3 | var_decls.swift:56:29:56:29 | ... as ... |
18+
| var_decls.swift:56:29:56:29 | _w3 | var_decls.swift:56:29:56:29 | ... as ... |
19+
| var_decls.swift:56:29:56:29 | w3 | var_decls.swift:56:29:56:29 | w3 |
20+
| var_decls.swift:57:36:57:36 | $w4 | var_decls.swift:57:36:57:36 | ... as ... |
21+
| var_decls.swift:57:36:57:36 | _w4 | var_decls.swift:57:36:57:36 | ... as ... |
22+
| var_decls.swift:57:36:57:36 | w4 | var_decls.swift:57:36:57:36 | w4 |

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getPropertyWrapperBackingVar.expected

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
| var_decls.swift:24:15:24:15 | wrapped | var_decls.swift:24:15:24:15 | _wrapped |
2+
| var_decls.swift:54:10:54:10 | w1 | var_decls.swift:54:10:54:10 | _w1 |
3+
| var_decls.swift:55:24:55:24 | w2 | var_decls.swift:55:24:55:24 | _w2 |
4+
| var_decls.swift:56:29:56:29 | w3 | var_decls.swift:56:29:56:29 | _w3 |
5+
| var_decls.swift:57:36:57:36 | w4 | var_decls.swift:57:36:57:36 | _w4 |

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getPropertyWrapperBackingVarBinding.expected

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
| var_decls.swift:24:15:24:15 | wrapped | file://:0:0:0:0 | var ... = ... |
2+
| var_decls.swift:54:10:54:10 | w1 | file://:0:0:0:0 | var ... = ... |
3+
| var_decls.swift:55:24:55:24 | w2 | file://:0:0:0:0 | var ... = ... |
4+
| var_decls.swift:56:29:56:29 | w3 | file://:0:0:0:0 | var ... = ... |
5+
| var_decls.swift:57:36:57:36 | w4 | file://:0:0:0:0 | var ... = ... |

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getPropertyWrapperProjectionVar.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
| var_decls.swift:56:29:56:29 | w3 | var_decls.swift:56:29:56:29 | $w3 |
2+
| var_decls.swift:57:36:57:36 | w4 | var_decls.swift:57:36:57:36 | $w4 |

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getPropertyWrapperProjectionVarBinding.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
| var_decls.swift:56:29:56:29 | w3 | file://:0:0:0:0 | var ... = ... |
2+
| var_decls.swift:57:36:57:36 | w4 | file://:0:0:0:0 | var ... = ... |

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/var_decls.swift

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,36 @@ struct Y {
2323
struct Wrapped {
2424
@X @Y var wrapped : Int
2525
}
26+
27+
@propertyWrapper struct WrapperWithInit {
28+
var wrappedValue : Int
29+
30+
init(wrappedValue: Int) { self.wrappedValue = wrappedValue }
31+
}
32+
33+
@propertyWrapper struct WrapperWithProjected {
34+
var wrappedValue : Int = 42
35+
var projectedValue : Bool = false
36+
}
37+
38+
@propertyWrapper struct WrapperWithProjectedAndInit {
39+
var wrappedValue : Int
40+
var projectedValue : Bool
41+
42+
init(wrappedValue: Int) {
43+
self.wrappedValue = wrappedValue
44+
self.projectedValue = false
45+
}
46+
47+
init(projectedValue: Bool) {
48+
self.wrappedValue = 0
49+
self.projectedValue = projectedValue
50+
}
51+
}
52+
53+
func f3() {
54+
@X var w1 = 1
55+
@WrapperWithInit var w2 = 2
56+
@WrapperWithProjected var w3 = 3
57+
@WrapperWithProjectedAndInit var w4 = 4
58+
}

0 commit comments

Comments
 (0)