This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[COMMITED] Trivial patch to fix a bad checkin.
- From: Kris Van Hees <kris dot van dot hees at oracle dot com>
- To: Kris Van Hees <kris dot van dot hees at oracle dot com>
- Cc: Ian Lance Taylor <iant at google dot com>, "Joseph S. Myers" <joseph at codesourcery dot com>, Jakub Jelinek <jakub at redhat dot com>, Holger Hopp <holger dot hopp at sap dot com>, gcc-patches at gcc dot gnu dot org, libstdc++ at gcc dot gnu dot org
- Date: Fri, 18 Jul 2008 18:34:35 -0400
- Subject: [COMMITED] Trivial patch to fix a bad checkin.
- References: <20080418170758.GK2255@devserv.devel.redhat.com> <20080421110001.GB6577@oracle.com> <Pine.LNX.4.64.0804211209280.4213@digraph.polyomino.org.uk> <20080421235942.GF6577@oracle.com> <Pine.LNX.4.64.0806111616040.2430@digraph.polyomino.org.uk> <20080715154432.GG5625@oracle.com> <20080715233016.GH5625@oracle.com> <Pine.LNX.4.64.0807171120250.4051@digraph.polyomino.org.uk> <m33am7cit6.fsf@google.com> <20080718173845.GK5625@oracle.com>
Due to a mistake on my part, I accidentally checked in bad versions of four
testsuite cases as part of my recent char16_t/char32_t support patch. I found
the problem right away, and have commited a patch to correct the mistake
that happened. The problem was that the offending files had their new and old
content concatenated rather than replaced.
The trivial patch I commited is:
Index: gcc/testsuite/gcc.dg/utf-array.c
===================================================================
--- gcc/testsuite/gcc.dg/utf-array.c (revision 137965)
+++ gcc/testsuite/gcc.dg/utf-array.c (working copy)
@@ -39,44 +39,3 @@
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";
Index: gcc/testsuite/gcc.dg/utf-array-short-wchar.c
===================================================================
--- gcc/testsuite/gcc.dg/utf-array-short-wchar.c (revision 137965)
+++ gcc/testsuite/gcc.dg/utf-array-short-wchar.c (working copy)
@@ -39,44 +39,3 @@
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";
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog (revision 137965)
+++ gcc/testsuite/ChangeLog (working copy)
@@ -1,5 +1,12 @@
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
Index: gcc/testsuite/g++.dg/ext/utf-array.C
===================================================================
--- gcc/testsuite/g++.dg/ext/utf-array.C (revision 137965)
+++ gcc/testsuite/g++.dg/ext/utf-array.C (working copy)
@@ -34,39 +34,3 @@
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";
Index: gcc/testsuite/g++.dg/ext/utf-array-short-wchar.C
===================================================================
--- gcc/testsuite/g++.dg/ext/utf-array-short-wchar.C (revision 137965)
+++ gcc/testsuite/g++.dg/ext/utf-array-short-wchar.C (working copy)
@@ -34,39 +34,3 @@
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";