Use explicit this

joefarebrother · joefarebrother · commit ca422a2186e4 · 2022-05-04T15:41:33.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
@@ -495,7 +495,7 @@ class RegExpEscape extends RegExpNormalChar {
   /**
    * Holds if this is a unicode escape.
    */
-  private predicate isUnicode() { this.getText().prefix(2) = "\\u" }
+  private predicate isUnicode() { this.getText().matches("\\u%") }
 
   /**
    * Gets the unicode char for this escape.
diff --git a/java/ql/lib/semmle/code/java/regex/regex.qll b/java/ql/lib/semmle/code/java/regex/regex.qll
@@ -21,7 +21,7 @@ abstract class RegexString extends Expr {
   private predicate char_set_end0(int pos) {
     this.nonEscapedCharAt(pos) = "]" and
     /* special case: `[]]` and `[^]]` are valid char classes.  */
-    not char_set_start0(_, pos - 1)
+    not this.char_set_start0(_, pos - 1)
   }
 
   /**
@@ -64,7 +64,7 @@ abstract class RegexString extends Expr {
       end = inner_end + 1 and
       inner_end > inner_start and
       this.char_set_end(inner_end) and
-      not exists(int mid | char_set_end(mid) | mid > inner_start and mid < inner_end)
+      not exists(int mid | this.char_set_end(mid) | mid > inner_start and mid < inner_end)
     )
   }
 
@@ -304,7 +304,7 @@ abstract class RegexString extends Expr {
       // 16-bit hex value \uhhhh
       this.getChar(start + 1) = "u" and end = start + 6
       or
-      escapedBraces(start, end)
+      this.escapedBraces(start, end)
       or
       // Boundry matchers \b, \b{g}
       this.getChar(start + 1) = "b" and
