Skip to content

Commit 1ee823b

Browse files
authored
Merge pull request github#13111 from kaspersv/kaspersv/swift-explicit-this-receivers3
Swift: Make implicit this receivers explicit
2 parents 5ef74c9 + d346d17 commit 1ee823b

File tree

135 files changed

+509
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+509
-481
lines changed

misc/codegen/templates/ql_class.mustache

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ module Generated {
5050
* transitively.
5151
*/
5252
final {{name}} resolve() {
53-
not exists(getResolveStep()) and result = this
53+
not exists(this.getResolveStep()) and result = this
5454
or
55-
result = getResolveStep().resolve()
55+
result = this.getResolveStep().resolve()
5656
}
5757
{{/root}}
5858
{{#final}}
@@ -84,7 +84,7 @@ module Generated {
8484
{{/has_description}}
8585
*/
8686
final {{type}} {{getter}}({{#is_indexed}}int index{{/is_indexed}}) {
87-
result = get{{#is_unordered}}An{{/is_unordered}}Immediate{{singular}}({{#is_indexed}}index{{/is_indexed}}).resolve()
87+
result = this.get{{#is_unordered}}An{{/is_unordered}}Immediate{{singular}}({{#is_indexed}}index{{/is_indexed}}).resolve()
8888
}
8989

9090
{{/type_is_class}}
@@ -112,7 +112,7 @@ module Generated {
112112
* Holds if `{{getter}}({{#is_repeated}}index{{/is_repeated}})` exists.
113113
*/
114114
final predicate has{{singular}}({{#is_repeated}}int index{{/is_repeated}}) {
115-
exists({{getter}}({{#is_repeated}}index{{/is_repeated}}))
115+
exists(this.{{getter}}({{#is_repeated}}index{{/is_repeated}}))
116116
}
117117
{{/is_optional}}
118118
{{#is_indexed}}
@@ -121,15 +121,15 @@ module Generated {
121121
* Gets any of the {{doc_plural}}.
122122
*/
123123
final {{type}} {{indefinite_getter}}() {
124-
result = {{getter}}(_)
124+
result = this.{{getter}}(_)
125125
}
126126
{{^is_optional}}
127127

128128
/**
129129
* Gets the number of {{doc_plural}}.
130130
*/
131131
final int getNumberOf{{plural}}() {
132-
result = count(int i | exists({{getter}}(i)))
132+
result = count(int i | exists(this.{{getter}}(i)))
133133
}
134134
{{/is_optional}}
135135
{{/is_indexed}}
@@ -138,7 +138,7 @@ module Generated {
138138
* Gets the number of {{doc_plural}}.
139139
*/
140140
final int getNumberOf{{plural}}() {
141-
result = count({{getter}}())
141+
result = count(this.{{getter}}())
142142
}
143143
{{/is_unordered}}
144144
{{/properties}}

swift/ql/.generated.list

Lines changed: 133 additions & 133 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swift/ql/lib/codeql/swift/generated/AvailabilityInfo.qll

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swift/ql/lib/codeql/swift/generated/Callable.qll

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swift/ql/lib/codeql/swift/generated/Element.qll

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swift/ql/lib/codeql/swift/generated/KeyPathComponent.qll

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swift/ql/lib/codeql/swift/generated/Locatable.qll

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swift/ql/lib/codeql/swift/generated/Location.qll

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swift/ql/lib/codeql/swift/generated/UnspecifiedElement.qll

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swift/ql/lib/codeql/swift/generated/decl/AbstractStorageDecl.qll

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)