Swift: Clean up and autoformat.

Author: geoffw0

swift/ql/lib/codeql/swift/regex/Regex.qll

@@ -68,13 +68,19 @@ newtype TRegexParseMode =
   MkUnicode() // Unicode UAX 29 word boundary mode
 
 class RegexParseMode extends TRegexParseMode {
-  string toString() {
-    (this = MkIgnoreCase() and result = "IGNORECASE") or
-    (this = MkVerbose() and result = "VERBOSE") or
-    (this = MkDotAll() and result = "DOTALL") or
-    (this = MkMultiLine() and result = "MULTILINE") or
-    (this = MkUnicode() and result = "UNICODE")
+  string getName() {
+    this = MkIgnoreCase() and result = "IGNORECASE"
+    or
+    this = MkVerbose() and result = "VERBOSE"
+    or
+    this = MkDotAll() and result = "DOTALL"
+    or
+    this = MkMultiLine() and result = "MULTILINE"
+    or
+    this = MkUnicode() and result = "UNICODE"
   }
+
+  string toString() { result = this.getName() }
 }
 
 /**
@@ -91,7 +97,9 @@ class RegexAdditionalFlowStep extends Unit {
    * Holds if the step from `node1` to `node2` either sets (`isSet` = true)
    * or unsets (`isSet` = false) parse mode `mode` for the regular expression.
    */
-  abstract predicate modifiesParseMode(DataFlow::Node nodeFrom, DataFlow::Node nodeTo, RegexParseMode mode, boolean isSet);
+  abstract predicate modifiesParseMode(
+    DataFlow::Node nodeFrom, DataFlow::Node nodeTo, RegexParseMode mode, boolean isSet
+  );
 }
 
 /**
@@ -102,29 +110,27 @@ class StandardRegexAdditionalFlowStep extends RegexAdditionalFlowStep {
     this.modifiesParseMode(nodeFrom, nodeTo, _, _)
   }
 
-  override predicate modifiesParseMode(DataFlow::Node nodeFrom, DataFlow::Node nodeTo, RegexParseMode mode, boolean isSet)
-  {
+  override predicate modifiesParseMode(
+    DataFlow::Node nodeFrom, DataFlow::Node nodeTo, RegexParseMode mode, boolean isSet
+  ) {
     exists(CallExpr ce |
       nodeFrom.asExpr() = ce.getQualifier() and
       nodeTo.asExpr() = ce and
       // decode the parse mode being set
       (
-        (
-          ce.getStaticTarget().(Method).hasQualifiedName("Regex", "ignoresCase(_:)") and
-          mode = MkIgnoreCase()
-        ) or (
-          ce.getStaticTarget().(Method).hasQualifiedName("Regex", "dotMatchesNewlines(_:)") and
-          mode = MkDotAll()
-        ) or (
-          ce.getStaticTarget().(Method).hasQualifiedName("Regex", "anchorsMatchLineEndings(_:)") and
-          mode = MkMultiLine()
-        )
+        ce.getStaticTarget().(Method).hasQualifiedName("Regex", "ignoresCase(_:)") and
+        mode = MkIgnoreCase()
+        or
+        ce.getStaticTarget().(Method).hasQualifiedName("Regex", "dotMatchesNewlines(_:)") and
+        mode = MkDotAll()
+        or
+        ce.getStaticTarget().(Method).hasQualifiedName("Regex", "anchorsMatchLineEndings(_:)") and
+        mode = MkMultiLine()
       ) and
       // decode the value being set
-      if ce.getArgument(0).getExpr().(BooleanLiteralExpr).getValue() = false then
-        isSet = false // mode is set to false
-      else
-        isSet = true // mode is set to true OR mode is set to default (=true) OR mode is set to an unknown value
+      if ce.getArgument(0).getExpr().(BooleanLiteralExpr).getValue() = false
+      then isSet = false // mode is set to false
+      else isSet = true // mode is set to true OR mode is set to default (=true) OR mode is set to an unknown value
     )
   }
 }
@@ -168,9 +174,8 @@ abstract class RegexEval extends CallExpr {
   RegexParseMode getAParseMode() {
     exists(DataFlow::Node setNode |
       // parse mode flag is set
-      any(RegexAdditionalFlowStep s).modifiesParseMode(_, setNode, result, true)
-      and
-      // reaches here
+      any(RegexAdditionalFlowStep s).modifiesParseMode(_, setNode, result, true) and
+      // reaches this eval
       RegexParseModeFlow::flow(setNode, DataFlow::exprNode(this.getRegexInput()))
     )
   }

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

@@ -319,7 +319,8 @@ abstract class RegExp extends Expr {
   }
 
   /**
-   * Gets a mode (if any) of this regular expression. Can be any of:
+   * Gets a mode (if any) of this regular expression in any evaluation. Can be
+   * any of:
    * IGNORECASE
    * VERBOSE
    * DOTALL
@@ -333,7 +334,7 @@ abstract class RegExp extends Expr {
     // mode flags applied to the regex object before evaluation
     exists(RegexEval e |
       e.getARegex() = this and
-      result = e.getAParseMode().toString() // TODO: temp toString()
+      result = e.getAParseMode().getName()
     )
   }
 

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

@@ -66,14 +66,11 @@ private module RegexParseModeConfig implements DataFlow::StateConfigSig {
 
   predicate isSink(DataFlow::Node node, FlowState flowstate) {
     // evaluation of the regex
-    node.asExpr() = any(RegexEval eval).getRegexInput()
-    and
+    node.asExpr() = any(RegexEval eval).getRegexInput() and
     flowstate = any(FlowState fs)
   }
 
-  predicate isBarrier(DataFlow::Node node) {
-    none()
-  }
+  predicate isBarrier(DataFlow::Node node) { none() }
 
   predicate isBarrier(DataFlow::Node node, FlowState flowstate) {
     // parse mode flag is set or unset