From: Kris Van Hees Date: Fri, 18 Jul 2008 22:37:42 +0000 (+0000) Subject: utf-array.C: Fix broken merge/checkin. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=911c34a6b8847f14fb533488caca8d0f57a285d9;p=gcc.git utf-array.C: Fix broken merge/checkin. 2008-07-18 Kris Van Hees * g++.dg/ext/utf-array.C: Fix broken merge/checkin. * g++.dg/ext/utf-array-short-wchar.C: Idem * gcc.dg/utf-array.c: Idem * gcc.dg/utf-array-short-wchar.c: Idem From-SVN: r137970 --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 17adb437053..338edcd9dee 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2008-07-18 Kris Van Hees + + * g++.dg/ext/utf-array.C: Fix broken merge/checkin. + * g++.dg/ext/utf-array-short-wchar.C: Idem + * gcc.dg/utf-array.c: Idem + * gcc.dg/utf-array-short-wchar.c: Idem + 2008-07-18 Joseph Myers * gcc.dg/fshort-wchar.c: Use -Wl,--no-wchar-size-warning on @@ -13,6 +20,13 @@ PR c++/36407 * g++.dg/conversion/op5.C: New testcase. +2008-07-18 Kris Van Hees + + * g++.dg/ext/utf-array.C: Fix broken merge/checkin. + * g++.dg/ext/utf-array-short-wchar.C: Idem + * gcc.dg/utf-array.c: Idem + * gcc.dg/utf-array-short-wchar.c: Idem + 2008-07-18 Kris Van Hees Tests for char16_t and char32_t support. diff --git a/gcc/testsuite/g++.dg/ext/utf-array-short-wchar.C b/gcc/testsuite/g++.dg/ext/utf-array-short-wchar.C index 7d768d307a6..43ae508d64d 100644 --- a/gcc/testsuite/g++.dg/ext/utf-array-short-wchar.C +++ b/gcc/testsuite/g++.dg/ext/utf-array-short-wchar.C @@ -34,39 +34,3 @@ const wchar_t sw_0[] = "ab"; /* { dg-error "from non-wide" } */ const wchar_t sw_1[] = u"ab"; /* { dg-error "from incompatible" } */ const wchar_t sw_2[] = U"ab"; /* { dg-error "from incompatible" } */ const wchar_t sw_3[] = L"ab"; -/* Contributed by Kris Van Hees */ -/* Expected errors for char16_t/char32_t string literals. */ -/* { dg-do compile } */ -/* { dg-options "-std=c++0x -fshort-wchar" } */ - -const char s_0[] = "ab"; -const char s_1[] = u"ab"; /* { dg-error "from wide string" } */ -const char s_2[] = U"ab"; /* { dg-error "from wide string" } */ -const char s_3[] = L"ab"; /* { dg-error "from wide string" } */ - -const char16_t s16_0[] = "ab"; /* { dg-error "from non-wide" } */ -const char16_t s16_1[] = u"ab"; -const char16_t s16_2[] = U"ab"; /* { dg-error "from incompatible" } */ -const char16_t s16_3[] = L"ab"; /* { dg-error "from incompatible" } */ - -const char16_t s16_4[0] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s16_5[1] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s16_6[2] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s16_7[3] = u"ab"; -const char16_t s16_8[4] = u"ab"; - -const char32_t s32_0[] = "ab"; /* { dg-error "from non-wide" } */ -const char32_t s32_1[] = u"ab"; /* { dg-error "from incompatible" } */ -const char32_t s32_2[] = U"ab"; -const char32_t s32_3[] = L"ab"; /* { dg-error "from incompatible" } */ - -const char16_t s32_4[0] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s32_5[1] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s32_6[2] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s32_7[3] = u"ab"; -const char16_t s32_8[4] = u"ab"; - -const wchar_t sw_0[] = "ab"; /* { dg-error "from non-wide" } */ -const wchar_t sw_1[] = u"ab"; /* { dg-error "from incompatible" } */ -const wchar_t sw_2[] = U"ab"; /* { dg-error "from incompatible" } */ -const wchar_t sw_3[] = L"ab"; diff --git a/gcc/testsuite/g++.dg/ext/utf-array.C b/gcc/testsuite/g++.dg/ext/utf-array.C index ff6e12df46d..65d8453d99d 100644 --- a/gcc/testsuite/g++.dg/ext/utf-array.C +++ b/gcc/testsuite/g++.dg/ext/utf-array.C @@ -34,39 +34,3 @@ const wchar_t sw_0[] = "ab"; /* { dg-error "from non-wide" } */ const wchar_t sw_1[] = u"ab"; /* { dg-error "from incompatible" } */ const wchar_t sw_2[] = U"ab"; /* { dg-error "from incompatible" } */ const wchar_t sw_3[] = L"ab"; -/* Contributed by Kris Van Hees */ -/* Expected errors for char16_t/char32_t string literals. */ -/* { dg-do compile } */ -/* { dg-options "-std=c++0x" } */ - -const char s_0[] = "ab"; -const char s_1[] = u"ab"; /* { dg-error "from wide string" } */ -const char s_2[] = U"ab"; /* { dg-error "from wide string" } */ -const char s_3[] = L"ab"; /* { dg-error "from wide string" } */ - -const char16_t s16_0[] = "ab"; /* { dg-error "from non-wide" } */ -const char16_t s16_1[] = u"ab"; -const char16_t s16_2[] = U"ab"; /* { dg-error "from incompatible" } */ -const char16_t s16_3[] = L"ab"; /* { dg-error "from incompatible" } */ - -const char16_t s16_4[0] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s16_5[1] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s16_6[2] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s16_7[3] = u"ab"; -const char16_t s16_8[4] = u"ab"; - -const char32_t s32_0[] = "ab"; /* { dg-error "from non-wide" } */ -const char32_t s32_1[] = u"ab"; /* { dg-error "from incompatible" } */ -const char32_t s32_2[] = U"ab"; -const char32_t s32_3[] = L"ab"; /* { dg-error "from incompatible" } */ - -const char16_t s32_4[0] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s32_5[1] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s32_6[2] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s32_7[3] = u"ab"; -const char16_t s32_8[4] = u"ab"; - -const wchar_t sw_0[] = "ab"; /* { dg-error "from non-wide" } */ -const wchar_t sw_1[] = u"ab"; /* { dg-error "from incompatible" } */ -const wchar_t sw_2[] = U"ab"; /* { dg-error "from incompatible" } */ -const wchar_t sw_3[] = L"ab"; diff --git a/gcc/testsuite/gcc.dg/utf-array-short-wchar.c b/gcc/testsuite/gcc.dg/utf-array-short-wchar.c index 3f34caa19e6..7d8c319d99a 100644 --- a/gcc/testsuite/gcc.dg/utf-array-short-wchar.c +++ b/gcc/testsuite/gcc.dg/utf-array-short-wchar.c @@ -39,44 +39,3 @@ const wchar_t sw_0[] = "ab"; /* { dg-error "from non-wide" } */ const wchar_t sw_1[] = u"ab"; const wchar_t sw_2[] = U"ab"; /* { dg-error "from incompatible" } */ const wchar_t sw_3[] = L"ab"; -/* Contributed by Kris Van Hees */ -/* Expected errors for char16_t/char32_t string literals. */ -/* { dg-do compile } */ -/* { dg-options "-std=gnu99 -fshort-wchar" } */ - -#include - -typedef short unsigned int char16_t; -typedef unsigned int char32_t; - -const char s_0[] = "ab"; -const char s_1[] = u"ab"; /* { dg-error "from wide string" } */ -const char s_2[] = U"ab"; /* { dg-error "from wide string" } */ -const char s_3[] = L"ab"; /* { dg-error "from wide string" } */ - -const char16_t s16_0[] = "ab"; /* { dg-error "from non-wide" } */ -const char16_t s16_1[] = u"ab"; -const char16_t s16_2[] = U"ab"; /* { dg-error "from incompatible" } */ -const char16_t s16_3[] = L"ab"; - -const char16_t s16_4[0] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s16_5[1] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s16_6[2] = u"ab"; -const char16_t s16_7[3] = u"ab"; -const char16_t s16_8[4] = u"ab"; - -const char32_t s32_0[] = "ab"; /* { dg-error "from non-wide" } */ -const char32_t s32_1[] = u"ab"; /* { dg-error "from incompatible" } */ -const char32_t s32_2[] = U"ab"; -const char32_t s32_3[] = L"ab"; /* { dg-error "from incompatible" } */ - -const char16_t s32_4[0] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s32_5[1] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s32_6[2] = u"ab"; -const char16_t s32_7[3] = u"ab"; -const char16_t s32_8[4] = u"ab"; - -const wchar_t sw_0[] = "ab"; /* { dg-error "from non-wide" } */ -const wchar_t sw_1[] = u"ab"; -const wchar_t sw_2[] = U"ab"; /* { dg-error "from incompatible" } */ -const wchar_t sw_3[] = L"ab"; diff --git a/gcc/testsuite/gcc.dg/utf-array.c b/gcc/testsuite/gcc.dg/utf-array.c index 0e36e0db607..50a29fe9375 100644 --- a/gcc/testsuite/gcc.dg/utf-array.c +++ b/gcc/testsuite/gcc.dg/utf-array.c @@ -39,44 +39,3 @@ const wchar_t sw_0[] = "ab"; /* { dg-error "from non-wide" } */ const wchar_t sw_1[] = u"ab"; /* { dg-error "from incompatible" } */ const wchar_t sw_2[] = U"ab"; /* { dg-error "from incompatible" } */ const wchar_t sw_3[] = L"ab"; -/* Contributed by Kris Van Hees */ -/* Expected errors for char16_t/char32_t string literals. */ -/* { dg-do compile } */ -/* { dg-options "-std=gnu99" } */ - -#include - -typedef short unsigned int char16_t; -typedef unsigned int char32_t; - -const char s_0[] = "ab"; -const char s_1[] = u"ab"; /* { dg-error "from wide string" } */ -const char s_2[] = U"ab"; /* { dg-error "from wide string" } */ -const char s_3[] = L"ab"; /* { dg-error "from wide string" } */ - -const char16_t s16_0[] = "ab"; /* { dg-error "from non-wide" } */ -const char16_t s16_1[] = u"ab"; -const char16_t s16_2[] = U"ab"; /* { dg-error "from incompatible" } */ -const char16_t s16_3[] = L"ab"; /* { dg-error "from incompatible" } */ - -const char16_t s16_4[0] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s16_5[1] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s16_6[2] = u"ab"; -const char16_t s16_7[3] = u"ab"; -const char16_t s16_8[4] = u"ab"; - -const char32_t s32_0[] = "ab"; /* { dg-error "from non-wide" } */ -const char32_t s32_1[] = u"ab"; /* { dg-error "from incompatible" } */ -const char32_t s32_2[] = U"ab"; -const char32_t s32_3[] = L"ab"; /* { dg-error "from incompatible" } */ - -const char16_t s32_4[0] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s32_5[1] = u"ab"; /* { dg-warning "chars is too long" } */ -const char16_t s32_6[2] = u"ab"; -const char16_t s32_7[3] = u"ab"; -const char16_t s32_8[4] = u"ab"; - -const wchar_t sw_0[] = "ab"; /* { dg-error "from non-wide" } */ -const wchar_t sw_1[] = u"ab"; /* { dg-error "from incompatible" } */ -const wchar_t sw_2[] = U"ab"; /* { dg-error "from incompatible" } */ -const wchar_t sw_3[] = L"ab";