utf-array.C: Fix broken merge/checkin.

2008-07-18  Kris Van Hees  <kris.van.hees@oracle.com>

       * 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 17adb43..338edcd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-18  Kris Van Hees  <kris.van.hees@oracle.com>
+
+       * 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  <joseph@codesourcery.com>
 
        * gcc.dg/fshort-wchar.c: Use -Wl,--no-wchar-size-warning on
@@ -15,6 +22,13 @@
 
 2008-07-18  Kris Van Hees  <kris.van.hees@oracle.com>
 
+       * 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  <kris.van.hees@oracle.com>
+
        Tests for char16_t and char32_t support.
        * g++.dg/ext/utf-array.C: New
        * g++.dg/ext/utf-array-short-wchar.C: New

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 7d768d3..43ae508 100644 (file)
--- 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 <kris.van.hees@oracle.com> */
-/* 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 ff6e12d..65d8453 100644 (file)
--- 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 <kris.van.hees@oracle.com> */
-/* 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 3f34caa..7d8c319 100644 (file)
--- 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 <kris.van.hees@oracle.com> */
-/* Expected errors for char16_t/char32_t string literals. */
-/* { dg-do compile } */
-/* { dg-options "-std=gnu99 -fshort-wchar" } */
-
-#include <wchar.h>
-
-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 0e36e0d..50a29fe 100644 (file)
--- 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 <kris.van.hees@oracle.com> */
-/* Expected errors for char16_t/char32_t string literals. */
-/* { dg-do compile } */
-/* { dg-options "-std=gnu99" } */
-
-#include <wchar.h>
-
-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";