Merge pull request #10950 from github/redsun82/swift-regex

Swift: extract `RegexLiteralExpr`

Author: redsun82

swift/downgrades/f6a8ee8a21fb596fa84261ddedb68c00d8457ef4/old.dbscheme

@@ -0,0 +1,3 @@
+description: Revert adding full extraction of regex literal expressions
+compatibility: full
+regex_literal_exprs.rel: reorder regex_literal_exprs.rel (int id, string pattern, int version) id

swift/downgrades/f6a8ee8a21fb596fa84261ddedb68c00d8457ef4/swift.dbscheme

@@ -599,4 +599,14 @@ codeql::AppliedPropertyWrapperExpr ExprTranslator::translateAppliedPropertyWrapp
   return entry;
 }
 
+codeql::RegexLiteralExpr ExprTranslator::translateRegexLiteralExpr(
+    const swift::RegexLiteralExpr& expr) {
+  auto entry = createExprEntry(expr);
+  auto pattern = expr.getRegexText();
+  // the pattern has enclosing '/' delimiters, we'd rather get it without
+  entry.pattern = pattern.substr(1, pattern.size() - 2);
+  entry.version = expr.getVersion();
+  return entry;
+}
+
 }  // namespace codeql

swift/downgrades/f6a8ee8a21fb596fa84261ddedb68c00d8457ef4/upgrade.properties

@@ -115,6 +115,7 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
       const swift::PropertyWrapperValuePlaceholderExpr& expr);
   codeql::AppliedPropertyWrapperExpr translateAppliedPropertyWrapperExpr(
       const swift::AppliedPropertyWrapperExpr& expr);
+  codeql::RegexLiteralExpr translateRegexLiteralExpr(const swift::RegexLiteralExpr& expr);
 
  private:
   void fillAbstractClosureExpr(const swift::AbstractClosureExpr& expr,

swift/extractor/translators/ExprTranslator.cpp

@@ -0,0 +1,2 @@
+| regex.swift:1:5:1:5 | ... | getType: | Regex<Substring> | getPattern: | a.*a | getVersion: | 1 |
+| regex.swift:2:5:2:5 | ... | getType: | Regex<(Substring, Substring)> | getPattern: | the number (\\d+) | getVersion: | 1 |

swift/extractor/translators/ExprTranslator.h

@@ -0,0 +1,10 @@
+// generated by codegen/codegen.py
+import codeql.swift.elements
+
+from RegexLiteralExpr x, Type getType, string getPattern, int getVersion
+where
+  x.getLocation().getFile().getName().matches("%/regex.swift") and
+  getType = x.getType() and
+  getPattern = x.getPattern() and
+  getVersion = x.getVersion()
+select x, "getType:", getType, "getPattern:", getPattern, "getVersion:", getVersion

swift/integration-tests/linux-only/RegexLiteralExpr/RegexLiteralExpr.expected

@@ -0,0 +1,2 @@
+_ = /a.*a/
+_ = /the number (\d+)/

swift/integration-tests/linux-only/RegexLiteralExpr/RegexLiteralExpr.ql

@@ -0,0 +1,5 @@
+from create_database_utils import *
+
+run_codeql_database_create([
+    "swiftc -enable-bare-slash-regex regex.swift -o /dev/null",
+], lang="swift")

swift/integration-tests/linux-only/RegexLiteralExpr/regex.swift

@@ -34,7 +34,10 @@ def execute_test(path):
     return subprocess.run([sys.executable, "-u", path.name], cwd=path.parent).returncode == 0
 
 def skipped(test):
-    return platform.system() != "Darwin" and "osx-only" in test.parts
+    if platform.system() == "Darwin":
+        return "linux-only" in test.parts
+    else:
+        return "osx-only" in test.parts
 
 
 def main(opts):