Revert "Merge to upstream r304942."
This reverts commit83b1388ecd, reversing changes made tof20819f925. Test: treehugger Bug: None
This commit is contained in:
@@ -26,8 +26,7 @@
|
||||
|
||||
int main()
|
||||
{
|
||||
#if 0
|
||||
{
|
||||
/* {
|
||||
std::cmatch m;
|
||||
const char s[] = "a";
|
||||
assert(std::regex_match(s, m, std::regex("a", std::regex_constants::awk)));
|
||||
@@ -264,7 +263,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -279,7 +278,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -294,7 +293,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -327,7 +326,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -342,7 +341,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -357,7 +356,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -379,7 +378,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -395,7 +394,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -411,7 +410,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
assert(m.length(1) == 4);
|
||||
@@ -435,7 +434,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -520,7 +519,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -543,7 +542,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -573,7 +572,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -589,7 +588,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -605,7 +604,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -617,23 +616,24 @@ int main()
|
||||
assert(m.size() == 0);
|
||||
}
|
||||
std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2));
|
||||
{
|
||||
*/ {
|
||||
/*
|
||||
std::cmatch m;
|
||||
const char s[] = "m";
|
||||
assert(std::regex_match(s, m,
|
||||
std::regex("[a[=M=]z]", std::regex_constants::awk)));
|
||||
assert(m.size() == 1);
|
||||
assert(std::regex_match(s, m, std::regex("[a[=M=]z]",
|
||||
std::regex_constants::awk);
|
||||
assert(m.size() == 1);
|
||||
assert(!m.prefix().matched);
|
||||
assert(m.prefix().first == s);
|
||||
assert(m.prefix().second == m[0].first);
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
{
|
||||
*/ }
|
||||
/* {
|
||||
std::cmatch m;
|
||||
const char s[] = "Ch";
|
||||
assert(std::regex_match(s, m, std::regex("[a[.ch.]z]",
|
||||
@@ -645,7 +645,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -688,7 +688,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == 4);
|
||||
assert(m.length(0) == 4);
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -704,7 +704,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == s + std::char_traits<char>::length(s));
|
||||
assert((size_t)m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.length(0) == std::char_traits<char>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -720,7 +720,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == s+1);
|
||||
assert((size_t)m.length(0) == 1);
|
||||
assert(m.length(0) == 1);
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == L"a");
|
||||
}
|
||||
@@ -735,7 +735,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == s+2);
|
||||
assert((size_t)m.length(0) == 2);
|
||||
assert(m.length(0) == 2);
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == L"ab");
|
||||
}
|
||||
@@ -945,7 +945,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -960,7 +960,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -975,7 +975,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1008,7 +1008,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1023,7 +1023,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1038,7 +1038,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1060,7 +1060,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1076,7 +1076,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1092,7 +1092,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
assert(m.length(1) == 4);
|
||||
@@ -1116,7 +1116,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1201,7 +1201,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1224,7 +1224,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1254,7 +1254,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1270,7 +1270,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1286,7 +1286,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1310,7 +1310,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1326,7 +1326,7 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == m[0].second);
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
@@ -1385,9 +1385,8 @@ int main()
|
||||
assert(!m.suffix().matched);
|
||||
assert(m.suffix().first == m[0].second);
|
||||
assert(m.suffix().second == s + std::char_traits<wchar_t>::length(s));
|
||||
assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.length(0) == std::char_traits<wchar_t>::length(s));
|
||||
assert(m.position(0) == 0);
|
||||
assert(m.str(0) == s);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
*/}
|
||||
|
||||
Reference in New Issue
Block a user