Skip to content

Commit 8ef6521

Browse files
geoffw0geoffw0
committed
Swift: Undo toString changes.
1 parent e71c7e7 commit 8ef6521

File tree

2 files changed

+18
-44
lines changed

2 files changed

+18
-44
lines changed

‎swift/ql/lib/codeql/swift/elements/expr/AssignExpr.qll‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ abstract private class AssignPointwiseOperationEx extends BinaryExpr { }
127127
*/
128128
class AssignAddExpr extends AssignArithmeticOperationEx {
129129
AssignAddExpr() { this.getOperator().getName() = ["+=(_:_:)", "&+=(_:_:)"] }
130-
131-
override string toString() { result = "... += ..." }
132130
}
133131

134132
/**
@@ -140,8 +138,6 @@ class AssignAddExpr extends AssignArithmeticOperationEx {
140138
*/
141139
class AssignSubExpr extends AssignArithmeticOperationEx {
142140
AssignSubExpr() { this.getOperator().getName() = ["-=(_:_:)", "&-=(_:_:)"] }
143-
144-
override string toString() { result = "... -= ..." }
145141
}
146142

147143
/**
@@ -153,8 +149,6 @@ class AssignSubExpr extends AssignArithmeticOperationEx {
153149
*/
154150
class AssignMulExpr extends AssignArithmeticOperationEx {
155151
AssignMulExpr() { this.getOperator().getName() = ["*=(_:_:)", "&*=(_:_:)"] }
156-
157-
override string toString() { result = "... *= ..." }
158152
}
159153

160154
/**
@@ -165,8 +159,6 @@ class AssignMulExpr extends AssignArithmeticOperationEx {
165159
*/
166160
class AssignDivExpr extends AssignArithmeticOperationEx {
167161
AssignDivExpr() { this.getOperator().getName() = "/=(_:_:)" }
168-
169-
override string toString() { result = "... /= ..." }
170162
}
171163

172164
/**
@@ -177,8 +169,6 @@ class AssignDivExpr extends AssignArithmeticOperationEx {
177169
*/
178170
class AssignRemExpr extends AssignArithmeticOperationEx {
179171
AssignRemExpr() { this.getOperator().getName() = "%=(_:_:)" }
180-
181-
override string toString() { result = "... %= ..." }
182172
}
183173

184174
/**
@@ -190,8 +180,6 @@ class AssignRemExpr extends AssignArithmeticOperationEx {
190180
*/
191181
class AssignLShiftExpr extends AssignBitwiseOperationEx {
192182
AssignLShiftExpr() { this.getOperator().getName() = ["<<=(_:_:)", "&<<=(_:_:)"] }
193-
194-
override string toString() { result = "... <<= ..." }
195183
}
196184

197185
/**
@@ -203,8 +191,6 @@ class AssignLShiftExpr extends AssignBitwiseOperationEx {
203191
*/
204192
class AssignRShiftExpr extends AssignBitwiseOperationEx {
205193
AssignRShiftExpr() { this.getOperator().getName() = [">>=(_:_:)", "&>>=(_:_:)"] }
206-
207-
override string toString() { result = "... >>= ..." }
208194
}
209195

210196
/**
@@ -215,8 +201,6 @@ class AssignRShiftExpr extends AssignBitwiseOperationEx {
215201
*/
216202
class AssignAndExpr extends AssignBitwiseOperationEx {
217203
AssignAndExpr() { this.getOperator().getName() = "&=(_:_:)" }
218-
219-
override string toString() { result = "... &= ..." }
220204
}
221205

222206
/**
@@ -227,8 +211,6 @@ class AssignAndExpr extends AssignBitwiseOperationEx {
227211
*/
228212
class AssignOrExpr extends AssignBitwiseOperationEx {
229213
AssignOrExpr() { this.getOperator().getName() = "|=(_:_:)" }
230-
231-
override string toString() { result = "... |= ..." }
232214
}
233215

234216
/**
@@ -239,8 +221,6 @@ class AssignOrExpr extends AssignBitwiseOperationEx {
239221
*/
240222
class AssignXorExpr extends AssignBitwiseOperationEx {
241223
AssignXorExpr() { this.getOperator().getName() = "^=(_:_:)" }
242-
243-
override string toString() { result = "... ^= ..." }
244224
}
245225

