LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re.results.form: Format out-of-range subexpression references as null

Browse Source 
Rather than crashing in match_results::format() when a reference to a
marked subexpression is out of range, format the subexpression as empty
(i.e., replace it with an empty string).  Note that
match_results::operator[]() has a range-check and returns a null match
in this case, so this just re-uses that logic.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@259682 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith
2016-02-03 19:30:20 +00:00
parent d118e3219b
commit e784f5770f
2 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
test/std/re/re.results/re.results.form/form1.pass.cpp
View File

@@ -35,6 +35,31 @@ int main()
assert(r == out + 58);
assert(std::string(out) == "prefix: ab, match: cdefghi, suffix: jk, m[1]: efg, m[2]: e");
}
{
std::match_results<const char*> m;
const char s[] = "abcdefghijk";
assert(std::regex_search(s, m, std::regex("cd((e)fg)hi",
std::regex_constants::nosubs)));
char out[100] = {0};
const char fmt[] = "prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2";
char* r = m.format(output_iterator<char*>(out),
fmt, fmt + std::char_traits<char>::length(fmt)).base();
assert(r == out + 54);
assert(std::string(out) == "prefix: ab, match: cdefghi, suffix: jk, m[1]: , m[2]: ");
}
{
std::match_results<const char*> m;
const char s[] = "abcdefghijk";
assert(std::regex_search(s, m, std::regex("cdefghi")));
char out[100] = {0};
const char fmt[] = "prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2";
char* r = m.format(output_iterator<char*>(out),
fmt, fmt + std::char_traits<char>::length(fmt)).base();
assert(r == out + 54);
assert(std::string(out) == "prefix: ab, match: cdefghi, suffix: jk, m[1]: , m[2]: ");
}
{
std::match_results<const char*> m;
const char s[] = "abcdefghijk";
@@ -61,6 +86,33 @@ int main()
assert(r == out + 34);
assert(std::string(out) == "match: cdefghi, m[1]: efg, m[2]: e");
}
{
std::match_results<const char*> m;
const char s[] = "abcdefghijk";
assert(std::regex_search(s, m, std::regex("cd((e)fg)hi",
std::regex_constants::nosubs)));
char out[100] = {0};
const char fmt[] = "match: &, m[1]: \\1, m[2]: \\2";
char* r = m.format(output_iterator<char*>(out),
fmt, fmt + std::char_traits<char>::length(fmt),
std::regex_constants::format_sed).base();
assert(r == out + 30);
assert(std::string(out) == "match: cdefghi, m[1]: , m[2]: ");
}
{
std::match_results<const char*> m;
const char s[] = "abcdefghijk";
assert(std::regex_search(s, m, std::regex("cdefghi")));
char out[100] = {0};
const char fmt[] = "match: &, m[1]: \\1, m[2]: \\2";
char* r = m.format(output_iterator<char*>(out),
fmt, fmt + std::char_traits<char>::length(fmt),
std::regex_constants::format_sed).base();
assert(r == out + 30);
assert(std::string(out) == "match: cdefghi, m[1]: , m[2]: ");
}
{
std::match_results<const wchar_t*> m;