Skip to content

Commit 69a42d8

Browse files
michaelnebelmichaelnebel
authored
Merge pull request github#11931 from michaelnebel/csharp/refactor
Remove the Csv postfix of some predicate names.
2 parents e664662 + dc223cb commit 69a42d8

File tree

15 files changed

+103
-103
lines changed

15 files changed

+103
-103
lines changed

‎csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,41 +159,41 @@ module Public {
159159
SummaryComponentStack return(ReturnKind rk) { result = singleton(SummaryComponent::return(rk)) }
160160
}
161161

162-
private predicate noComponentSpecificCsv(SummaryComponent sc) {
163-
not exists(getComponentSpecificCsv(sc))
162+
private predicate noComponentSpecific(SummaryComponent sc) {
163+
not exists(getComponentSpecific(sc))
164164
}
165165

166166
/** Gets a textual representation of this component used for flow summaries. */
167-
private string getComponentCsv(SummaryComponent sc) {
168-
result = getComponentSpecificCsv(sc)
167+
private string getComponent(SummaryComponent sc) {
168+
result = getComponentSpecific(sc)
169169
or
170-
noComponentSpecificCsv(sc) and
170+
noComponentSpecific(sc) and
171171
(
172172
exists(ArgumentPosition pos |
173173
sc = TParameterSummaryComponent(pos) and
174-
result = "Parameter[" + getArgumentPositionCsv(pos) + "]"
174+
result = "Parameter[" + getArgumentPosition(pos) + "]"
175175
)
176176
or
177177
exists(ParameterPosition pos |
178178
sc = TArgumentSummaryComponent(pos) and
179-
result = "Argument[" + getParameterPositionCsv(pos) + "]"
179+
result = "Argument[" + getParameterPosition(pos) + "]"
180180
)
181181
or
182182
sc = TReturnSummaryComponent(getReturnValueKind()) and result = "ReturnValue"
183183
)
184184
}
185185

186186
/** Gets a textual representation of this stack used for flow summaries. */
187-
string getComponentStackCsv(SummaryComponentStack stack) {
187+
string getComponentStack(SummaryComponentStack stack) {
188188
exists(SummaryComponent head, SummaryComponentStack tail |
189189
head = stack.head() and
190190
tail = stack.tail() and
191-
result = getComponentStackCsv(tail) + "." + getComponentCsv(head)
191+
result = getComponentStack(tail) + "." + getComponent(head)
192192
)
193193
or
194194
exists(SummaryComponent c |
195195
stack = TSingletonSummaryComponentStack(c) and
196-
result = getComponentCsv(c)
196+
result = getComponent(c)
197197
)
198198
}
199199

@@ -1217,8 +1217,8 @@ module Private {
12171217
c.relevantSummary(input, output, preservesValue) and
12181218
csv =
12191219
c.getCallableCsv() // Callable information
1220-
+ getComponentStackCsv(input) + ";" // input
1221-
+ getComponentStackCsv(output) + ";" // output
1220+
+ getComponentStack(input) + ";" // input
1221+
+ getComponentStack(output) + ";" // output
12221222
+ renderKind(preservesValue) + ";" // kind
12231223
+ renderProvenance(c) // provenance
12241224
)

‎csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImplSpecific.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ SummaryComponent interpretComponentSpecific(AccessPathToken c) {
178178
}
179179

180180
/** Gets the textual representation of the content in the format used for flow summaries. */
181-
private string getContentSpecificCsv(Content c) {
181+
private string getContentSpecific(Content c) {
182182
c = TElementContent() and result = "Element"
183183
or
184184
exists(Field f | c = TFieldContent(f) and result = "Field[" + f.getQualifiedName() + "]")
@@ -189,8 +189,8 @@ private string getContentSpecificCsv(Content c) {
189189
}
190190

191191
/** Gets the textual representation of a summary component in the format used for flow summaries. */
192-
string getComponentSpecificCsv(SummaryComponent sc) {
193-
exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecificCsv(c))
192+
string getComponentSpecific(SummaryComponent sc) {
193+
exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecific(c))
194194
or
195195
sc = TWithoutContentSummaryComponent(_) and result = "WithoutElement"
196196
or
@@ -204,15 +204,15 @@ string getComponentSpecificCsv(SummaryComponent sc) {
204204
}
205205

206206
/** Gets the textual representation of a parameter position in the format used for flow summaries. */
207-
string getParameterPositionCsv(ParameterPosition pos) {
207+
string getParameterPosition(ParameterPosition pos) {
208208
result = pos.getPosition().toString()
209209
or
210210
pos.isThisParameter() and
211211
result = "this"
212212
}
213213

214214
/** Gets the textual representation of an argument position in the format used for flow summaries. */
215-
string getArgumentPositionCsv(ArgumentPosition pos) {
215+
string getArgumentPosition(ArgumentPosition pos) {
216216
result = pos.getPosition().toString()
217217
or
218218
pos.isQualifier() and

‎go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,41 +159,41 @@ module Public {
159159
SummaryComponentStack return(ReturnKind rk) { result = singleton(SummaryComponent::return(rk)) }
160160
}
161161

162-
private predicate noComponentSpecificCsv(SummaryComponent sc) {
163-
not exists(getComponentSpecificCsv(sc))
162+
private predicate noComponentSpecific(SummaryComponent sc) {
163+
not exists(getComponentSpecific(sc))
164164
}
165165

166166
/** Gets a textual representation of this component used for flow summaries. */
167-
private string getComponentCsv(SummaryComponent sc) {
168-
result = getComponentSpecificCsv(sc)
167+
private string getComponent(SummaryComponent sc) {
168+
result = getComponentSpecific(sc)
169169
or
170-
noComponentSpecificCsv(sc) and
170+
noComponentSpecific(sc) and
171171
(
172172
exists(ArgumentPosition pos |
173173
sc = TParameterSummaryComponent(pos) and
174-
result = "Parameter[" + getArgumentPositionCsv(pos) + "]"
174+
result = "Parameter[" + getArgumentPosition(pos) + "]"
175175
)
176176
or
177177
exists(ParameterPosition pos |
178178
sc = TArgumentSummaryComponent(pos) and
179-
result = "Argument[" + getParameterPositionCsv(pos) + "]"
179+
result = "Argument[" + getParameterPosition(pos) + "]"
180180
)
181181
or
182182
sc = TReturnSummaryComponent(getReturnValueKind()) and result = "ReturnValue"
183183
)
184184
}
185185

186186
/** Gets a textual representation of this stack used for flow summaries. */
187-
string getComponentStackCsv(SummaryComponentStack stack) {
187+
string getComponentStack(SummaryComponentStack stack) {
188188
exists(SummaryComponent head, SummaryComponentStack tail |
189189
head = stack.head() and
190190
tail = stack.tail() and
191-
result = getComponentStackCsv(tail) + "." + getComponentCsv(head)
191+
result = getComponentStack(tail) + "." + getComponent(head)
192192
)
193193
or
194194
exists(SummaryComponent c |
195195
stack = TSingletonSummaryComponentStack(c) and
196-
result = getComponentCsv(c)
196+
result = getComponent(c)
197197
)
198198
}
199199

@@ -1217,8 +1217,8 @@ module Private {
12171217
c.relevantSummary(input, output, preservesValue) and
12181218
csv =
12191219
c.getCallableCsv() // Callable information
1220-
+ getComponentStackCsv(input) + ";" // input
1221-
+ getComponentStackCsv(output) + ";" // output
1220+
+ getComponentStack(input) + ";" // input
1221+
+ getComponentStack(output) + ";" // output
12221222
+ renderKind(preservesValue) + ";" // kind
12231223
+ renderProvenance(c) // provenance
12241224
)

‎go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImplSpecific.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ DataFlowCallable inject(SummarizedCallable c) { result.asCallable() = c }
2323
ArgumentPosition instanceParameterPosition() { result = -1 }
2424

2525
/** Gets the textual representation of a parameter position in the format used for flow summaries. */
26-
string getParameterPositionCsv(ParameterPosition pos) { result = pos.toString() }
26+
string getParameterPosition(ParameterPosition pos) { result = pos.toString() }
2727

2828
/** Gets the textual representation of an argument position in the format used for flow summaries. */
29-
string getArgumentPositionCsv(ArgumentPosition pos) { result = pos.toString() }
29+
string getArgumentPosition(ArgumentPosition pos) { result = pos.toString() }
3030

3131
Node summaryNode(SummarizedCallable c, SummaryNodeState state) { result = getSummaryNode(c, state) }
3232

@@ -87,7 +87,7 @@ SummaryComponent interpretComponentSpecific(string c) {
8787
}
8888

8989
/** Gets the summary component for specification component `c`, if any. */
90-
private string getContentSpecificCsv(Content c) {
90+
private string getContentSpecific(Content c) {
9191
exists(Field f, string package, string className, string fieldName |
9292
f = c.(FieldContent).getField() and
9393
f.hasQualifiedName(package, className, fieldName) and
@@ -108,8 +108,8 @@ private string getContentSpecificCsv(Content c) {
108108
}
109109

110110
/** Gets the textual representation of the content in the format used for flow summaries. */
111-
string getComponentSpecificCsv(SummaryComponent sc) {
112-
exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecificCsv(c))
111+
string getComponentSpecific(SummaryComponent sc) {
112+
exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecific(c))
113113
or
114114
exists(ReturnKind rk, int n | n = rk.getIndex() |
115115
sc = TReturnSummaryComponent(rk) and

‎java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,41 +159,41 @@ module Public {
159159
SummaryComponentStack return(ReturnKind rk) { result = singleton(SummaryComponent::return(rk)) }
160160
}
161161

162-
private predicate noComponentSpecificCsv(SummaryComponent sc) {
163-
not exists(getComponentSpecificCsv(sc))
162+
private predicate noComponentSpecific(SummaryComponent sc) {
163+
not exists(getComponentSpecific(sc))
164164
}
165165

166166
/** Gets a textual representation of this component used for flow summaries. */
167-
private string getComponentCsv(SummaryComponent sc) {
168-
result = getComponentSpecificCsv(sc)
167+
private string getComponent(SummaryComponent sc) {
168+
result = getComponentSpecific(sc)
169169
or
170-
noComponentSpecificCsv(sc) and
170+
noComponentSpecific(sc) and
171171
(
172172
exists(ArgumentPosition pos |
173173
sc = TParameterSummaryComponent(pos) and
174-
result = "Parameter[" + getArgumentPositionCsv(pos) + "]"
174+
result = "Parameter[" + getArgumentPosition(pos) + "]"
175175
)
176176
or
177177
exists(ParameterPosition pos |
178178
sc = TArgumentSummaryComponent(pos) and
179-
result = "Argument[" + getParameterPositionCsv(pos) + "]"
179+
result = "Argument[" + getParameterPosition(pos) + "]"
180180
)
181181
or
182182
sc = TReturnSummaryComponent(getReturnValueKind()) and result = "ReturnValue"
183183
)
184184
}
185185

186186
/** Gets a textual representation of this stack used for flow summaries. */
187-
string getComponentStackCsv(SummaryComponentStack stack) {
187+
string getComponentStack(SummaryComponentStack stack) {
188188
exists(SummaryComponent head, SummaryComponentStack tail |
189189
head = stack.head() and
190190
tail = stack.tail() and
191-
result = getComponentStackCsv(tail) + "." + getComponentCsv(head)
191+
result = getComponentStack(tail) + "." + getComponent(head)
192192
)
193193
or
194194
exists(SummaryComponent c |
195195
stack = TSingletonSummaryComponentStack(c) and
196-
result = getComponentCsv(c)
196+
result = getComponent(c)
197197
)
198198
}
199199

@@ -1217,8 +1217,8 @@ module Private {
12171217
c.relevantSummary(input, output, preservesValue) and
12181218
csv =
12191219
c.getCallableCsv() // Callable information
1220-
+ getComponentStackCsv(input) + ";" // input
1221-
+ getComponentStackCsv(output) + ";" // output
1220+
+ getComponentStack(input) + ";" // input
1221+
+ getComponentStack(output) + ";" // output
12221222
+ renderKind(preservesValue) + ";" // kind
12231223
+ renderProvenance(c) // provenance
12241224
)

‎java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ SummaryComponent interpretComponentSpecific(AccessPathToken c) {
171171
}
172172

173173
/** Gets the summary component for specification component `c`, if any. */
174-
private string getContentSpecificCsv(Content c) {
174+
private string getContentSpecific(Content c) {
175175
exists(Field f, string package, string className, string fieldName |
176176
f = c.(FieldContent).getField() and
177177
f.hasQualifiedName(package, className, fieldName) and
@@ -192,15 +192,15 @@ private string getContentSpecificCsv(Content c) {
192192
}
193193

194194
/** Gets the textual representation of the content in the format used for flow summaries. */
195-
string getComponentSpecificCsv(SummaryComponent sc) {
196-
exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecificCsv(c))
195+
string getComponentSpecific(SummaryComponent sc) {
196+
exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecific(c))
197197
}
198198

199199
/** Gets the textual representation of a parameter position in the format used for flow summaries. */
200-
string getParameterPositionCsv(ParameterPosition pos) { result = pos.toString() }
200+
string getParameterPosition(ParameterPosition pos) { result = pos.toString() }
201201

202202
/** Gets the textual representation of an argument position in the format used for flow summaries. */
203-
string getArgumentPositionCsv(ArgumentPosition pos) { result = pos.toString() }
203+
string getArgumentPosition(ArgumentPosition pos) { result = pos.toString() }
204204

205205
/** Holds if input specification component `c` needs a reference. */
206206
predicate inputNeedsReferenceSpecific(string c) { none() }

‎java/ql/src/Telemetry/ExternalApi.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ExternalApi extends Callable {
4444
ExternalApi() { not this.fromSource() and not isUninteresting(this) }
4545

4646
/**
47-
* Gets information about the external API in the form expected by the CSV modeling framework.
47+
* Gets information about the external API in the form expected by the MaD modeling framework.
4848
*/
4949
string getApiName() {
5050
result =

‎javascript/ql/lib/semmle/javascript/frameworks/data/ModelsAsData.qll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import Shared::ModelInput as ModelInput
2323
import Shared::ModelOutput as ModelOutput
2424

2525
/**
26-
* A remote flow source originating from a CSV source row.
26+
* A remote flow source originating from a MaD source row.
2727
*/
28-
private class RemoteFlowSourceFromCsv extends RemoteFlowSource {
29-
RemoteFlowSourceFromCsv() { this = ModelOutput::getASourceNode("remote").asSource() }
28+
private class RemoteFlowSourceFromMaD extends RemoteFlowSource {
29+
RemoteFlowSourceFromMaD() { this = ModelOutput::getASourceNode("remote").asSource() }
3030

3131
override string getSourceType() { result = "Remote flow" }
3232
}

‎python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,41 +159,41 @@ module Public {
159159
SummaryComponentStack return(ReturnKind rk) { result = singleton(SummaryComponent::return(rk)) }
160160
}
161161

162-
private predicate noComponentSpecificCsv(SummaryComponent sc) {
163-
not exists(getComponentSpecificCsv(sc))
162+
private predicate noComponentSpecific(SummaryComponent sc) {
163+
not exists(getComponentSpecific(sc))
164164
}
165165

166166
/** Gets a textual representation of this component used for flow summaries. */
167-
private string getComponentCsv(SummaryComponent sc) {
168-
result = getComponentSpecificCsv(sc)
167+
private string getComponent(SummaryComponent sc) {
168+
result = getComponentSpecific(sc)
169169
or
170-
noComponentSpecificCsv(sc) and
170+
noComponentSpecific(sc) and
171171
(
172172
exists(ArgumentPosition pos |
173173
sc = TParameterSummaryComponent(pos) and
174-
result = "Parameter[" + getArgumentPositionCsv(pos) + "]"
174+
result = "Parameter[" + getArgumentPosition(pos) + "]"
175175
)
176176
or
177177
exists(ParameterPosition pos |
178178
sc = TArgumentSummaryComponent(pos) and
179-
result = "Argument[" + getParameterPositionCsv(pos) + "]"
179+
result = "Argument[" + getParameterPosition(pos) + "]"
180180
)
181181
or
182182
sc = TReturnSummaryComponent(getReturnValueKind()) and result = "ReturnValue"
183183
)
184184
}
185185

186186
/** Gets a textual representation of this stack used for flow summaries. */
187-
string getComponentStackCsv(SummaryComponentStack stack) {
187+
string getComponentStack(SummaryComponentStack stack) {
188188
exists(SummaryComponent head, SummaryComponentStack tail |
189189
head = stack.head() and
190190
tail = stack.tail() and
191-
result = getComponentStackCsv(tail) + "." + getComponentCsv(head)
191+
result = getComponentStack(tail) + "." + getComponent(head)
192192
)
193193
or
194194
exists(SummaryComponent c |
195195
stack = TSingletonSummaryComponentStack(c) and
196-
result = getComponentCsv(c)
196+
result = getComponent(c)
197197
)
198198
}
199199

@@ -1217,8 +1217,8 @@ module Private {
12171217
c.relevantSummary(input, output, preservesValue) and
12181218
csv =
12191219
c.getCallableCsv() // Callable information
1220-
+ getComponentStackCsv(input) + ";" // input
1221-
+ getComponentStackCsv(output) + ";" // output
1220+
+ getComponentStack(input) + ";" // input
1221+
+ getComponentStack(output) + ";" // output
12221222
+ renderKind(preservesValue) + ";" // kind
12231223
+ renderProvenance(c) // provenance
12241224
)

‎python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImplSpecific.qll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,16 @@ SummaryComponent interpretComponentSpecific(AccessPathToken c) {
108108
}
109109

110110
/** Gets the textual representation of a summary component in the format used for flow summaries. */
111-
string getComponentSpecificCsv(SummaryComponent sc) {
111+
string getComponentSpecific(SummaryComponent sc) {
112112
sc = TContentSummaryComponent(any(ListElementContent c)) and
113113
result = "ListElement"
114114
}
115115

116116
/** Gets the textual representation of a parameter position in the format used for flow summaries. */
117-
string getParameterPositionCsv(ParameterPosition pos) { result = pos.toString() }
117+
string getParameterPosition(ParameterPosition pos) { result = pos.toString() }
118118

119119
/** Gets the textual representation of an argument position in the format used for flow summaries. */
120-
string getArgumentPositionCsv(ArgumentPosition pos) { result = pos.toString() }
120+
string getArgumentPosition(ArgumentPosition pos) { result = pos.toString() }
121121

122122
/** Holds if input specification component `c` needs a reference. */
123123
predicate inputNeedsReferenceSpecific(string c) { none() }

0 commit comments

Comments
 (0)