Skip to content

Commit 079d48c

Browse files
michaelnebelmichaelnebel
committed
Sync files.
1 parent ad90e58 commit 079d48c

File tree

6 files changed

+71
-73
lines changed

6 files changed

+71
-73
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ module Public {
246246
predicate isAutoGenerated() { none() }
247247
}
248248

249-
/** A callable with a flow summary stating there is no flow via the callable. */
250-
class NegativeSummarizedCallable extends SummarizedCallableBase {
251-
NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
249+
/** A callable where there is no flow via the callable. */
250+
class NeutralCallable extends SummarizedCallableBase {
251+
NeutralCallable() { neutralElement(this, _) }
252252

253253
/**
254-
* Holds if the negative summary is auto generated.
254+
* Holds if the neutral is auto generated.
255255
*/
256-
predicate isAutoGenerated() { negativeSummaryElement(this, true) }
256+
predicate isAutoGenerated() { neutralElement(this, true) }
257257
}
258258
}
259259

@@ -1161,9 +1161,9 @@ module Private {
11611161
string toString() { result = super.toString() }
11621162
}
11631163

1164-
/** A flow summary to include in the `negativeSummary/1` query predicate. */
1165-
abstract class RelevantNegativeSummarizedCallable instanceof NegativeSummarizedCallable {
1166-
/** Gets the string representation of this callable used by `summary/1`. */
1164+
/** A model to include in the `neutral/1` query predicate. */
1165+
abstract class RelevantNeutralCallable instanceof NeutralCallable {
1166+
/** Gets the string representation of this callable used by `neutral/1`. */
11671167
abstract string getCallableCsv();
11681168

11691169
string toString() { result = super.toString() }
@@ -1180,13 +1180,13 @@ module Private {
11801180
if c.isAutoGenerated() then result = "generated" else result = "manual"
11811181
}
11821182

1183-
private string renderProvenanceNegative(NegativeSummarizedCallable c) {
1183+
private string renderProvenanceNeutral(NeutralCallable c) {
11841184
if c.isAutoGenerated() then result = "generated" else result = "manual"
11851185
}
11861186

11871187
/**
11881188
* A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
1189-
* The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance"",
1189+
* The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance",
11901190
* ext is hardcoded to empty.
11911191
*/
11921192
query predicate summary(string csv) {
@@ -1205,14 +1205,14 @@ module Private {
12051205
}
12061206

12071207
/**
1208-
* Holds if a negative flow summary `csv` exists (semi-colon separated format). Used for testing purposes.
1208+
* Holds if a neutral model `csv` exists (semi-colon separated format). Used for testing purposes.
12091209
* The syntax is: "namespace;type;name;signature;provenance"",
12101210
*/
1211-
query predicate negativeSummary(string csv) {
1212-
exists(RelevantNegativeSummarizedCallable c |
1211+
query predicate neutral(string csv) {
1212+
exists(RelevantNeutralCallable c |
12131213
csv =
12141214
c.getCallableCsv() // Callable information
1215-
+ renderProvenanceNegative(c) // provenance
1215+
+ renderProvenanceNeutral(c) // provenance
12161216
)
12171217
}
12181218
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ module Public {
246246
predicate isAutoGenerated() { none() }
247247
}
248248

249-
/** A callable with a flow summary stating there is no flow via the callable. */
250-
class NegativeSummarizedCallable extends SummarizedCallableBase {
251-
NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
249+
/** A callable where there is no flow via the callable. */
250+
class NeutralCallable extends SummarizedCallableBase {
251+
NeutralCallable() { neutralElement(this, _) }
252252

253253
/**
254-
* Holds if the negative summary is auto generated.
254+
* Holds if the neutral is auto generated.
255255
*/
256-
predicate isAutoGenerated() { negativeSummaryElement(this, true) }
256+
predicate isAutoGenerated() { neutralElement(this, true) }
257257
}
258258
}
259259

@@ -1161,9 +1161,9 @@ module Private {
11611161
string toString() { result = super.toString() }
11621162
}
11631163

1164-
/** A flow summary to include in the `negativeSummary/1` query predicate. */
1165-
abstract class RelevantNegativeSummarizedCallable instanceof NegativeSummarizedCallable {
1166-
/** Gets the string representation of this callable used by `summary/1`. */
1164+
/** A model to include in the `neutral/1` query predicate. */
1165+
abstract class RelevantNeutralCallable instanceof NeutralCallable {
1166+
/** Gets the string representation of this callable used by `neutral/1`. */
11671167
abstract string getCallableCsv();
11681168

11691169
string toString() { result = super.toString() }
@@ -1180,13 +1180,13 @@ module Private {
11801180
if c.isAutoGenerated() then result = "generated" else result = "manual"
11811181
}
11821182

1183-
private string renderProvenanceNegative(NegativeSummarizedCallable c) {
1183+
private string renderProvenanceNeutral(NeutralCallable c) {
11841184
if c.isAutoGenerated() then result = "generated" else result = "manual"
11851185
}
11861186

11871187
/**
11881188
* A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
1189-
* The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance"",
1189+
* The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance",
11901190
* ext is hardcoded to empty.
11911191
*/
11921192
query predicate summary(string csv) {
@@ -1205,14 +1205,14 @@ module Private {
12051205
}
12061206

12071207
/**
1208-
* Holds if a negative flow summary `csv` exists (semi-colon separated format). Used for testing purposes.
1208+
* Holds if a neutral model `csv` exists (semi-colon separated format). Used for testing purposes.
12091209
* The syntax is: "namespace;type;name;signature;provenance"",
12101210
*/
1211-
query predicate negativeSummary(string csv) {
1212-
exists(RelevantNegativeSummarizedCallable c |
1211+
query predicate neutral(string csv) {
1212+
exists(RelevantNeutralCallable c |
12131213
csv =
12141214
c.getCallableCsv() // Callable information
1215-
+ renderProvenanceNegative(c) // provenance
1215+
+ renderProvenanceNeutral(c) // provenance
12161216
)
12171217
}
12181218
}

‎java/ql/src/utils/modelgenerator/internal/CaptureModels.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ private string asSummaryModel(TargetApiSpecific api, string input, string output
5858
+ "generated"
5959
}
6060

61-
string asNegativeSummaryModel(TargetApiSpecific api) {
62-
result = asPartialNegativeModel(api) + "generated"
63-
}
61+
string asNeutralModel(TargetApiSpecific api) { result = asPartialNeutralModel(api) + "generated" }
6462

6563
/**
6664
* Gets the value summary model for `api` with `input` and `output`.

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ module Public {
246246
predicate isAutoGenerated() { none() }
247247
}
248248

249-
/** A callable with a flow summary stating there is no flow via the callable. */
250-
class NegativeSummarizedCallable extends SummarizedCallableBase {
251-
NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
249+
/** A callable where there is no flow via the callable. */
250+
class NeutralCallable extends SummarizedCallableBase {
251+
NeutralCallable() { neutralElement(this, _) }
252252

253253
/**
254-
* Holds if the negative summary is auto generated.
254+
* Holds if the neutral is auto generated.
255255
*/
256-
predicate isAutoGenerated() { negativeSummaryElement(this, true) }
256+
predicate isAutoGenerated() { neutralElement(this, true) }
257257
}
258258
}
259259

@@ -1161,9 +1161,9 @@ module Private {
11611161
string toString() { result = super.toString() }
11621162
}
11631163

1164-
/** A flow summary to include in the `negativeSummary/1` query predicate. */
1165-
abstract class RelevantNegativeSummarizedCallable instanceof NegativeSummarizedCallable {
1166-
/** Gets the string representation of this callable used by `summary/1`. */
1164+
/** A model to include in the `neutral/1` query predicate. */
1165+
abstract class RelevantNeutralCallable instanceof NeutralCallable {
1166+
/** Gets the string representation of this callable used by `neutral/1`. */
11671167
abstract string getCallableCsv();
11681168

11691169
string toString() { result = super.toString() }
@@ -1180,13 +1180,13 @@ module Private {
11801180
if c.isAutoGenerated() then result = "generated" else result = "manual"
11811181
}
11821182

1183-
private string renderProvenanceNegative(NegativeSummarizedCallable c) {
1183+
private string renderProvenanceNeutral(NeutralCallable c) {
11841184
if c.isAutoGenerated() then result = "generated" else result = "manual"
11851185
}
11861186

11871187
/**
11881188
* A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
1189-
* The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance"",
1189+
* The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance",
11901190
* ext is hardcoded to empty.
11911191
*/
11921192
query predicate summary(string csv) {
@@ -1205,14 +1205,14 @@ module Private {
12051205
}
12061206

12071207
/**
1208-
* Holds if a negative flow summary `csv` exists (semi-colon separated format). Used for testing purposes.
1208+
* Holds if a neutral model `csv` exists (semi-colon separated format). Used for testing purposes.
12091209
* The syntax is: "namespace;type;name;signature;provenance"",
12101210
*/
1211-
query predicate negativeSummary(string csv) {
1212-
exists(RelevantNegativeSummarizedCallable c |
1211+
query predicate neutral(string csv) {
1212+
exists(RelevantNeutralCallable c |
12131213
csv =
12141214
c.getCallableCsv() // Callable information
1215-
+ renderProvenanceNegative(c) // provenance
1215+
+ renderProvenanceNeutral(c) // provenance
12161216
)
12171217
}
12181218
}

‎ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ module Public {
246246
predicate isAutoGenerated() { none() }
247247
}
248248

249-
/** A callable with a flow summary stating there is no flow via the callable. */
250-
class NegativeSummarizedCallable extends SummarizedCallableBase {
251-
NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
249+
/** A callable where there is no flow via the callable. */
250+
class NeutralCallable extends SummarizedCallableBase {
251+
NeutralCallable() { neutralElement(this, _) }
252252

253253
/**
254-
* Holds if the negative summary is auto generated.
254+
* Holds if the neutral is auto generated.
255255
*/
256-
predicate isAutoGenerated() { negativeSummaryElement(this, true) }
256+
predicate isAutoGenerated() { neutralElement(this, true) }
257257
}
258258
}
259259

@@ -1161,9 +1161,9 @@ module Private {
11611161
string toString() { result = super.toString() }
11621162
}
11631163

1164-
/** A flow summary to include in the `negativeSummary/1` query predicate. */
1165-
abstract class RelevantNegativeSummarizedCallable instanceof NegativeSummarizedCallable {
1166-
/** Gets the string representation of this callable used by `summary/1`. */
1164+
/** A model to include in the `neutral/1` query predicate. */
1165+
abstract class RelevantNeutralCallable instanceof NeutralCallable {
1166+
/** Gets the string representation of this callable used by `neutral/1`. */
11671167
abstract string getCallableCsv();
11681168

11691169
string toString() { result = super.toString() }
@@ -1180,13 +1180,13 @@ module Private {
11801180
if c.isAutoGenerated() then result = "generated" else result = "manual"
11811181
}
11821182

1183-
private string renderProvenanceNegative(NegativeSummarizedCallable c) {
1183+
private string renderProvenanceNeutral(NeutralCallable c) {
11841184
if c.isAutoGenerated() then result = "generated" else result = "manual"
11851185
}
11861186

11871187
/**
11881188
* A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
1189-
* The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance"",
1189+
* The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance",
11901190
* ext is hardcoded to empty.
11911191
*/
11921192
query predicate summary(string csv) {
@@ -1205,14 +1205,14 @@ module Private {
12051205
}
12061206

12071207
/**
1208-
* Holds if a negative flow summary `csv` exists (semi-colon separated format). Used for testing purposes.
1208+
* Holds if a neutral model `csv` exists (semi-colon separated format). Used for testing purposes.
12091209
* The syntax is: "namespace;type;name;signature;provenance"",
12101210
*/
1211-
query predicate negativeSummary(string csv) {
1212-
exists(RelevantNegativeSummarizedCallable c |
1211+
query predicate neutral(string csv) {
1212+
exists(RelevantNeutralCallable c |
12131213
csv =
12141214
c.getCallableCsv() // Callable information
1215-
+ renderProvenanceNegative(c) // provenance
1215+
+ renderProvenanceNeutral(c) // provenance
12161216
)
12171217
}
12181218
}

‎swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ module Public {
246246
predicate isAutoGenerated() { none() }
247247
}
248248

249-
/** A callable with a flow summary stating there is no flow via the callable. */
250-
class NegativeSummarizedCallable extends SummarizedCallableBase {
251-
NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
249+
/** A callable where there is no flow via the callable. */
250+
class NeutralCallable extends SummarizedCallableBase {
251+
NeutralCallable() { neutralElement(this, _) }
252252

253253
/**
254-
* Holds if the negative summary is auto generated.
254+
* Holds if the neutral is auto generated.
255255
*/
256-
predicate isAutoGenerated() { negativeSummaryElement(this, true) }
256+
predicate isAutoGenerated() { neutralElement(this, true) }
257257
}
258258
}
259259

@@ -1161,9 +1161,9 @@ module Private {
11611161
string toString() { result = super.toString() }
11621162
}
11631163

1164-
/** A flow summary to include in the `negativeSummary/1` query predicate. */
1165-
abstract class RelevantNegativeSummarizedCallable instanceof NegativeSummarizedCallable {
1166-
/** Gets the string representation of this callable used by `summary/1`. */
1164+
/** A model to include in the `neutral/1` query predicate. */
1165+
abstract class RelevantNeutralCallable instanceof NeutralCallable {
1166+
/** Gets the string representation of this callable used by `neutral/1`. */
11671167
abstract string getCallableCsv();
11681168

11691169
string toString() { result = super.toString() }
@@ -1180,13 +1180,13 @@ module Private {
11801180
if c.isAutoGenerated() then result = "generated" else result = "manual"
11811181
}
11821182

1183-
private string renderProvenanceNegative(NegativeSummarizedCallable c) {
1183+
private string renderProvenanceNeutral(NeutralCallable c) {
11841184
if c.isAutoGenerated() then result = "generated" else result = "manual"
11851185
}
11861186

11871187
/**
11881188
* A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
1189-
* The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance"",
1189+
* The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance",
11901190
* ext is hardcoded to empty.
11911191
*/
11921192
query predicate summary(string csv) {
@@ -1205,14 +1205,14 @@ module Private {
12051205
}
12061206

12071207
/**
1208-
* Holds if a negative flow summary `csv` exists (semi-colon separated format). Used for testing purposes.
1208+
* Holds if a neutral model `csv` exists (semi-colon separated format). Used for testing purposes.
12091209
* The syntax is: "namespace;type;name;signature;provenance"",
12101210
*/
1211-
query predicate negativeSummary(string csv) {
1212-
exists(RelevantNegativeSummarizedCallable c |
1211+
query predicate neutral(string csv) {
1212+
exists(RelevantNeutralCallable c |
12131213
csv =
12141214
c.getCallableCsv() // Callable information
1215-
+ renderProvenanceNegative(c) // provenance
1215+
+ renderProvenanceNeutral(c) // provenance
12161216
)
12171217
}
12181218
}

0 commit comments

Comments
 (0)