@@ -34,39 +34,27 @@ class OptionalTypeTrackerContent extends DataFlowPrivate::TOptionalContentSet {
3434 }
3535}
3636
37- private newtype TContentFilter =
38- MkElementFilter ( ) or
39- MkPairValueFilter ( )
37+ private newtype TContentFilter = MkElementFilter ( )
4038
4139/**
4240 * A label to use for `WithContent` and `WithoutContent` steps, restricting
4341 * which `ContentSet` may pass through.
4442 */
4543class ContentFilter extends TContentFilter {
4644 /** Gets a string representation of this content filter. */
47- string toString ( ) {
48- this = MkElementFilter ( ) and result = "elements"
49- or
50- this = MkPairValueFilter ( ) and result = "pair value"
51- }
45+ string toString ( ) { this = MkElementFilter ( ) and result = "elements" }
5246
5347 /** Gets the content of a type-tracker that matches this filter. */
5448 TypeTrackerContent getAMatchingContent ( ) {
5549 this = MkElementFilter ( ) and
5650 result .getAReadContent ( ) instanceof DataFlow:: Content:: ElementContent
57- or
58- this = MkPairValueFilter ( ) and
59- result .getAReadContent ( ) instanceof DataFlow:: Content:: PairValueContent
6051 }
6152}
6253
6354/** Module for getting `ContentFilter` values. */
6455module ContentFilter {
6556 /** Gets the filter that only allow element contents. */
6657 ContentFilter hasElements ( ) { result = MkElementFilter ( ) }
67-
68- /** Gets the filter that only allow pair-value contents. */
69- ContentFilter hasPairValue ( ) { result = MkPairValueFilter ( ) }
7058}
7159
7260/**
@@ -396,9 +384,6 @@ private ContentFilter getFilterFromWithoutContentStep(DataFlow::ContentSet conte
396384 content .isSingleton ( any ( DataFlow:: Content:: UnknownElementContent c ) )
397385 ) and
398386 result = MkElementFilter ( )
399- or
400- content .isSingleton ( any ( DataFlow:: Content:: UnknownPairValueContent c ) ) and
401- result = MkPairValueFilter ( )
402387}
403388
404389pragma [ nomagic]
@@ -435,9 +420,6 @@ private ContentFilter getFilterFromWithContentStep(DataFlow::ContentSet content)
435420 content .isSingleton ( any ( DataFlow:: Content:: ElementContent c ) )
436421 ) and
437422 result = MkElementFilter ( )
438- or
439- content .isSingleton ( any ( DataFlow:: Content:: PairValueContent c ) ) and
440- result = MkPairValueFilter ( )
441423}
442424
443425pragma [ nomagic]
0 commit comments