Skip to content

Commit 17111c9

Browse files
redsun82AlexDenisov
authored andcommitted
Swift: accept test expectation changes
1 parent 93b9115 commit 17111c9

File tree

7 files changed

+33
-39
lines changed

7 files changed

+33
-39
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| functions.swift:5:1:7:1 | bar(_:d:) | 0 | functions.swift:5:10:5:15 | x |
22
| functions.swift:5:1:7:1 | bar(_:d:) | 1 | functions.swift:5:20:5:25 | y |
33
| functions.swift:10:5:10:28 | noBody(x:) | 0 | functions.swift:10:17:10:20 | x |
4-
| functions.swift:13:1:15:1 | variadic(_:) | 0 | functions.swift:13:15:13:23 | ints |
4+
| functions.swift:13:1:15:1 | variadic(_:) | 0 | functions.swift:13:15:13:26 | ints |
55
| functions.swift:17:1:19:1 | generic(x:y:) | 0 | functions.swift:17:20:17:23 | x |
66
| functions.swift:17:1:19:1 | generic(x:y:) | 1 | functions.swift:17:26:17:29 | y |
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
doubleIndexes
2-
| method_lookups.swift:44:13:44:13 | [AutoClosureExpr] { ... } | 2 | getParam(0) | 4 | getParam(1) | file://:0:0:0:0 | [ParamDecl] argument |
3-
| method_lookups.swift:44:13:44:13 | [AutoClosureExpr] { ... } | 4 | getParam(1) | 2 | getParam(0) | file://:0:0:0:0 | [ParamDecl] argument |
2+
| method_lookups.swift:44:11:44:13 | [AutoClosureExpr] { ... } | 2 | getParam(0) | 4 | getParam(1) | file://:0:0:0:0 | [ParamDecl] argument |
3+
| method_lookups.swift:44:11:44:13 | [AutoClosureExpr] { ... } | 4 | getParam(1) | 2 | getParam(0) | file://:0:0:0:0 | [ParamDecl] argument |

swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,21 @@
99
| method_lookups.swift:33:3:33:5 | .bar() | hasType: | yes | getBase: | method_lookups.swift:33:3:33:3 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:33:5:33:5 | bar() |
1010
| method_lookups.swift:34:3:34:3 | X.init() | hasType: | yes | getBase: | method_lookups.swift:34:3:34:3 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:34:3:34:3 | X.init() |
1111
| method_lookups.swift:34:3:34:7 | .baz(_:) | hasType: | yes | getBase: | method_lookups.swift:34:3:34:5 | call to X.init() | hasMember: | yes | getMethodRef: | method_lookups.swift:34:7:34:7 | baz(_:) |
12-
| method_lookups.swift:36:11:36:13 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:36:11:36:11 | X.Type | hasMember: | no | getMethodRef: | method_lookups.swift:36:13:36:13 | { ... } |
13-
| method_lookups.swift:36:13:36:13 | .bar() | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:36:13:36:13 | bar() |
12+
| method_lookups.swift:36:11:36:13 | .bar() | hasType: | yes | getBase: | method_lookups.swift:36:11:36:11 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:36:13:36:13 | bar() |
1413
| method_lookups.swift:37:11:37:11 | X.init() | hasType: | yes | getBase: | method_lookups.swift:37:11:37:11 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:37:11:37:11 | X.init() |
1514
| method_lookups.swift:37:11:37:15 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:37:11:37:13 | call to X.init() | hasMember: | no | getMethodRef: | method_lookups.swift:37:15:37:15 | { ... } |
1615
| method_lookups.swift:37:15:37:15 | .baz(_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:37:15:37:15 | baz(_:) |
1716
| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) | hasType: | yes | getBase: | method_lookups.swift:40:1:40:1 | Task<(), Never>.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) |
1817
| method_lookups.swift:41:3:41:5 | .foo(_:_:) | hasType: | yes | getBase: | method_lookups.swift:41:3:41:3 | Y.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:41:5:41:5 | foo(_:_:) |
1918
| method_lookups.swift:42:9:42:9 | Y.init() | hasType: | yes | getBase: | method_lookups.swift:42:9:42:9 | Y.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:42:9:42:9 | Y.init() |
2019
| method_lookups.swift:42:9:42:13 | .baz(_:) | hasType: | yes | getBase: | method_lookups.swift:42:9:42:11 | call to Y.init() | hasMember: | yes | getMethodRef: | method_lookups.swift:42:13:42:13 | baz(_:) |
21-
| method_lookups.swift:44:11:44:13 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:44:11:44:11 | Y.Type | hasMember: | no | getMethodRef: | method_lookups.swift:44:13:44:13 | { ... } |
22-
| method_lookups.swift:44:13:44:13 | .foo(_:_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:44:13:44:13 | foo(_:_:) |
20+
| method_lookups.swift:44:11:44:13 | .foo(_:_:) | hasType: | yes | getBase: | method_lookups.swift:44:11:44:11 | Y.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:44:13:44:13 | foo(_:_:) |
2321
| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | hasType: | yes | getBase: | method_lookups.swift:47:1:47:1 | Task<(), Never>.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) |
2422
| method_lookups.swift:48:9:48:11 | .foo(_:_:) | hasType: | yes | getBase: | method_lookups.swift:48:9:48:9 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:48:11:48:11 | foo(_:_:) |
2523
| method_lookups.swift:49:9:49:11 | .bar() | hasType: | yes | getBase: | method_lookups.swift:49:9:49:9 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:49:11:49:11 | bar() |
2624
| method_lookups.swift:50:9:50:9 | Z.init() | hasType: | yes | getBase: | method_lookups.swift:50:9:50:9 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:50:9:50:9 | Z.init() |
2725
| method_lookups.swift:50:9:50:13 | .baz(_:) | hasType: | yes | getBase: | method_lookups.swift:50:9:50:11 | call to Z.init() | hasMember: | yes | getMethodRef: | method_lookups.swift:50:13:50:13 | baz(_:) |
28-
| method_lookups.swift:52:11:52:13 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:52:11:52:11 | Z.Type | hasMember: | no | getMethodRef: | method_lookups.swift:52:13:52:13 | { ... } |
29-
| method_lookups.swift:52:13:52:13 | .bar() | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:52:13:52:13 | bar() |
26+
| method_lookups.swift:52:11:52:13 | .bar() | hasType: | yes | getBase: | method_lookups.swift:52:11:52:11 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:52:13:52:13 | bar() |
3027
| method_lookups.swift:53:11:53:23 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:53:18:53:20 | call to Z.init() | hasMember: | no | getMethodRef: | method_lookups.swift:53:23:53:23 | { ... } |
3128
| method_lookups.swift:53:18:53:18 | Z.init() | hasType: | yes | getBase: | method_lookups.swift:53:18:53:18 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:53:18:53:18 | Z.init() |
3229
| method_lookups.swift:53:23:53:23 | .baz(_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:53:23:53:23 | baz(_:) |

swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr_getMember.expected

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
| method_lookups.swift:33:3:33:5 | .bar() | method_lookups.swift:3:3:3:21 | bar() |
77
| method_lookups.swift:34:3:34:3 | X.init() | method_lookups.swift:6:3:8:3 | X.init() |
88
| method_lookups.swift:34:3:34:7 | .baz(_:) | method_lookups.swift:4:3:4:21 | baz(_:) |
9-
| method_lookups.swift:36:13:36:13 | .bar() | method_lookups.swift:3:3:3:21 | bar() |
9+
| method_lookups.swift:36:11:36:13 | .bar() | method_lookups.swift:3:3:3:21 | bar() |
1010
| method_lookups.swift:37:11:37:11 | X.init() | method_lookups.swift:6:3:8:3 | X.init() |
1111
| method_lookups.swift:37:15:37:15 | .baz(_:) | method_lookups.swift:4:3:4:21 | baz(_:) |
1212
| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(priority:operation:) |
1313
| method_lookups.swift:41:3:41:5 | .foo(_:_:) | method_lookups.swift:12:3:12:35 | foo(_:_:) |
1414
| method_lookups.swift:42:9:42:9 | Y.init() | method_lookups.swift:15:3:17:3 | Y.init() |
1515
| method_lookups.swift:42:9:42:13 | .baz(_:) | method_lookups.swift:13:3:13:21 | baz(_:) |
16-
| method_lookups.swift:44:13:44:13 | .foo(_:_:) | method_lookups.swift:12:3:12:35 | foo(_:_:) |
16+
| method_lookups.swift:44:11:44:13 | .foo(_:_:) | method_lookups.swift:12:3:12:35 | foo(_:_:) |
1717
| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(priority:operation:) |
1818
| method_lookups.swift:48:9:48:11 | .foo(_:_:) | method_lookups.swift:22:3:22:35 | foo(_:_:) |
1919
| method_lookups.swift:49:9:49:11 | .bar() | method_lookups.swift:23:3:23:21 | bar() |
2020
| method_lookups.swift:50:9:50:9 | Z.init() | method_lookups.swift:26:3:28:3 | Z.init() |
2121
| method_lookups.swift:50:9:50:13 | .baz(_:) | method_lookups.swift:24:3:24:21 | baz(_:) |
22-
| method_lookups.swift:52:13:52:13 | .bar() | method_lookups.swift:23:3:23:21 | bar() |
22+
| method_lookups.swift:52:11:52:13 | .bar() | method_lookups.swift:23:3:23:21 | bar() |
2323
| method_lookups.swift:53:18:53:18 | Z.init() | method_lookups.swift:26:3:28:3 | Z.init() |
2424
| method_lookups.swift:53:23:53:23 | .baz(_:) | method_lookups.swift:24:3:24:21 | baz(_:) |

swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr_getType.expected

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,21 @@
99
| method_lookups.swift:33:3:33:5 | .bar() | () -> () |
1010
| method_lookups.swift:34:3:34:3 | X.init() | () -> X |
1111
| method_lookups.swift:34:3:34:7 | .baz(_:) | (Int) -> () |
12-
| method_lookups.swift:36:11:36:13 | (no string representation) | () -> () |
13-
| method_lookups.swift:36:13:36:13 | .bar() | () -> () |
12+
| method_lookups.swift:36:11:36:13 | .bar() | () -> () |
1413
| method_lookups.swift:37:11:37:11 | X.init() | () -> X |
1514
| method_lookups.swift:37:11:37:15 | (no string representation) | (Int) -> () |
1615
| method_lookups.swift:37:15:37:15 | .baz(_:) | (Int) -> () |
1716
| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) | (TaskPriority?, __owned @escaping @Sendable () async -> ()) -> Task<(), Never> |
1817
| method_lookups.swift:41:3:41:5 | .foo(_:_:) | (Int, Int) -> () |
1918
| method_lookups.swift:42:9:42:9 | Y.init() | () -> Y |
2019
| method_lookups.swift:42:9:42:13 | .baz(_:) | (Int) -> () |
21-
| method_lookups.swift:44:11:44:13 | (no string representation) | (Int, Int) -> () |
22-
| method_lookups.swift:44:13:44:13 | .foo(_:_:) | (Int, Int) -> () |
20+
| method_lookups.swift:44:11:44:13 | .foo(_:_:) | (Int, Int) -> () |
2321
| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | (TaskPriority?, __owned @escaping @Sendable () async -> ()) -> Task<(), Never> |
2422
| method_lookups.swift:48:9:48:11 | .foo(_:_:) | @MainActor (Int, Int) -> () |
2523
| method_lookups.swift:49:9:49:11 | .bar() | @MainActor () -> () |
2624
| method_lookups.swift:50:9:50:9 | Z.init() | @MainActor () -> Z |
2725
| method_lookups.swift:50:9:50:13 | .baz(_:) | @MainActor (Int) -> () |
28-
| method_lookups.swift:52:11:52:13 | (no string representation) | @MainActor () -> () |
29-
| method_lookups.swift:52:13:52:13 | .bar() | () -> () |
26+
| method_lookups.swift:52:11:52:13 | .bar() | () -> () |
3027
| method_lookups.swift:53:11:53:23 | (no string representation) | @MainActor (Int) -> () |
3128
| method_lookups.swift:53:18:53:18 | Z.init() | @MainActor () -> Z |
3229
| method_lookups.swift:53:23:53:23 | .baz(_:) | (Int) -> () |
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| run_under: $CODEQL_EXTRACTOR_SWIFT_ROOT/tools/$CODEQL_PLATFORM/extractor -sdk $CODEQL_EXTRACTOR_SWIFT_ROOT/qltest/$CODEQL_PLATFORM/sdk -c -primary-file filtered_in.swift |
2-
| run_under: $CODEQL_EXTRACTOR_SWIFT_ROOT/tools/$CODEQL_PLATFORM/extractor -sdk $CODEQL_EXTRACTOR_SWIFT_ROOT/qltest/$CODEQL_PLATFORM/sdk -c -primary-file unfiltered.swift |
1+
| run_under: $CODEQL_EXTRACTOR_SWIFT_ROOT/tools/$CODEQL_PLATFORM/extractor -sdk $CODEQL_EXTRACTOR_SWIFT_ROOT/qltest/$CODEQL_PLATFORM/sdk -resource-dir $CODEQL_EXTRACTOR_SWIFT_ROOT/resource-dir/$CODEQL_PLATFORM -c -primary-file filtered_in.swift |
2+
| run_under: $CODEQL_EXTRACTOR_SWIFT_ROOT/tools/$CODEQL_PLATFORM/extractor -sdk $CODEQL_EXTRACTOR_SWIFT_ROOT/qltest/$CODEQL_PLATFORM/sdk -resource-dir $CODEQL_EXTRACTOR_SWIFT_ROOT/resource-dir/$CODEQL_PLATFORM -c -primary-file unfiltered.swift |

