Swift: Fix QL-for-QL warnings.

Author: geoffw0

swift/ql/lib/codeql/swift/regex/internal/ParseRegex.qll

@@ -193,9 +193,9 @@ abstract class RegExp extends Expr {
   }
 
   /**
-   * Holds if the character set starting at `charset_start` contains a character range
-   * with lower bound found between `start` and `lower_end`
-   * and upper bound found between `upper_start` and `end`.
+   * Holds if the character set starting at `charsetStart` contains a character range
+   * with lower bound found between `start` and `lowerEnd`
+   * and upper bound found between `upperStart` and `end`.
    */
   predicate charRange(int charsetStart, int start, int lowerEnd, int upperStart, int end) {
     exists(int index |
@@ -841,11 +841,11 @@ abstract class RegExp extends Expr {
   }
 
   /**
-   * Holds if a qualified part is found between `start` and `part_end` and the qualifier is
+   * Holds if a qualified part is found between `start` and `partEnd` and the qualifier is
    * found between `part_end` and `end`.
    *
-   * `maybe_empty` is true if the part is optional.
-   * `may_repeat_forever` is true if the part may be repeated unboundedly.
+   * `maybeEmpty` is true if the part is optional.
+   * `mayRepeatForever` is true if the part may be repeated unboundedly.
    */
   predicate qualifiedPart(
     int start, int partEnd, int end, boolean maybeEmpty, boolean mayRepeatForever

swift/ql/test/library-tests/regex/regex.ql

@@ -12,8 +12,8 @@ module RegexTest implements TestSig {
   string getARelevantTag() { result = ["regex", "input", "redos-vulnerable", "hasParseFailure"] }
 
   predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(TreeView::RegExpTerm t, string pump, State s, string prefixMsg |
-      hasReDoSResult(t, pump, s, prefixMsg) and
+    exists(TreeView::RegExpTerm t |
+      hasReDoSResult(t, _, _, _) and
       location = t.getLocation() and
       element = t.toString() and
       tag = "redos-vulnerable" and