Skip to content

Commit b6076c0

Browse files
jketemaPaolo Tranquilli
jketema
authored and
Paolo Tranquilli
committed
Swift: Update test results for ParenType no longer being extracted
1 parent 1b21e4c commit b6076c0

File tree

6 files changed

+40
-43
lines changed

6 files changed

+40
-43
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ closures.swift:
101101
# 24| getSubExpr(): [CallExpr] call to ...
102102
# 24| getFunction(): [BindOptionalExpr] ...?
103103
# 24| getSubExpr(): [DeclRefExpr] escape
104-
# 24| getFunction().getFullyConverted(): [LoadExpr] ((() -> ())) ...
104+
# 24| getFunction().getFullyConverted(): [LoadExpr] (() -> ()) ...
105105
# 24| getSubExpr().getFullyConverted(): [InjectIntoOptionalExpr] (()?) ...
106106
# 24| getCapture(0): [CapturedDecl] escape
107107
# 27| [NamedFunction] logical()
@@ -145,8 +145,8 @@ closures.swift:
145145
# 30| getArgument(0): [Argument] : ... .!=(_:_:) ...
146146
# 30| getExpr(): [BinaryExpr] ... .!=(_:_:) ...
147147
# 30| getFunction(): [MethodLookupExpr] .!=(_:_:)
148-
# 30| getBase(): [TypeExpr] Optional<((Int) -> Int)>.Type
149-
# 30| getTypeRepr(): [TypeRepr] Optional<((Int) -> Int)>
148+
# 30| getBase(): [TypeExpr] Optional<(Int) -> Int>.Type
149+
# 30| getTypeRepr(): [TypeRepr] Optional<(Int) -> Int>
150150
# 30| getMethodRef(): [DeclRefExpr] !=(_:_:)
151151
# 30| getArgument(0): [Argument] : f
152152
# 30| getExpr(): [DeclRefExpr] f

‎swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr_getType.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
| identity_expressions.swift:5:9:5:14 | .self | A |
22
| identity_expressions.swift:5:9:5:21 | .self | @lvalue Int |
3-
| identity_expressions.swift:5:28:5:31 | (...) | (Int) |
4-
| identity_expressions.swift:9:5:9:9 | (...) | (A) |
5-
| identity_expressions.swift:12:28:12:43 | (...) | (A) |
3+
| identity_expressions.swift:5:28:5:31 | (...) | Int |
4+
| identity_expressions.swift:9:5:9:9 | (...) | A |
5+
| identity_expressions.swift:12:28:12:43 | (...) | A |
66
| identity_expressions.swift:12:29:12:42 | await ... | A |
77
| identity_expressions.swift:15:5:15:21 | await ... | () |
8-
| identity_expressions.swift:15:11:15:19 | (...) | (() async -> ()) |
8+
| identity_expressions.swift:15:11:15:19 | (...) | () async -> () |
99
| identity_expressions.swift:18:9:18:17 | BorrowExpr | Int |

‎swift/ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
| P1 & (P2 & P3) | getName: | P1 & (P2 & P3) | getCanonicalType: | P1 & P2 & P3 | getNumberOfMembers: | 2 |
21
| P1 & P2 & P3 | getName: | P1 & P2 & P3 | getCanonicalType: | P1 & P2 & P3 | getNumberOfMembers: | 3 |
32
| P1 & P23 | getName: | P1 & P23 | getCanonicalType: | P1 & P2 & P3 | getNumberOfMembers: | 2 |
43
| P2 & P4 | getName: | P2 & P4 | getCanonicalType: | P2 & P4 | getNumberOfMembers: | 2 |

‎swift/ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType_getMember.expected

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
| P1 & (P2 & P3) | 0 | P1 |
2-
| P1 & (P2 & P3) | 1 | (P2 & P3) |
31
| P1 & P2 & P3 | 0 | P1 |
42
| P1 & P2 & P3 | 1 | P2 |
53
| P1 & P2 & P3 | 2 | P3 |