246226
/**
@@ -251,8 +231,6 @@ class AssignXorExpr extends AssignBitwiseOperationEx {
251231
*/
252232
class AssignPointwiseAndExpr extends AssignPointwiseOperationEx {
253233
AssignPointwiseAndExpr() { this.getOperator().getName() = ".&=(_:_:)" }
254-
255-
override string toString() { result = "... .&= ..." }
256234
}
257235

258236
/**
@@ -263,8 +241,6 @@ class AssignPointwiseAndExpr extends AssignPointwiseOperationEx {
263241
*/
264242
class AssignPointwiseOrExpr extends AssignPointwiseOperationEx {
265243
AssignPointwiseOrExpr() { this.getOperator().getName() = ".|=(_:_:)" }
266-
267-
override string toString() { result = "... .|= ..." }
268244
}
269245

270246
/**
@@ -275,6 +251,4 @@ class AssignPointwiseOrExpr extends AssignPointwiseOperationEx {
275251
*/
276252
class AssignPointwiseXorExpr extends AssignPointwiseOperationEx {
277253
AssignPointwiseXorExpr() { this.getOperator().getName() = ".^=(_:_:)" }
278-
279-
override string toString() { result = "... .^= ..." }
280254
}

‎swift/ql/test/library-tests/elements/expr/assignment/assignment.expected‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
| assignment.swift:6:2:6:6 | ... = ... | AssignExpr, Assignment | x | 1 |
2-
| assignment.swift:9:2:9:7 | ... += ... | AssignAddExpr, AssignArithmeticOperation, AssignOperation, Assignment | &... | 1 |
3-
| assignment.swift:10:2:10:7 | ... -= ... | AssignArithmeticOperation, AssignOperation, AssignSubExpr, Assignment | &... | 1 |
4-
| assignment.swift:11:2:11:7 | ... *= ... | AssignArithmeticOperation, AssignMulExpr, AssignOperation, Assignment | &... | 1 |
5-
| assignment.swift:12:2:12:7 | ... /= ... | AssignArithmeticOperation, AssignDivExpr, AssignOperation, Assignment | &... | 1 |
6-
| assignment.swift:13:2:13:7 | ... %= ... | AssignArithmeticOperation, AssignOperation, AssignRemExpr, Assignment | &... | 1 |
7-
| assignment.swift:16:2:16:7 | ... &= ... | AssignAndExpr, AssignBitwiseOperation, AssignOperation, Assignment | &... | 1 |
8-
| assignment.swift:17:2:17:7 | ... \|= ... | AssignBitwiseOperation, AssignOperation, AssignOrExpr, Assignment | &... | 1 |
9-
| assignment.swift:18:2:18:7 | ... ^= ... | AssignBitwiseOperation, AssignOperation, AssignXorExpr, Assignment | &... | 1 |
10-
| assignment.swift:19:2:19:8 | ... <<= ... | AssignBitwiseOperation, AssignLShiftExpr, AssignOperation, Assignment | &... | 1 |
11-
| assignment.swift:20:2:20:8 | ... >>= ... | AssignBitwiseOperation, AssignOperation, AssignRShiftExpr, Assignment | &... | 1 |
12-
| assignment.swift:23:2:23:8 | ... *= ... | AssignArithmeticOperation, AssignMulExpr, AssignOperation, Assignment, hasOverflowOperator | &... | 1 |
13-
| assignment.swift:24:2:24:8 | ... += ... | AssignAddExpr, AssignArithmeticOperation, AssignOperation, Assignment, hasOverflowOperator | &... | 1 |
14-
| assignment.swift:25:2:25:8 | ... -= ... | AssignArithmeticOperation, AssignOperation, AssignSubExpr, Assignment, hasOverflowOperator | &... | 1 |
15-
| assignment.swift:26:2:26:9 | ... <<= ... | AssignBitwiseOperation, AssignLShiftExpr, AssignOperation, Assignment, hasOverflowOperator | &... | 1 |
16-
| assignment.swift:27:2:27:9 | ... >>= ... | AssignBitwiseOperation, AssignOperation, AssignRShiftExpr, Assignment, hasOverflowOperator | &... | 1 |
2+
| assignment.swift:9:2:9:7 | ... .+=(_:_:) ... | AssignAddExpr, AssignArithmeticOperation, AssignOperation, Assignment | &... | 1 |
3+
| assignment.swift:10:2:10:7 | ... .-=(_:_:) ... | AssignArithmeticOperation, AssignOperation, AssignSubExpr, Assignment | &... | 1 |
4+
| assignment.swift:11:2:11:7 | ... .*=(_:_:) ... | AssignArithmeticOperation, AssignMulExpr, AssignOperation, Assignment | &... | 1 |
5+
| assignment.swift:12:2:12:7 | ... ./=(_:_:) ... | AssignArithmeticOperation, AssignDivExpr, AssignOperation, Assignment | &... | 1 |
6+
| assignment.swift:13:2:13:7 | ... .%=(_:_:) ... | AssignArithmeticOperation, AssignOperation, AssignRemExpr, Assignment | &... | 1 |
7+
| assignment.swift:16:2:16:7 | ... .&=(_:_:) ... | AssignAndExpr, AssignBitwiseOperation, AssignOperation, Assignment | &... | 1 |
8+
| assignment.swift:17:2:17:7 | ... .\|=(_:_:) ... | AssignBitwiseOperation, AssignOperation, AssignOrExpr, Assignment | &... | 1 |
9+
| assignment.swift:18:2:18:7 | ... .^=(_:_:) ... | AssignBitwiseOperation, AssignOperation, AssignXorExpr, Assignment | &... | 1 |
10+
| assignment.swift:19:2:19:8 | ... .<<=(_:_:) ... | AssignBitwiseOperation, AssignLShiftExpr, AssignOperation, Assignment | &... | 1 |
11+
| assignment.swift:20:2:20:8 | ... .>>=(_:_:) ... | AssignBitwiseOperation, AssignOperation, AssignRShiftExpr, Assignment | &... | 1 |
12+
| assignment.swift:23:2:23:8 | ... .&*=(_:_:) ... | AssignArithmeticOperation, AssignMulExpr, AssignOperation, Assignment, hasOverflowOperator | &... | 1 |
13+
| assignment.swift:24:2:24:8 | ... .&+=(_:_:) ... | AssignAddExpr, AssignArithmeticOperation, AssignOperation, Assignment, hasOverflowOperator | &... | 1 |
14+
| assignment.swift:25:2:25:8 | ... .&-=(_:_:) ... | AssignArithmeticOperation, AssignOperation, AssignSubExpr, Assignment, hasOverflowOperator | &... | 1 |
15+
| assignment.swift:26:2:26:9 | ... .&<<=(_:_:) ... | AssignBitwiseOperation, AssignLShiftExpr, AssignOperation, Assignment, hasOverflowOperator | &... | 1 |
16+
| assignment.swift:27:2:27:9 | ... .&>>=(_:_:) ... | AssignBitwiseOperation, AssignOperation, AssignRShiftExpr, Assignment, hasOverflowOperator | &... | 1 |
1717
| assignment.swift:33:2:33:6 | ... = ... | AssignExpr, Assignment | y | z |
18-
| assignment.swift:34:2:34:8 | ... .&= ... | AssignOperation, AssignPointwiseAndExpr, Assignment | &... | m |
19-
| assignment.swift:35:2:35:8 | ... .\|= ... | AssignOperation, AssignPointwiseOrExpr, Assignment | &... | m |
20-
| assignment.swift:36:2:36:8 | ... .^= ... | AssignOperation, AssignPointwiseXorExpr, Assignment | &... | m |
18+
| assignment.swift:34:2:34:8 | ... ..&=(_:_:) ... | AssignOperation, AssignPointwiseAndExpr, Assignment | &... | m |
19+
| assignment.swift:35:2:35:8 | ... ..\|=(_:_:) ... | AssignOperation, AssignPointwiseOrExpr, Assignment | &... | m |
20+
| assignment.swift:36:2:36:8 | ... ..^=(_:_:) ... | AssignOperation, AssignPointwiseXorExpr, Assignment | &... | m |

0 commit comments

Comments
 (0)