Skip to content

Commit a7fdc4b

Browse files
owen-mcowen-mc
committed
Replace acceptingvalue with acceptingValue 
1 parent b3285c6 commit a7fdc4b

File tree

16 files changed

+67
-67
lines changed

16 files changed

+67
-67
lines changed

‎cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* - Barriers:
1414
* `namespace; type; subtypes; name; signature; ext; output; kind; provenance`
1515
* - BarrierGuards:
16-
* `namespace; type; subtypes; name; signature; ext; input; acceptingvalue; kind; provenance`
16+
* `namespace; type; subtypes; name; signature; ext; input; acceptingValue; kind; provenance`
1717
*
1818
* The interpretation of a row is similar to API-graphs with a left-to-right
1919
* reading.
@@ -90,7 +90,7 @@
9090
* value, and
9191
* - flow from the _second_ indirection of the 0th argument to the first
9292
* indirection of the return value, etc.
93-
* 8. The `acceptingvalue` column of barrier guard models specifies the condition
93+
* 8. The `acceptingValue` column of barrier guard models specifies the condition
9494
* under which the guard blocks flow. It can be one of "true" or "false". In
9595
* the future "no-exception", "not-zero", "null", "not-null" may be supported.
9696
* 9. The `kind` column is a tag that can be referenced from QL to determine to
@@ -1089,13 +1089,13 @@ private module Cached {
10891089

10901090
private predicate barrierGuardChecks(IRGuardCondition g, Expr e, boolean gv, TKindModelPair kmp) {
10911091
exists(
1092-
SourceSinkInterpretationInput::InterpretNode n, Public::AcceptingValue acceptingvalue,
1092+
SourceSinkInterpretationInput::InterpretNode n, Public::AcceptingValue acceptingValue,
10931093
string kind, string model
10941094
|
1095-
isBarrierGuardNode(n, acceptingvalue, kind, model) and
1095+
isBarrierGuardNode(n, acceptingValue, kind, model) and
10961096
n.asNode().asExpr() = e and
10971097
kmp = TMkPair(kind, model) and
1098-
gv = convertAcceptingValue(acceptingvalue).asBooleanValue() and
1098+
gv = convertAcceptingValue(acceptingValue).asBooleanValue() and
10991099
n.asNode().(Private::ArgumentNode).getCall().asCallInstruction() = g
11001100
)
11011101
}
@@ -1112,14 +1112,14 @@ private module Cached {
11121112
) {
11131113
exists(
11141114
SourceSinkInterpretationInput::InterpretNode interpretNode,
1115-
Public::AcceptingValue acceptingvalue, string kind, string model, int indirectionIndex,
1115+
Public::AcceptingValue acceptingValue, string kind, string model, int indirectionIndex,
11161116
Private::ArgumentNode arg
11171117
|
1118-
isBarrierGuardNode(interpretNode, acceptingvalue, kind, model) and
1118+
isBarrierGuardNode(interpretNode, acceptingValue, kind, model) and
11191119
arg = interpretNode.asNode() and
11201120
arg.asIndirectExpr(indirectionIndex) = e and
11211121
kmp = MkKindModelPairIntPair(TMkPair(kind, model), indirectionIndex) and
1122-
gv = convertAcceptingValue(acceptingvalue).asBooleanValue() and
1122+
gv = convertAcceptingValue(acceptingValue).asBooleanValue() and
11231123
arg.getCall().asCallInstruction() = g
11241124
)
11251125
}

‎cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extensible predicate barrierModel(
3333
*/
3434
extensible predicate barrierGuardModel(
3535
string namespace, string type, boolean subtypes, string name, string signature, string ext,
36-
string input, string acceptingvalue, string kind, string provenance, QlBuiltins::ExtensionId madId
36+
string input, string acceptingValue, string kind, string provenance, QlBuiltins::ExtensionId madId
3737
);
3838

3939
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ module SourceSinkInterpretationInput implements
162162
}
163163

164164
predicate barrierGuardElement(
165-
Element e, string input, Public::AcceptingValue acceptingvalue, string kind,
165+
Element e, string input, Public::AcceptingValue acceptingValue, string kind,
166166
Public::Provenance provenance, string model
167167
) {
168168
exists(
169169
string package, string type, boolean subtypes, string name, string signature, string ext
170170
|
171-
barrierGuardModel(package, type, subtypes, name, signature, ext, input, acceptingvalue, kind,
171+
barrierGuardModel(package, type, subtypes, name, signature, ext, input, acceptingValue, kind,
172172
provenance, model) and
173173
e = interpretElement(package, type, subtypes, name, signature, ext)
174174
)

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* - Barriers:
1515
* `namespace; type; subtypes; name; signature; ext; output; kind; provenance`
1616
* - BarrierGuards:
17-
* `namespace; type; subtypes; name; signature; ext; input; acceptingvalue; kind; provenance`
17+
* `namespace; type; subtypes; name; signature; ext; input; acceptingValue; kind; provenance`
1818
* - Neutrals:
1919
* `namespace; type; name; signature; kind; provenance`
2020
* A neutral is used to indicate that a callable is neutral with respect to flow (no summary), source (is not a source) or sink (is not a sink).
@@ -73,7 +73,7 @@
7373
* - "Field[f]": Selects the contents of field `f`.
7474
* - "Property[p]": Selects the contents of property `p`.
7575
*
76-
* 8. The `acceptingvalue` column of barrier guard models specifies the condition
76+
* 8. The `acceptingValue` column of barrier guard models specifies the condition
7777
* under which the guard blocks flow. It can be one of "true" or "false". In
7878
* the future "no-exception", "not-zero", "null", "not-null" may be supported.
7979
* 9. The `kind` column is a tag that can be referenced from QL to determine to
@@ -237,11 +237,11 @@ module ModelValidation {
237237
result = "Unrecognized provenance description \"" + provenance + "\" in " + pred + " model."
238238
)
239239
or
240-
exists(string acceptingvalue |
241-
barrierGuardModel(_, _, _, _, _, _, _, acceptingvalue, _, _, _) and
242-
invalidAcceptingValue(acceptingvalue) and
240+
exists(string acceptingValue |
241+
barrierGuardModel(_, _, _, _, _, _, _, acceptingValue, _, _, _) and
242+
invalidAcceptingValue(acceptingValue) and
243243
result =
244-
"Unrecognized accepting value description \"" + acceptingvalue +
244+
"Unrecognized accepting value description \"" + acceptingValue +
245245
"\" in barrier guard model."
246246
)
247247
}
@@ -489,13 +489,13 @@ private module Cached {
489489

490490
private predicate barrierGuardChecks(Guard g, Expr e, GuardValue gv, TKindModelPair kmp) {
491491
exists(
492-
SourceSinkInterpretationInput::InterpretNode n, AcceptingValue acceptingvalue, string kind,
492+
SourceSinkInterpretationInput::InterpretNode n, AcceptingValue acceptingValue, string kind,
493493
string model
494494
|
495-
isBarrierGuardNode(n, acceptingvalue, kind, model) and
495+
isBarrierGuardNode(n, acceptingValue, kind, model) and
496496
n.asNode().asExpr() = e and
497497
kmp = TMkPair(kind, model) and
498-
gv = convertAcceptingValue(acceptingvalue)
498+
gv = convertAcceptingValue(acceptingValue)
499499
|
500500
g.(Call).getAnArgument() = e or g.(QualifiableExpr).getQualifier() = e
501501
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extensible predicate barrierModel(
3333
*/
3434
extensible predicate barrierGuardModel(
3535
string namespace, string type, boolean subtypes, string name, string signature, string ext,
36-
string input, string acceptingvalue, string kind, string provenance, QlBuiltins::ExtensionId madId
36+
string input, string acceptingValue, string kind, string provenance, QlBuiltins::ExtensionId madId
3737
);
3838

3939
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,13 @@ module SourceSinkInterpretationInput implements
253253
}
254254

255255
predicate barrierGuardElement(
256-
Element e, string input, Public::AcceptingValue acceptingvalue, string kind,
256+
Element e, string input, Public::AcceptingValue acceptingValue, string kind,
257257
Public::Provenance provenance, string model
258258
) {
259259
exists(
260260
string namespace, string type, boolean subtypes, string name, string signature, string ext
261261
|
262-
barrierGuardModel(namespace, type, subtypes, name, signature, ext, input, acceptingvalue,
262+
barrierGuardModel(namespace, type, subtypes, name, signature, ext, input, acceptingValue,
263263
kind, provenance, model) and
264264
e = interpretElement(namespace, type, subtypes, name, signature, ext, _)
265265
)

‎go/ql/lib/semmle/go/dataflow/ExternalFlow.qll‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* - Barriers:
1515
* `package; type; subtypes; name; signature; ext; output; kind; provenance`
1616
* - BarrierGuards:
17-
* `package; type; subtypes; name; signature; ext; input; acceptingvalue; kind; provenance`
17+
* `package; type; subtypes; name; signature; ext; input; acceptingValue; kind; provenance`
1818
* - Neutrals:
1919
* `package; type; name; signature; kind; provenance`
2020
* A neutral is used to indicate that a callable is neutral with respect to flow (no summary), source (is not a source) or sink (is not a sink).
@@ -82,7 +82,7 @@
8282
* - "MapValue": Selects a value in a map.
8383
* - "Dereference": Selects the value referenced by a pointer.
8484
*
85-
* 8. The `acceptingvalue` column of barrier guard models specifies the condition
85+
* 8. The `acceptingValue` column of barrier guard models specifies the condition
8686
* under which the guard blocks flow. It can be one of "true" or "false". In
8787
* the future "no-exception", "not-zero", "null", "not-null" may be supported.
8888
* 9. The `kind` column is a tag that can be referenced from QL to determine to
@@ -266,11 +266,11 @@ module ModelValidation {
266266
result = "Unrecognized provenance description \"" + provenance + "\" in " + pred + " model."
267267
)
268268
or
269-
exists(string acceptingvalue |
270-
barrierGuardModel(_, _, _, _, _, _, _, acceptingvalue, _, _, _) and
271-
invalidAcceptingValue(acceptingvalue) and
269+
exists(string acceptingValue |
270+
barrierGuardModel(_, _, _, _, _, _, _, acceptingValue, _, _, _) and
271+
invalidAcceptingValue(acceptingValue) and
272272
result =
273-
"Unrecognized accepting value description \"" + acceptingvalue +
273+
"Unrecognized accepting value description \"" + acceptingValue +
274274
"\" in barrier guard model."
275275
)
276276
}
@@ -478,13 +478,13 @@ private module Cached {
478478

479479
private predicate barrierGuardChecks(DataFlow::Node g, Expr e, boolean gv, TKindModelPair kmp) {
480480
exists(
481-
SourceSinkInterpretationInput::InterpretNode n, Public::AcceptingValue acceptingvalue,
481+
SourceSinkInterpretationInput::InterpretNode n, Public::AcceptingValue acceptingValue,
482482
string kind, string model
483483
|
484-
isBarrierGuardNode(n, acceptingvalue, kind, model) and
484+
isBarrierGuardNode(n, acceptingValue, kind, model) and
485485
n.asNode().asExpr() = e and
486486
kmp = TMkPair(kind, model) and
487-
gv = convertAcceptingValue(acceptingvalue)
487+
gv = convertAcceptingValue(acceptingValue)
488488
|
489489
g.asExpr().(CallExpr).getAnArgument() = e // TODO: qualifier?
490490
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extensible predicate barrierModel(
3535
*/
3636
extensible predicate barrierGuardModel(
3737
string package, string type, boolean subtypes, string name, string signature, string ext,
38-
string input, string acceptingvalue, string kind, string provenance, QlBuiltins::ExtensionId madId
38+
string input, string acceptingValue, string kind, string provenance, QlBuiltins::ExtensionId madId
3939
);
4040

4141
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@ module SourceSinkInterpretationInput implements
174174
}
175175

176176
predicate barrierGuardElement(
177-
Element e, string input, Public::AcceptingValue acceptingvalue, string kind,
177+
Element e, string input, Public::AcceptingValue acceptingValue, string kind,
178178
Public::Provenance provenance, string model
179179
) {
180180
exists(
181181
string package, string type, boolean subtypes, string name, string signature, string ext
182182
|
183-
barrierGuardModel(package, type, subtypes, name, signature, ext, input, acceptingvalue, kind,
183+
barrierGuardModel(package, type, subtypes, name, signature, ext, input, acceptingValue, kind,
184184
provenance, model) and
185185
e = interpretElement(package, type, subtypes, name, signature, ext)
186186
)

‎java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* - Barriers:
1515
* `package; type; subtypes; name; signature; ext; output; kind; provenance`
1616
* - BarrierGuards:
17-
* `package; type; subtypes; name; signature; ext; input; acceptingvalue; kind; provenance`
17+
* `package; type; subtypes; name; signature; ext; input; acceptingValue; kind; provenance`
1818
* - Neutrals:
1919
* `package; type; name; signature; kind; provenance`
2020
* A neutral is used to indicate that a callable is neutral with respect to flow (no summary), source (is not a source) or sink (is not a sink).
@@ -73,7 +73,7 @@
7373
* in the given range. The range is inclusive at both ends.
7474
* - "ReturnValue": Selects the return value of a call to the selected element.
7575
* - "Element": Selects the collection elements of the selected element.
76-
* 8. The `acceptingvalue` column of barrier guard models specifies the condition
76+
* 8. The `acceptingValue` column of barrier guard models specifies the condition
7777
* under which the guard blocks flow. It can be one of "true" or "false". In
7878
* the future "no-exception", "not-zero", "null", "not-null" may be supported.
7979
* 9. The `kind` column is a tag that can be referenced from QL to determine to
@@ -365,11 +365,11 @@ module ModelValidation {
365365
result = "Unrecognized provenance description \"" + provenance + "\" in " + pred + " model."
366366
)
367367
or
368-
exists(string acceptingvalue |
369-
barrierGuardModel(_, _, _, _, _, _, _, acceptingvalue, _, _, _) and
370-
invalidAcceptingValue(acceptingvalue) and
368+
exists(string acceptingValue |
369+
barrierGuardModel(_, _, _, _, _, _, _, acceptingValue, _, _, _) and
370+
invalidAcceptingValue(acceptingValue) and
371371
result =
372-
"Unrecognized accepting value description \"" + acceptingvalue +
372+
"Unrecognized accepting value description \"" + acceptingValue +
373373
"\" in barrier guard model."
374374
)
375375
}
@@ -590,13 +590,13 @@ private module Cached {
590590

591591
private predicate barrierGuardChecks(Guard g, Expr e, GuardValue gv, TKindModelPair kmp) {
592592
exists(
593-
SourceSinkInterpretationInput::InterpretNode n, AcceptingValue acceptingvalue, string kind,
593+
SourceSinkInterpretationInput::InterpretNode n, AcceptingValue acceptingValue, string kind,
594594
string model
595595
|
596-
isBarrierGuardNode(n, acceptingvalue, kind, model) and
596+
isBarrierGuardNode(n, acceptingValue, kind, model) and
597597
n.asNode().asExpr() = e and
598598
kmp = TMkPair(kind, model) and
599-
gv = convertAcceptingValue(acceptingvalue)
599+
gv = convertAcceptingValue(acceptingValue)
600600
|
601601
g.(Call).getAnArgument() = e or g.(MethodCall).getQualifier() = e
602602
)

0 commit comments

Comments
 (0)