From 9d7013b8ac6b072089612f9bb48461b1cd3df259 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 3 Apr 2002 13:59:03 -0800 Subject: [PATCH] * gcc.dg/cpp/ucs.c: Improved long UCS test. From-SVN: r51815 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/cpp/ucs.c | 38 ++++++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7c85f7899f9f..470ab8e324a0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2002-04-03 Richard Henderson + + * gcc.dg/cpp/ucs.c: Improved long UCS test. + 2002-04-03 Hans-Peter Nilsson * gcc.dg/wchar_t-1.c, gcc.dg/wchar_t-1.c: Fix typo last change. diff --git a/gcc/testsuite/gcc.dg/cpp/ucs.c b/gcc/testsuite/gcc.dg/cpp/ucs.c index d306789e2f49..1dfe444d0c11 100644 --- a/gcc/testsuite/gcc.dg/cpp/ucs.c +++ b/gcc/testsuite/gcc.dg/cpp/ucs.c @@ -5,13 +5,43 @@ /* This tests universal character sequences. - Neil Booth, 22 May 2001. */ + Neil Booth, 22 May 2001. + Richard Henderson, 3 Apr 2002. */ + +#include + +#define unsigned +0 +#define int +0 +#define char +1 +#define short +2 +#define long +3 + +#if __WCHAR_TYPE__ == 0 +# define WCHAR_MAX INT_MAX +#elif __WCHAR_TYPE__ == 1 +# define WCHAR_MAX CHAR_MAX +#elif __WCHAR_TYPE__ == 2 +# define WCHAR_MAX SHRT_MAX +#elif __WCHAR_TYPE__ == 3 +# define WCHAR_MAX LONG_MAX +#else +# error wacky wchar_t +#endif + +#undef unsigned +#undef int +#undef char +#undef short +#undef long #if L'\u1234' != 0x1234 #error bad short ucs /* { dg-bogus "bad" "bad \u1234 evaluation" } */ #endif -#if L'\U1234abcd' != 0x1234abcd -#error bad long ucs /* { dg-bogus "bad" "bad \U1234abcd evaluation" } */ + +#if WCHAR_MAX >= 0x7ffffff +# if L'\U1234abcd' != 0x1234abcd +# error bad long ucs /* { dg-bogus "bad" "bad \U1234abcd evaluation" } */ +# endif #endif void foo () @@ -24,7 +54,7 @@ void foo () c = L'\u000x'; /* { dg-error "non-hex" "non-hex digit in UCN" } */ /* If sizeof(HOST_WIDE_INT) > sizeof(wchar_t), we can get a multi-character constant warning even for wide characters. */ - /* { dg-warning "too long|multi-character" "" { target *-*-* } 24 } */ + /* { dg-warning "too long|multi-character" "" { target *-*-* } 54 } */ c = '\u0024'; /* { dg-bogus "invalid" "0024 is a valid UCN" } */ c = "\u0040"[0]; /* { dg-bogus "invalid" "0040 is a valid UCN" } */ -- 2.47.2