‎swift/ql/test/extractor-tests/patterns/types.expected

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
| patterns.swift:78:9:78:13 | ... as ... | MyEnum |
6464
| patterns.swift:81:10:81:11 | .myNone | MyEnum |
6565
| patterns.swift:83:10:83:25 | .mySingle(...) | MyEnum |
66-
| patterns.swift:83:19:83:25 | (...) | (Int) |
67-
| patterns.swift:83:20:83:24 | let ... | (Int) |
68-
| patterns.swift:83:24:83:24 | a | (Int) |
66+
| patterns.swift:83:19:83:25 | (...) | Int |
67+
| patterns.swift:83:20:83:24 | let ... | Int |
68+
| patterns.swift:83:24:83:24 | a | Int |
6969
| patterns.swift:85:10:85:30 | .myPair(...) | MyEnum |
7070
| patterns.swift:85:17:85:30 | (...) | (Int, Int) |
7171
| patterns.swift:85:18:85:22 | let ... | Int |
@@ -78,9 +78,9 @@
7878
| patterns.swift:88:22:88:22 | a | Int |
7979
| patterns.swift:88:25:88:25 | _ | MyEnum |
8080
| patterns.swift:92:13:92:28 | .mySingle(...) | MyEnum |
81-
| patterns.swift:92:22:92:28 | (...) | (Int) |
82-
| patterns.swift:92:23:92:27 | let ... | (Int) |
83-
| patterns.swift:92:27:92:27 | x | (Int) |
81+
| patterns.swift:92:22:92:28 | (...) | Int |
82+
| patterns.swift:92:23:92:27 | let ... | Int |
83+
| patterns.swift:92:27:92:27 | x | Int |
8484
| patterns.swift:95:13:95:33 | .myPair(...) | MyEnum |
8585
| patterns.swift:95:20:95:33 | (...) | (Int, Int) |
8686
| patterns.swift:95:21:95:25 | let ... | Int |
@@ -89,9 +89,9 @@
8989
| patterns.swift:95:32:95:32 | y | Int |
9090
| patterns.swift:103:10:103:11 | .myNone | MyEnum |
9191
| patterns.swift:105:10:105:25 | .mySingle(...) | MyEnum |
92-
| patterns.swift:105:19:105:25 | (...) | (Int) |
93-
| patterns.swift:105:20:105:24 | let ... | (Int) |
94-
| patterns.swift:105:24:105:24 | a | (Int) |
92+
| patterns.swift:105:19:105:25 | (...) | Int |
93+
| patterns.swift:105:20:105:24 | let ... | Int |
94+
| patterns.swift:105:24:105:24 | a | Int |
9595
| patterns.swift:107:10:107:30 | .myPair(...) | MyEnum |
9696
| patterns.swift:107:17:107:30 | (...) | (Int, Int) |
9797
| patterns.swift:107:18:107:22 | let ... | Int |
@@ -104,9 +104,9 @@
104104
| patterns.swift:110:22:110:22 | a | Int |
105105
| patterns.swift:110:25:110:25 | _ | MyEnum |
106106
| patterns.swift:114:13:114:28 | .mySingle(...) | MyEnum |
107-
| patterns.swift:114:22:114:28 | (...) | (Int) |
108-
| patterns.swift:114:23:114:27 | let ... | (Int) |
109-
| patterns.swift:114:27:114:27 | x | (Int) |
107+
| patterns.swift:114:22:114:28 | (...) | Int |
108+
| patterns.swift:114:23:114:27 | let ... | Int |
109+
| patterns.swift:114:27:114:27 | x | Int |
110110
| patterns.swift:117:13:117:33 | .myPair(...) | MyEnum |
111111
| patterns.swift:117:20:117:33 | (...) | (Int, Int) |
112112
| patterns.swift:117:21:117:25 | let ... | Int |
@@ -115,9 +115,9 @@
115115
| patterns.swift:117:32:117:32 | y | Int |
116116
| patterns.swift:125:10:125:11 | .myNone | MyEnum |
117117
| patterns.swift:127:10:127:25 | .mySingle(...) | MyEnum |
118-
| patterns.swift:127:19:127:25 | (...) | (Int) |
119-
| patterns.swift:127:20:127:24 | let ... | (Int) |
120-
| patterns.swift:127:24:127:24 | a | (Int) |
118+
| patterns.swift:127:19:127:25 | (...) | Int |
119+
| patterns.swift:127:20:127:24 | let ... | Int |
120+
| patterns.swift:127:24:127:24 | a | Int |
121121
| patterns.swift:129:10:129:30 | .myPair(...) | MyEnum |
122122
| patterns.swift:129:17:129:30 | (...) | (Int, Int) |
123123
| patterns.swift:129:18:129:22 | let ... | Int |
@@ -130,9 +130,9 @@
130130
| patterns.swift:132:22:132:22 | a | Int |
131131
| patterns.swift:132:25:132:25 | _ | MyEnum |
132132
| patterns.swift:136:13:136:28 | .mySingle(...) | MyEnum |
133-
| patterns.swift:136:22:136:28 | (...) | (Int) |
134-
| patterns.swift:136:23:136:27 | let ... | (Int) |
135-
| patterns.swift:136:27:136:27 | x | (Int) |
133+
| patterns.swift:136:22:136:28 | (...) | Int |
134+
| patterns.swift:136:23:136:27 | let ... | Int |
135+
| patterns.swift:136:27:136:27 | x | Int |
136136
| patterns.swift:139:13:139:33 | .myPair(...) | MyEnum |
137137
| patterns.swift:139:20:139:33 | (...) | (Int, Int) |
138138
| patterns.swift:139:21:139:25 | let ... | Int |
@@ -143,9 +143,9 @@
143143
| patterns.swift:144:9:144:12 | ... as ... | MyEnum |
144144
| patterns.swift:147:10:147:11 | .myNone | MyEnum |
145145
| patterns.swift:149:10:149:25 | .mySingle(...) | MyEnum |
146-
| patterns.swift:149:19:149:25 | (...) | (Int) |
147-
| patterns.swift:149:20:149:24 | let ... | (Int) |
148-
| patterns.swift:149:24:149:24 | a | (Int) |
146+
| patterns.swift:149:19:149:25 | (...) | Int |
147+
| patterns.swift:149:20:149:24 | let ... | Int |
148+
| patterns.swift:149:24:149:24 | a | Int |
149149
| patterns.swift:151:10:151:30 | .myPair(...) | MyEnum |
150150
| patterns.swift:151:17:151:30 | (...) | (Int, Int) |
151151
| patterns.swift:151:18:151:22 | let ... | Int |
@@ -166,9 +166,9 @@
166166
| patterns.swift:158:22:158:22 | a | Int |
167167
| patterns.swift:158:25:158:25 | _ | MyEnum |
168168
| patterns.swift:162:13:162:28 | .mySingle(...) | MyEnum |
169-
| patterns.swift:162:22:162:28 | (...) | (Int) |
170-
| patterns.swift:162:23:162:27 | let ... | (Int) |
171-
| patterns.swift:162:27:162:27 | x | (Int) |
169+
| patterns.swift:162:22:162:28 | (...) | Int |
170+
| patterns.swift:162:23:162:27 | let ... | Int |
171+
| patterns.swift:162:27:162:27 | x | Int |
172172
| patterns.swift:165:13:165:39 | .myPair(...) | MyEnum |
173173
| patterns.swift:165:26:165:39 | (...) | (Int, Int) |
174174
| patterns.swift:165:27:165:31 | let ... | Int |

