Skip to content

Commit 9175354

Browse files
committed
Swift: Add test and accept changes.
1 parent 52f0b0d commit 9175354

File tree

3 files changed

+35
-0
lines changed

3 files changed

+35
-0
lines changed

swift/ql/test/extractor-tests/expressions/all.expected

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
| expressions.swift:54:1:54:1 | _ |
126126
| expressions.swift:54:1:54:8 | ... = ... |
127127
| expressions.swift:54:5:54:8 | #keyPath(...) |
128+
| expressions.swift:54:6:54:8 | TBD (UnresolvedDotExpr) |
128129
| expressions.swift:58:16:58:16 | 1234 |
129130
| expressions.swift:59:1:59:1 | unsafeFunction |
130131
| expressions.swift:59:1:59:34 | call to unsafeFunction |
@@ -232,3 +233,15 @@
232233
| expressions.swift:138:10:138:17 | ...[...] |
233234
| expressions.swift:138:13:138:13 | 3 |
234235
| expressions.swift:138:16:138:16 | 4 |
236+
| expressions.swift:152:26:152:26 | a |
237+
| expressions.swift:152:26:152:47 | \\...[...] |
238+
| expressions.swift:152:37:152:37 | keyPathInt |
239+
| expressions.swift:153:24:153:24 | a |
240+
| expressions.swift:153:24:153:43 | \\...[...] |
241+
| expressions.swift:153:35:153:35 | keyPathB |
242+
| expressions.swift:154:22:154:22 | a |
243+
| expressions.swift:154:22:154:41 | \\...[...] |
244+
| expressions.swift:154:22:154:56 | \\...[...] |
245+
| expressions.swift:154:33:154:33 | keyPathB |
246+
| expressions.swift:154:52:154:55 | #keyPath(...) |
247+
| expressions.swift:154:53:154:55 | TBD (UnresolvedDotExpr) |

swift/ql/test/extractor-tests/expressions/expressions.swift

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,20 @@ func testProperties(hp : inout HasProperty) -> Int {
136136
var w = hp.normalField
137137
hp[1] = 2
138138
return hp[3, 4]
139+
}
140+
141+
struct B {
142+
var x : Int
143+
}
144+
145+
struct A {
146+
var b : B
147+
var bs : [B]
148+
var mayB : B?
149+
}
150+
151+
func test(a : A, keyPathInt : WritableKeyPath<A, Int>, keyPathB : WritableKeyPath<A, B>) {
152+
var apply_keyPathInt = a[keyPath: keyPathInt]
153+
var apply_keyPathB = a[keyPath: keyPathB]
154+
var nested_apply = a[keyPath: keyPathB][keyPath: \B.x]
139155
}

swift/ql/test/extractor-tests/expressions/semantics.expected

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,9 @@
6868
| expressions.swift:137:3:137:7 | ...[...] | OrdinarySemantics |
6969
| expressions.swift:138:10:138:10 | hp | OrdinarySemantics |
7070
| expressions.swift:138:10:138:17 | ...[...] | OrdinarySemantics |
71+
| expressions.swift:152:26:152:26 | a | OrdinarySemantics |
72+
| expressions.swift:152:37:152:37 | keyPathInt | OrdinarySemantics |
73+
| expressions.swift:153:24:153:24 | a | OrdinarySemantics |
74+
| expressions.swift:153:35:153:35 | keyPathB | OrdinarySemantics |
75+
| expressions.swift:154:22:154:22 | a | OrdinarySemantics |
76+
| expressions.swift:154:33:154:33 | keyPathB | OrdinarySemantics |

0 commit comments

Comments
 (0)