swift/ql/test/extractor-tests/updates/PrintAst.expected

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ v5.8.swift:
88
# 5| getTypeRepr(): [TypeRepr] Double
99
# 5| getMember(1): [ConcreteVarDecl] degreesCelsius
1010
# 5| Type = Double
11-
# 5| getAccessorDecl(0): [AccessorDecl] get
11+
# 5| getAccessor(0): [Accessor] get
1212
# 5| InterfaceType = (Temperature) -> () -> Double
1313
# 5| getSelfParam(): [ParamDecl] self
1414
# 5| Type = Temperature
1515
# 5| getBody(): [BraceStmt] { ... }
1616
#-----| getElement(0): [ReturnStmt] return ...
1717
#-----| getResult(): [MemberRefExpr] .degreesCelsius
1818
#-----| getBase(): [DeclRefExpr] self
19-
# 5| getAccessorDecl(1): [AccessorDecl] set
19+
# 5| getAccessor(1): [Accessor] set
2020
# 5| InterfaceType = (inout Temperature) -> (Double) -> ()
2121
# 5| getSelfParam(): [ParamDecl] self
2222
# 5| Type = Temperature
@@ -27,7 +27,7 @@ v5.8.swift:
2727
#-----| getDest(): [MemberRefExpr] .degreesCelsius
2828
#-----| getBase(): [DeclRefExpr] self
2929
#-----| getSource(): [DeclRefExpr] value
30-
# 5| getAccessorDecl(2): [AccessorDecl] _modify
30+
# 5| getAccessor(2): [Accessor] _modify
3131
# 5| InterfaceType = (inout Temperature) -> () -> ()
3232
# 5| getSelfParam(): [ParamDecl] self
3333
# 5| Type = Temperature
@@ -36,7 +36,7 @@ v5.8.swift:
3636
#-----| getResult(0): [InOutExpr] &...
3737
#-----| getSubExpr(): [MemberRefExpr] .degreesCelsius
3838
#-----| getBase(): [DeclRefExpr] self
39-
# 4| getMember(2): [ConstructorDecl] Temperature.init(degreesCelsius:)
39+
# 4| getMember(2): [Initializer] Temperature.init(degreesCelsius:)
4040
# 4| InterfaceType = (Temperature.Type) -> (Double) -> Temperature
4141
# 4| getSelfParam(): [ParamDecl] self
4242
# 4| Type = Temperature
@@ -51,7 +51,7 @@ v5.8.swift:
5151
# 13| getTypeRepr(): [TypeRepr] Double
5252
# 13| getMember(1): [ConcreteVarDecl] degreesFahrenheit
5353
# 13| Type = Double
54-
# 13| getAccessorDecl(0): [AccessorDecl] get
54+
# 13| getAccessor(0): [Accessor] get
5555
# 13| InterfaceType = (Temperature) -> () -> Double
5656
# 13| getSelfParam(): [ParamDecl] self
5757
# 13| Type = Temperature
@@ -84,7 +84,7 @@ v5.8.swift:
8484
# 14| getExpr().getFullyConverted(): [ParenExpr] (...)
8585
# 14| getArgument(1): [Argument] : 32
8686
# 14| getExpr(): [IntegerLiteralExpr] 32
87-
# 18| [ConcreteFuncDecl] collectionDowncast(_:)
87+
# 18| [NamedFunction] collectionDowncast(_:)
8888
# 18| InterfaceType = ([Any]) -> ()
8989
# 18| getParam(0): [ParamDecl] arr
9090
# 18| Type = [Any]
@@ -120,15 +120,15 @@ v5.8.swift:
120120
# 30| getTypeRepr(): [TypeRepr] (() -> ())?
121121
# 30| getMember(1): [ConcreteVarDecl] tapHandler
122122
# 30| Type = (() -> ())?
123-
# 30| getAccessorDecl(0): [AccessorDecl] get
123+
# 30| getAccessor(0): [Accessor] get
124124
# 30| InterfaceType = (Button) -> () -> (() -> ())?
125125
# 30| getSelfParam(): [ParamDecl] self
126126
# 30| Type = Button
127127
# 30| getBody(): [BraceStmt] { ... }
128128
#-----| getElement(0): [ReturnStmt] return ...
129129
#-----| getResult(): [MemberRefExpr] .tapHandler
130130
#-----| getBase(): [DeclRefExpr] self
131-
# 30| getAccessorDecl(1): [AccessorDecl] set
131+
# 30| getAccessor(1): [Accessor] set
132132
# 30| InterfaceType = (inout Button) -> ((() -> ())?) -> ()
133133
# 30| getSelfParam(): [ParamDecl] self
134134
# 30| Type = Button
@@ -139,7 +139,7 @@ v5.8.swift:
139139
#-----| getDest(): [MemberRefExpr] .tapHandler
140140
#-----| getBase(): [DeclRefExpr] self
141141
#-----| getSource(): [DeclRefExpr] value
142-
# 30| getAccessorDecl(2): [AccessorDecl] _modify
142+
# 30| getAccessor(2): [Accessor] _modify
143143
# 30| InterfaceType = (inout Button) -> () -> ()
144144
# 30| getSelfParam(): [ParamDecl] self
145145
# 30| Type = Button
@@ -148,13 +148,13 @@ v5.8.swift:
148148
#-----| getResult(0): [InOutExpr] &...
149149
#-----| getSubExpr(): [MemberRefExpr] .tapHandler
150150
#-----| getBase(): [DeclRefExpr] self
151-
# 29| getMember(2): [ConstructorDecl] Button.init()
151+
# 29| getMember(2): [Initializer] Button.init()
152152
# 29| InterfaceType = (Button.Type) -> () -> Button
153153
# 29| getSelfParam(): [ParamDecl] self
154154
# 29| Type = Button
155155
# 29| getBody(): [BraceStmt] { ... }
156156
# 29| getElement(0): [ReturnStmt] return
157-
# 29| getMember(3): [ConstructorDecl] Button.init(tapHandler:)
157+
# 29| getMember(3): [Initializer] Button.init(tapHandler:)
158158
# 29| InterfaceType = (Button.Type) -> ((() -> ())?) -> Button
159159
# 29| getSelfParam(): [ParamDecl] self
160160
# 29| Type = Button
@@ -172,15 +172,15 @@ v5.8.swift:
172172
# 34| getTypeRepr(): [TypeRepr] Button
173173
# 34| getMember(1): [ConcreteVarDecl] button
174174
# 34| Type = Button
175-
# 34| getAccessorDecl(0): [AccessorDecl] get
175+
# 34| getAccessor(0): [Accessor] get
176176
# 34| InterfaceType = (ViewController) -> () -> Button
177177
# 34| getSelfParam(): [ParamDecl] self
178178
# 34| Type = ViewController
179179
# 34| getBody(): [BraceStmt] { ... }
180180
#-----| getElement(0): [ReturnStmt] return ...
181181
#-----| getResult(): [MemberRefExpr] .button
182182
#-----| getBase(): [DeclRefExpr] self
183-
# 34| getAccessorDecl(1): [AccessorDecl] set
183+
# 34| getAccessor(1): [Accessor] set
184184
# 34| InterfaceType = (ViewController) -> (Button) -> ()
185185
# 34| getSelfParam(): [ParamDecl] self
186186
# 34| Type = ViewController
@@ -191,7 +191,7 @@ v5.8.swift:
191191
#-----| getDest(): [MemberRefExpr] .button
192192
#-----| getBase(): [DeclRefExpr] self
193193
#-----| getSource(): [DeclRefExpr] value
194-
# 34| getAccessorDecl(2): [AccessorDecl] _modify
194+
# 34| getAccessor(2): [Accessor] _modify
195195
# 34| InterfaceType = (ViewController) -> () -> ()
196196
# 34| getSelfParam(): [ParamDecl] self
197197
# 34| Type = ViewController
@@ -200,7 +200,7 @@ v5.8.swift:
200200
#-----| getResult(0): [InOutExpr] &...
201201
#-----| getSubExpr(): [MemberRefExpr] .button
202202
#-----| getBase(): [DeclRefExpr] self
203-
# 36| getMember(2): [ConcreteFuncDecl] setup()
203+
# 36| getMember(2): [NamedFunction] setup()
204204
# 36| InterfaceType = (ViewController) -> () -> ()
205205
# 36| getSelfParam(): [ParamDecl] self
206206
# 36| Type = ViewController
@@ -214,7 +214,7 @@ v5.8.swift:
214214
# 37| getInit(0): [DeclRefExpr] self
215215
# 37| getInit(0).getFullyConverted(): [InjectIntoOptionalExpr] (ViewController?) ...
216216
# 37| getPattern(0): [NamedPattern] self
217-
# 37| getClosureBody(): [ClosureExpr] { ... }
217+
# 37| getClosureBody(): [ExplicitClosureExpr] { ... }
218218
# 37| getBody(): [BraceStmt] { ... }
219219
# 38| getElement(0): [GuardStmt] guard ... else { ... }
220220
# 38| getCondition(): [StmtCondition] StmtCondition
@@ -232,17 +232,17 @@ v5.8.swift:
232232
# 39| getMethodRef(): [DeclRefExpr] dismiss()
233233
# 38| getCapture(0): [CapturedDecl] self
234234
# 37| getSource().getFullyConverted(): [InjectIntoOptionalExpr] ((() -> ())?) ...
235-
# 43| getMember(3): [ConcreteFuncDecl] dismiss()
235+
# 43| getMember(3): [NamedFunction] dismiss()
236236
# 43| InterfaceType = (ViewController) -> () -> ()
237237
# 43| getSelfParam(): [ParamDecl] self
238238
# 43| Type = ViewController
239239
# 43| getBody(): [BraceStmt] { ... }
240-
# 33| getMember(4): [DestructorDecl] ViewController.deinit()
240+
# 33| getMember(4): [Deinitializer] ViewController.deinit()
241241
# 33| InterfaceType = (ViewController) -> () -> ()
242242
# 33| getSelfParam(): [ParamDecl] self
243243
# 33| Type = ViewController
244244
# 33| getBody(): [BraceStmt] { ... }
245-
# 33| getMember(5): [ConstructorDecl] ViewController.init()
245+
# 33| getMember(5): [Initializer] ViewController.init()
246246
# 33| InterfaceType = (ViewController.Type) -> () -> ViewController
247247
# 33| getSelfParam(): [ParamDecl] self
248248
# 33| Type = ViewController

0 commit comments

Comments
 (0)