‎swift/ql/test/library-tests/ast/PrintAst.expected

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ cfg.swift:
853853
# 144| [ConcreteVarDecl] $match
854854
# 144| Type = Int
855855
# 156| [ConcreteVarDecl] x
856-
# 156| Type = (Int)
856+
# 156| Type = Int
857857
# 163| [NamedFunction] testDefer(x:)
858858
# 163| InterfaceType = (inout Int) -> ()
859859
# 163| getParam(0): [ParamDecl] x
@@ -6399,7 +6399,7 @@ patterns.swift:
63996399
# 83| getSubPattern().getFullyUnresolved(): [ParenPattern] (...)
64006400
# 83| getSubPattern(): [BindingPattern] let ...
64016401
# 83| getVariable(0): [ConcreteVarDecl] a
6402-
# 83| Type = (Int)
6402+
# 83| Type = Int
64036403
# 84| getBody(): [BraceStmt] { ... }
64046404
# 84| getElement(0): [CallExpr] call to sink(arg:)
64056405
# 84| getFunction(): [DeclRefExpr] sink(arg:)
@@ -6499,7 +6499,7 @@ patterns.swift:
64996499
# 105| getSubPattern().getFullyUnresolved(): [ParenPattern] (...)
65006500
# 105| getSubPattern(): [BindingPattern] let ...
65016501
# 105| getVariable(0): [ConcreteVarDecl] a
6502-
# 105| Type = (Int)
6502+
# 105| Type = Int
65036503
# 106| getBody(): [BraceStmt] { ... }
65046504
# 106| getElement(0): [CallExpr] call to sink(arg:)
65056505
# 106| getFunction(): [DeclRefExpr] sink(arg:)
@@ -6601,7 +6601,7 @@ patterns.swift:
66016601
# 127| getSubPattern().getFullyUnresolved(): [ParenPattern] (...)
66026602
# 127| getSubPattern(): [BindingPattern] let ...
66036603
# 127| getVariable(0): [ConcreteVarDecl] a
6604-
# 127| Type = (Int)
6604+
# 127| Type = Int
66056605
# 128| getBody(): [BraceStmt] { ... }
66066606
# 128| getElement(0): [CallExpr] call to sink(arg:)
66076607
# 128| getFunction(): [DeclRefExpr] sink(arg:)
@@ -6704,7 +6704,7 @@ patterns.swift:
67046704
# 149| getSubPattern().getFullyUnresolved(): [ParenPattern] (...)
67056705
# 149| getSubPattern(): [BindingPattern] let ...
67066706
# 149| getVariable(0): [ConcreteVarDecl] a
6707-
# 149| Type = (Int)
6707+
# 149| Type = Int
67086708
# 150| getBody(): [BraceStmt] { ... }
67096709
# 150| getElement(0): [CallExpr] call to sink(arg:)
67106710
# 150| getFunction(): [DeclRefExpr] sink(arg:)
@@ -6898,25 +6898,25 @@ patterns.swift:
68986898
# 181| getBody(): [BraceStmt] { ... }
68996899
# 181| getElement(0): [TupleExpr] (...)
69006900
# 92| [ConcreteVarDecl] x
6901-
# 92| Type = (Int)
6901+
# 92| Type = Int
69026902
# 95| [ConcreteVarDecl] x
69036903
# 95| Type = Int
69046904
# 95| [ConcreteVarDecl] y
69056905
# 95| Type = Int
69066906
# 114| [ConcreteVarDecl] x
6907-
# 114| Type = (Int)
6907+
# 114| Type = Int
69086908
# 117| [ConcreteVarDecl] x
69096909
# 117| Type = Int
69106910
# 117| [ConcreteVarDecl] y
69116911
# 117| Type = Int
69126912
# 136| [ConcreteVarDecl] x
6913-
# 136| Type = (Int)
6913+
# 136| Type = Int
69146914
# 139| [ConcreteVarDecl] x
69156915
# 139| Type = Int
69166916
# 139| [ConcreteVarDecl] y
69176917
# 139| Type = Int
69186918
# 162| [ConcreteVarDecl] x
6919-
# 162| Type = (Int)
6919+
# 162| Type = Int
69206920
# 165| [ConcreteVarDecl] x
69216921
# 165| Type = Int
69226922
# 165| [ConcreteVarDecl] y

0 commit comments

Comments
 (0)