Revert "Merge to upstream r304942."

This reverts commit 83b1388ecd, reversing
changes made to f20819f925.

Test: treehugger
Bug: None
This commit is contained in:
Dan Albert
2018-01-11 10:41:39 -08:00
parent ef7d5b4347
commit 38a0d5af7e
1110 changed files with 15077 additions and 19371 deletions

View File

@@ -25,329 +25,307 @@
#include <codecvt>
#include <cassert>
template <class CharT, size_t = sizeof(CharT)>
struct TestHelper;
template <class CharT>
struct TestHelper<CharT, 2> {
static void test();
};
template <class CharT>
struct TestHelper<CharT, 4> {
static void test();
};
int main()
{
{
typedef std::codecvt_utf16<wchar_t> C;
C c;
wchar_t w = 0x40003;
char n[4] = {0};
const wchar_t* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+4);
assert(n[0] == char(0xD8));
assert(n[1] == char(0xC0));
assert(n[2] == char(0xDC));
assert(n[3] == char(0x03));
template <class CharT>
void TestHelper<CharT, 2>::test() {
// Nothing to do, the conversion in unsupported
}
template <class CharT>
void TestHelper<CharT, 4>::test() {
{
typedef std::codecvt_utf16<CharT> C;
C c;
CharT w = 0x40003;
char n[4] = {0};
const CharT* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 4);
assert(n[0] == char(0xD8));
assert(n[1] == char(0xC0));
assert(n[2] == char(0xDC));
assert(n[3] == char(0x03));
w = 0x1005;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 2);
assert(n[0] == char(0x10));
assert(n[1] == char(0x05));
assert(n[2] == char(0xDC));
assert(n[3] == char(0x03));
w = 0x453;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 2);
assert(n[0] == char(0x04));
assert(n[1] == char(0x53));
assert(n[2] == char(0xDC));
assert(n[3] == char(0x03));
w = 0x56;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 2);
assert(n[0] == char(0x00));
assert(n[1] == char(0x56));
assert(n[2] == char(0xDC));
assert(n[3] == char(0x03));
}
{
typedef std::codecvt_utf16<CharT, 0x1000> C;
C c;
CharT w = 0x40003;
char n[4] = {0};
const CharT* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::error);
assert(wp == &w);
assert(np == n);
assert(n[0] == char(0));
assert(n[1] == char(0));
assert(n[2] == char(0));
assert(n[3] == char(0));
w = 0x1005;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::error);
assert(wp == &w);
assert(np == n);
assert(n[0] == char(0));
assert(n[1] == char(0));
assert(n[2] == char(0));
assert(n[3] == char(0));
w = 0x453;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 2);
assert(n[0] == char(0x04));
assert(n[1] == char(0x53));
assert(n[2] == char(0));
assert(n[3] == char(0));
w = 0x56;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 2);
assert(n[0] == char(0x00));
assert(n[1] == char(0x56));
assert(n[2] == char(0));
assert(n[3] == char(0));
}
{
typedef std::codecvt_utf16<CharT, 0x10ffff, std::generate_header> C;
C c;
CharT w = 0x40003;
char n[6] = {0};
const CharT* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w + 1, wp, n, n + 6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 6);
assert(n[0] == char(0xFE));
assert(n[1] == char(0xFF));
assert(n[2] == char(0xD8));
assert(n[3] == char(0xC0));
assert(n[4] == char(0xDC));
assert(n[5] == char(0x03));
w = 0x1005;
r = c.out(m, &w, &w + 1, wp, n, n + 6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 4);
assert(n[0] == char(0xFE));
assert(n[1] == char(0xFF));
assert(n[2] == char(0x10));
assert(n[3] == char(0x05));
assert(n[4] == char(0xDC));
assert(n[5] == char(0x03));
w = 0x453;
r = c.out(m, &w, &w + 1, wp, n, n + 6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 4);
assert(n[0] == char(0xFE));
assert(n[1] == char(0xFF));
assert(n[2] == char(0x04));
assert(n[3] == char(0x53));
assert(n[4] == char(0xDC));
assert(n[5] == char(0x03));
w = 0x56;
r = c.out(m, &w, &w + 1, wp, n, n + 6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 4);
assert(n[0] == char(0xFE));
assert(n[1] == char(0xFF));
assert(n[2] == char(0x00));
assert(n[3] == char(0x56));
assert(n[4] == char(0xDC));
assert(n[5] == char(0x03));
}
{
typedef std::codecvt_utf16<CharT, 0x10FFFF, std::little_endian> C;
C c;
CharT w = 0x40003;
char n[4] = {0};
const CharT* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 4);
assert(n[1] == char(0xD8));
assert(n[0] == char(0xC0));
assert(n[3] == char(0xDC));
assert(n[2] == char(0x03));
w = 0x1005;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 2);
assert(n[1] == char(0x10));
assert(n[0] == char(0x05));
assert(n[3] == char(0xDC));
assert(n[2] == char(0x03));
w = 0x453;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 2);
assert(n[1] == char(0x04));
assert(n[0] == char(0x53));
assert(n[3] == char(0xDC));
assert(n[2] == char(0x03));
w = 0x56;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 2);
assert(n[1] == char(0x00));
assert(n[0] == char(0x56));
assert(n[3] == char(0xDC));
assert(n[2] == char(0x03));
}
{
typedef std::codecvt_utf16<CharT, 0x1000, std::little_endian> C;
C c;
CharT w = 0x40003;
char n[4] = {0};
const CharT* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::error);
assert(wp == &w);
assert(np == n);
assert(n[1] == char(0));
assert(n[0] == char(0));
assert(n[3] == char(0));
assert(n[2] == char(0));
w = 0x1005;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::error);
assert(wp == &w);
assert(np == n);
assert(n[1] == char(0));
assert(n[0] == char(0));
assert(n[3] == char(0));
assert(n[2] == char(0));
w = 0x453;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 2);
assert(n[1] == char(0x04));
assert(n[0] == char(0x53));
assert(n[3] == char(0));
assert(n[2] == char(0));
w = 0x56;
r = c.out(m, &w, &w + 1, wp, n, n + 4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 2);
assert(n[1] == char(0x00));
assert(n[0] == char(0x56));
assert(n[3] == char(0));
assert(n[2] == char(0));
}
{
typedef std::codecvt_utf16<CharT, 0x10ffff,
std::codecvt_mode(std::generate_header |
std::little_endian)>
C;
C c;
CharT w = 0x40003;
char n[6] = {0};
const CharT* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w + 1, wp, n, n + 6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 6);
assert(n[1] == char(0xFE));
assert(n[0] == char(0xFF));
assert(n[3] == char(0xD8));
assert(n[2] == char(0xC0));
assert(n[5] == char(0xDC));
assert(n[4] == char(0x03));
w = 0x1005;
r = c.out(m, &w, &w + 1, wp, n, n + 6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 4);
assert(n[1] == char(0xFE));
assert(n[0] == char(0xFF));
assert(n[3] == char(0x10));
assert(n[2] == char(0x05));
assert(n[5] == char(0xDC));
assert(n[4] == char(0x03));
w = 0x453;
r = c.out(m, &w, &w + 1, wp, n, n + 6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 4);
assert(n[1] == char(0xFE));
assert(n[0] == char(0xFF));
assert(n[3] == char(0x04));
assert(n[2] == char(0x53));
assert(n[5] == char(0xDC));
assert(n[4] == char(0x03));
w = 0x56;
r = c.out(m, &w, &w + 1, wp, n, n + 6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w + 1);
assert(np == n + 4);
assert(n[1] == char(0xFE));
assert(n[0] == char(0xFF));
assert(n[3] == char(0x00));
assert(n[2] == char(0x56));
assert(n[5] == char(0xDC));
assert(n[4] == char(0x03));
}
}
int main() {
TestHelper<char32_t>::test();
TestHelper<wchar_t>::test();
w = 0x1005;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+2);
assert(n[0] == char(0x10));
assert(n[1] == char(0x05));
assert(n[2] == char(0xDC));
assert(n[3] == char(0x03));
w = 0x453;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+2);
assert(n[0] == char(0x04));
assert(n[1] == char(0x53));
assert(n[2] == char(0xDC));
assert(n[3] == char(0x03));
w = 0x56;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+2);
assert(n[0] == char(0x00));
assert(n[1] == char(0x56));
assert(n[2] == char(0xDC));
assert(n[3] == char(0x03));
}
{
typedef std::codecvt_utf16<wchar_t, 0x1000> C;
C c;
wchar_t w = 0x40003;
char n[4] = {0};
const wchar_t* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::error);
assert(wp == &w);
assert(np == n);
assert(n[0] == char(0));
assert(n[1] == char(0));
assert(n[2] == char(0));
assert(n[3] == char(0));
w = 0x1005;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::error);
assert(wp == &w);
assert(np == n);
assert(n[0] == char(0));
assert(n[1] == char(0));
assert(n[2] == char(0));
assert(n[3] == char(0));
w = 0x453;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+2);
assert(n[0] == char(0x04));
assert(n[1] == char(0x53));
assert(n[2] == char(0));
assert(n[3] == char(0));
w = 0x56;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+2);
assert(n[0] == char(0x00));
assert(n[1] == char(0x56));
assert(n[2] == char(0));
assert(n[3] == char(0));
}
{
typedef std::codecvt_utf16<wchar_t, 0x10ffff, std::generate_header> C;
C c;
wchar_t w = 0x40003;
char n[6] = {0};
const wchar_t* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w+1, wp, n, n+6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+6);
assert(n[0] == char(0xFE));
assert(n[1] == char(0xFF));
assert(n[2] == char(0xD8));
assert(n[3] == char(0xC0));
assert(n[4] == char(0xDC));
assert(n[5] == char(0x03));
w = 0x1005;
r = c.out(m, &w, &w+1, wp, n, n+6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+4);
assert(n[0] == char(0xFE));
assert(n[1] == char(0xFF));
assert(n[2] == char(0x10));
assert(n[3] == char(0x05));
assert(n[4] == char(0xDC));
assert(n[5] == char(0x03));
w = 0x453;
r = c.out(m, &w, &w+1, wp, n, n+6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+4);
assert(n[0] == char(0xFE));
assert(n[1] == char(0xFF));
assert(n[2] == char(0x04));
assert(n[3] == char(0x53));
assert(n[4] == char(0xDC));
assert(n[5] == char(0x03));
w = 0x56;
r = c.out(m, &w, &w+1, wp, n, n+6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+4);
assert(n[0] == char(0xFE));
assert(n[1] == char(0xFF));
assert(n[2] == char(0x00));
assert(n[3] == char(0x56));
assert(n[4] == char(0xDC));
assert(n[5] == char(0x03));
}
{
typedef std::codecvt_utf16<wchar_t, 0x10FFFF, std::little_endian> C;
C c;
wchar_t w = 0x40003;
char n[4] = {0};
const wchar_t* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+4);
assert(n[1] == char(0xD8));
assert(n[0] == char(0xC0));
assert(n[3] == char(0xDC));
assert(n[2] == char(0x03));
w = 0x1005;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+2);
assert(n[1] == char(0x10));
assert(n[0] == char(0x05));
assert(n[3] == char(0xDC));
assert(n[2] == char(0x03));
w = 0x453;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+2);
assert(n[1] == char(0x04));
assert(n[0] == char(0x53));
assert(n[3] == char(0xDC));
assert(n[2] == char(0x03));
w = 0x56;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+2);
assert(n[1] == char(0x00));
assert(n[0] == char(0x56));
assert(n[3] == char(0xDC));
assert(n[2] == char(0x03));
}
{
typedef std::codecvt_utf16<wchar_t, 0x1000, std::little_endian> C;
C c;
wchar_t w = 0x40003;
char n[4] = {0};
const wchar_t* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::error);
assert(wp == &w);
assert(np == n);
assert(n[1] == char(0));
assert(n[0] == char(0));
assert(n[3] == char(0));
assert(n[2] == char(0));
w = 0x1005;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::error);
assert(wp == &w);
assert(np == n);
assert(n[1] == char(0));
assert(n[0] == char(0));
assert(n[3] == char(0));
assert(n[2] == char(0));
w = 0x453;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+2);
assert(n[1] == char(0x04));
assert(n[0] == char(0x53));
assert(n[3] == char(0));
assert(n[2] == char(0));
w = 0x56;
r = c.out(m, &w, &w+1, wp, n, n+4, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+2);
assert(n[1] == char(0x00));
assert(n[0] == char(0x56));
assert(n[3] == char(0));
assert(n[2] == char(0));
}
{
typedef std::codecvt_utf16<wchar_t, 0x10ffff, std::codecvt_mode(
std::generate_header |
std::little_endian)> C;
C c;
wchar_t w = 0x40003;
char n[6] = {0};
const wchar_t* wp = nullptr;
std::mbstate_t m;
char* np = nullptr;
std::codecvt_base::result r = c.out(m, &w, &w+1, wp, n, n+6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+6);
assert(n[1] == char(0xFE));
assert(n[0] == char(0xFF));
assert(n[3] == char(0xD8));
assert(n[2] == char(0xC0));
assert(n[5] == char(0xDC));
assert(n[4] == char(0x03));
w = 0x1005;
r = c.out(m, &w, &w+1, wp, n, n+6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+4);
assert(n[1] == char(0xFE));
assert(n[0] == char(0xFF));
assert(n[3] == char(0x10));
assert(n[2] == char(0x05));
assert(n[5] == char(0xDC));
assert(n[4] == char(0x03));
w = 0x453;
r = c.out(m, &w, &w+1, wp, n, n+6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+4);
assert(n[1] == char(0xFE));
assert(n[0] == char(0xFF));
assert(n[3] == char(0x04));
assert(n[2] == char(0x53));
assert(n[5] == char(0xDC));
assert(n[4] == char(0x03));
w = 0x56;
r = c.out(m, &w, &w+1, wp, n, n+6, np);
assert(r == std::codecvt_base::ok);
assert(wp == &w+1);
assert(np == n+4);
assert(n[1] == char(0xFE));
assert(n[0] == char(0xFF));
assert(n[3] == char(0x00));
assert(n[2] == char(0x56));
assert(n[5] == char(0xDC));
assert(n[4] == char(0x03));
}
}