Use occursInRegex more ccnsistently throughout

joefarebrother · joefarebrother · commit 5ba6bafbef98 · 2022-05-04T15:41:37.000+01:00
diff --git a/java/ql/lib/semmle/code/java/regex/RegexTreeView.qll b/java/ql/lib/semmle/code/java/regex/RegexTreeView.qll
@@ -246,9 +246,7 @@ class RegExpQuantifier extends RegExpTerm, TRegExpQuantifier {
 
   override RegExpTerm getChild(int i) {
     i = 0 and
-    result.getRegex() = re and
-    result.getStart() = start and
-    result.getEnd() = part_end
+    result.occursInRegex(re, start, part_end)
   }
 
   /** Holds if this term may match an unlimited number of times. */
@@ -396,9 +394,9 @@ private RegExpTerm seqChild(Regex re, int start, int end, int i) {
     )
     or
     i > 0 and
-    exists(int itemStart | itemStart = seqChildEnd(re, start, end, i - 1) |
-      re.item(itemStart, result.getEnd()) and
-      result.occursInRegex(re, itemStart, _)
+    exists(int itemStart, int itemEnd | itemStart = seqChildEnd(re, start, end, i - 1) |
+      re.item(itemStart, itemEnd) and
+      result.occursInRegex(re, itemStart, itemEnd)
     )
   )
 }
