Skip to content

Commit de2e92d

Browse files
committed
Swift: remove / delimiters from regex extracted patterns
1 parent fb5b6ea commit de2e92d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

swift/extractor/translators/ExprTranslator.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,9 +598,12 @@ codeql::AppliedPropertyWrapperExpr ExprTranslator::translateAppliedPropertyWrapp
598598
return entry;
599599
}
600600

601-
codeql::RegexLiteralExpr ExprTranslator::translateRegexLiteralExpr(const swift::RegexLiteralExpr& expr) {
601+
codeql::RegexLiteralExpr ExprTranslator::translateRegexLiteralExpr(
602+
const swift::RegexLiteralExpr& expr) {
602603
auto entry = createExprEntry(expr);
603-
entry.pattern = expr.getRegexText().str();
604+
auto pattern = expr.getRegexText();
605+
// the pattern has enclosing '/' delimiters, we'd rather get it without
606+
entry.pattern = pattern.substr(1, pattern.size() - 2);
604607
entry.version = expr.getVersion();
605608
return entry;
606609
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| regex.swift:3:5:3:5 | ... | hasType: | yes | getPattern: | /a.*a/ | getVersion: | 1 |
2-
| regex.swift:4:5:4:5 | ... | hasType: | yes | getPattern: | /the number (\\d+)/ | getVersion: | 1 |
1+
| regex.swift:3:5:3:5 | ... | hasType: | yes | getPattern: | a.*a | getVersion: | 1 |
2+
| regex.swift:4:5:4:5 | ... | hasType: | yes | getPattern: | the number (\\d+) | getVersion: | 1 |

0 commit comments

Comments
 (0)