mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

string: Allow zero-length matches in all REGEX subcommands

Browse Source 
The semantics mimic other languages like Python, Java, JS, etc.
To advance past a zero-length match, the search algorithm first
tries to find a non-zero alternative branch. If that fails, it
force-advances by 1 character.

Fixes: #13790, #13792, #18690, #26629
This commit is contained in:
Nikita Nemkin
2025-02-14 22:13:19 +05:00
parent ca65fa9a7f
commit 8d455809b0
8 changed files with 181 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmStringCommand.cxx
+14 -20
View File
@@ -251,15 +251,7 @@ bool RegexMatch(std::vector<std::string> const& args,
std::string output;
if (re.find(input)) {
status.GetMakefile().StoreMatches(re);
std::string::size_type l = re.start();
std::string::size_type r = re.end();
if (r - l == 0) {
std::string e = "sub-command REGEX, mode MATCH regex \"" + regex +
"\" matched an empty string.";
status.SetError(e);
return false;
}
output = input.substr(l, r - l);
output = re.match();
}
// Store the output in the provided variable.
@@ -298,22 +290,24 @@ bool RegexMatchAll(std::vector<std::string> const& args,
// Scan through the input for all matches.
std::string output;
std::string::size_type base = 0;
while (re.find(input, base, optAnchor)) {
unsigned optNonEmpty = 0;
while (re.find(input, base, optAnchor | optNonEmpty)) {
status.GetMakefile().ClearMatches();
status.GetMakefile().StoreMatches(re);
std::string::size_type l = re.start();
std::string::size_type r = re.end();
if (r - l == 0) {
std::string e = "sub-command REGEX, mode MATCHALL regex \"" + regex +
"\" matched an empty string.";
status.SetError(e);
return false;
}
if (!output.empty()) {
if (!output.empty() || optNonEmpty) {
output += ";";
}
output += re.match();
base = r;
base = re.end();
if (re.start() == input.length()) {
break;
}
if (re.start() == re.end()) {
optNonEmpty = cmsys::RegularExpression::NONEMPTY_AT_OFFSET;
} else {
optNonEmpty = 0;
}
}
// Store the output in the provided variable.