@@ -417,20 +415,17 @@ class RegExpAlt extends RegExpTerm, TRegExpAlt {
 
   override RegExpTerm getChild(int i) {
     i = 0 and
-    result.getRegex() = re and
-    result.getStart() = start and
     exists(int part_end |
       re.alternationOption(start, end, start, part_end) and
-      result.getEnd() = part_end
+      result.occursInRegex(re, start, part_end)
     )
     or
     i > 0 and
-    result.getRegex() = re and
-    exists(int part_start |
+    exists(int part_start, int part_end |
       part_start = this.getChild(i - 1).getEnd() + 1 // allow for the |
     |
-      result.getStart() = part_start and
-      re.alternationOption(start, end, part_start, result.getEnd())
+      re.alternationOption(start, end, part_start, part_end) and
+      result.occursInRegex(re, part_start, part_end)
     )
   }
 
@@ -651,9 +646,9 @@ class RegExpCharacterClass extends RegExpTerm, TRegExpCharacterClass {
     )
     or
     i > 0 and
-    exists(int itemStart | itemStart = this.getChild(i - 1).getEnd() |
-      result.occursInRegex(re, itemStart, _) and
-      re.charSetChild(start, itemStart, result.getEnd())
+    exists(int itemStart, int itemEnd | itemStart = this.getChild(i - 1).getEnd() |
+      result.occursInRegex(re, itemStart, itemEnd) and
+      re.charSetChild(start, itemStart, itemEnd)
     )
   }
 
@@ -686,14 +681,10 @@ class RegExpCharacterRange extends RegExpTerm, TRegExpCharacterRange {
 
   override RegExpTerm getChild(int i) {
     i = 0 and
-    result.getRegex() = re and
-    result.getStart() = start and
-    result.getEnd() = lower_end
+    result.occursInRegex(re, start, lower_end)
     or
     i = 1 and
-    result.getRegex() = re and
-    result.getStart() = upper_start and
-    result.getEnd() = end
+    result.occursInRegex(re, upper_start, end)
   }
 
   override string getPrimaryQLClass() { result = "RegExpCharacterRange" }
@@ -816,9 +807,10 @@ class RegExpGroup extends RegExpTerm, TRegExpGroup {
   string getName() { result = re.getGroupName(start, end) }
 
   override RegExpTerm getChild(int i) {
-    result.getRegex() = re and
     i = 0 and
-    re.groupContents(start, end, result.getStart(), result.getEnd())
+    exists(int in_start, int in_end | re.groupContents(start, end, in_start, in_end) |
+      result.occursInRegex(re, in_start, in_end)
+    )
   }
 
   override string getPrimaryQLClass() { result = "RegExpGroup" }
@@ -946,9 +938,7 @@ class RegExpSubPattern extends RegExpZeroWidthMatch {
   /** Gets the lookahead term. */
   RegExpTerm getOperand() {
     exists(int in_start, int in_end | re.groupContents(start, end, in_start, in_end) |
-      result.getRegex() = re and
-      result.getStart() = in_start and
-      result.getEnd() = in_end
+      result.occursInRegex(re, in_start, in_end)
     )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -246,9 +246,7 @@ class RegExpQuantifier extends RegExpTerm, TRegExpQuantifier {`
`246`	`246`
`247`	`247`	`override RegExpTerm getChild(int i) {`
`248`	`248`	`i = 0 and`
`249`		`- result.getRegex() = re and`
`250`		`- result.getStart() = start and`
`251`		`- result.getEnd() = part_end`
	`249`	`+ result.occursInRegex(re, start, part_end)`
`252`	`250`	`}`
`253`	`251`
`254`	`252`	`/** Holds if this term may match an unlimited number of times. */`
`@@ -396,9 +394,9 @@ private RegExpTerm seqChild(Regex re, int start, int end, int i) {`
`396`	`394`	`)`
`397`	`395`	`or`
`398`	`396`	`i > 0 and`
`399`		`- exists(int itemStart \| itemStart = seqChildEnd(re, start, end, i - 1) \|`
`400`		`- re.item(itemStart, result.getEnd()) and`
`401`		`- result.occursInRegex(re, itemStart, _)`
	`397`	`+ exists(int itemStart, int itemEnd \| itemStart = seqChildEnd(re, start, end, i - 1) \|`
	`398`	`+ re.item(itemStart, itemEnd) and`
	`399`	`+ result.occursInRegex(re, itemStart, itemEnd)`
`402`	`400`	`)`
`403`	`401`	`)`
`404`	`402`	`}`
`@@ -417,20 +415,17 @@ class RegExpAlt extends RegExpTerm, TRegExpAlt {`
`417`	`415`
`418`	`416`	`override RegExpTerm getChild(int i) {`
`419`	`417`	`i = 0 and`
`420`		`- result.getRegex() = re and`
`421`		`- result.getStart() = start and`
`422`	`418`	`exists(int part_end \|`
`423`	`419`	`re.alternationOption(start, end, start, part_end) and`
`424`		`- result.getEnd() = part_end`
	`420`	`+ result.occursInRegex(re, start, part_end)`
`425`	`421`	`)`
`426`	`422`	`or`
`427`	`423`	`i > 0 and`
`428`		`- result.getRegex() = re and`
`429`		`- exists(int part_start \|`
	`424`	`+ exists(int part_start, int part_end \|`
`430`	`425`	`part_start = this.getChild(i - 1).getEnd() + 1 // allow for the \|`
`431`	`426`	`\|`
`432`		`- result.getStart() = part_start and`
`433`		`- re.alternationOption(start, end, part_start, result.getEnd())`
	`427`	`+ re.alternationOption(start, end, part_start, part_end) and`
	`428`	`+ result.occursInRegex(re, part_start, part_end)`
`434`	`429`	`)`
`435`	`430`	`}`
`436`	`431`
`@@ -651,9 +646,9 @@ class RegExpCharacterClass extends RegExpTerm, TRegExpCharacterClass {`
`651`	`646`	`)`
`652`	`647`	`or`
`653`	`648`	`i > 0 and`
`654`		`- exists(int itemStart \| itemStart = this.getChild(i - 1).getEnd() \|`
`655`		`- result.occursInRegex(re, itemStart, _) and`
`656`		`- re.charSetChild(start, itemStart, result.getEnd())`
	`649`	`+ exists(int itemStart, int itemEnd \| itemStart = this.getChild(i - 1).getEnd() \|`
	`650`	`+ result.occursInRegex(re, itemStart, itemEnd) and`
	`651`	`+ re.charSetChild(start, itemStart, itemEnd)`
`657`	`652`	`)`
`658`	`653`	`}`
`659`	`654`
`@@ -686,14 +681,10 @@ class RegExpCharacterRange extends RegExpTerm, TRegExpCharacterRange {`
`686`	`681`
`687`	`682`	`override RegExpTerm getChild(int i) {`
`688`	`683`	`i = 0 and`
`689`		`- result.getRegex() = re and`
`690`		`- result.getStart() = start and`
`691`		`- result.getEnd() = lower_end`
	`684`	`+ result.occursInRegex(re, start, lower_end)`
`692`	`685`	`or`
`693`	`686`	`i = 1 and`
`694`		`- result.getRegex() = re and`
`695`		`- result.getStart() = upper_start and`
`696`		`- result.getEnd() = end`
	`687`	`+ result.occursInRegex(re, upper_start, end)`
`697`	`688`	`}`
`698`	`689`
`699`	`690`	`override string getPrimaryQLClass() { result = "RegExpCharacterRange" }`
`@@ -816,9 +807,10 @@ class RegExpGroup extends RegExpTerm, TRegExpGroup {`
`816`	`807`	`string getName() { result = re.getGroupName(start, end) }`
`817`	`808`
`818`	`809`	`override RegExpTerm getChild(int i) {`
`819`		`- result.getRegex() = re and`
`820`	`810`	`i = 0 and`
`821`		`- re.groupContents(start, end, result.getStart(), result.getEnd())`
	`811`	`+ exists(int in_start, int in_end \| re.groupContents(start, end, in_start, in_end) \|`
	`812`	`+ result.occursInRegex(re, in_start, in_end)`
	`813`	`+ )`
`822`	`814`	`}`
`823`	`815`
`824`	`816`	`override string getPrimaryQLClass() { result = "RegExpGroup" }`
`@@ -946,9 +938,7 @@ class RegExpSubPattern extends RegExpZeroWidthMatch {`
`946`	`938`	`/** Gets the lookahead term. */`
`947`	`939`	`RegExpTerm getOperand() {`
`948`	`940`	`exists(int in_start, int in_end \| re.groupContents(start, end, in_start, in_end) \|`
`949`		`- result.getRegex() = re and`
`950`		`- result.getStart() = in_start and`
`951`		`- result.getEnd() = in_end`
	`941`	`+ result.occursInRegex(re, in_start, in_end)`
`952`	`942`	`)`
`953`	`943`	`}`
`954`	`944`	`}`