procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/50941 ([C++0x] user-defined string literals provide incorrect length for wchar_t, char16_t, and char32_t)

Browse source 
PR c++/50941
	* parser.c (cp_parser_userdef_string_literal): Fix string length.

From-SVN: r180961
This commit is contained in:
Ed Smith-Rowland 2011-11-04 16:16:09 +00:00 • committed by Jason Merrill
parent b6d185a56c
commit 2fcc5e6474
4 changed files with 58 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-11-04 Ed Smith-Rowland <3dw4rd@verizon.net>
PR c++/50941
* parser.c (cp_parser_userdef_string_literal): Fix string length.
2011-11-04 Jason Merrill <jason@redhat.com>
PR c++/48370

4
gcc/cp/parser.c
View file

@ -3681,8 +3681,8 @@ cp_parser_userdef_string_literal (cp_token *token)
suffix_id = USERDEF_LITERAL_SUFFIX_ID (literal);
name = cp_literal_operator_id (IDENTIFIER_POINTER (suffix_id));
value = USERDEF_LITERAL_VALUE (literal);
len = TREE_STRING_LENGTH (value) - 1;
len = TREE_STRING_LENGTH (value)
/ TREE_INT_CST_LOW (TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (value)))) - 1;
/* Build up a call to the user-defined operator */
/* Lookup the name we got back from the id-expression. */
vec = make_tree_vector ();

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2011-11-04 Ed Smith-Rowland <3dw4rd@verizon.net>
PR c++/50941
* g++.dg/cpp0x/udlit-strint-length.C: New.
2011-11-04 Jason Merrill <jason@redhat.com>
PR c++/48370

46
gcc/testsuite/g++.dg/cpp0x/udlit-string-length.C Normal file
View file

@ -0,0 +1,46 @@
// { dg-options "-std=c++0x" }
// PR c++/50941
typedef decltype(sizeof(0)) size_type;
constexpr size_type
operator"" _len(const char*, size_type len)
{
return len;
}
constexpr size_type
operator"" _len(const wchar_t*, size_type len)
{
return len;
}
constexpr size_type
operator"" _len(const char16_t*, size_type len)
{
return len;
}
constexpr size_type
operator"" _len(const char32_t*, size_type len)
{
return len;
}
static_assert( ""_len == 0, "Ouch");
static_assert(u8""_len == 0, "Ouch");
static_assert( L""_len == 0, "Ouch");
static_assert( u""_len == 0, "Ouch");
static_assert( U""_len == 0, "Ouch");
static_assert( "1"_len == 1, "Ouch");
static_assert(u8"1"_len == 1, "Ouch");
static_assert( L"1"_len == 1, "Ouch");
static_assert( u"1"_len == 1, "Ouch");
static_assert( U"1"_len == 1, "Ouch");
static_assert( "123"_len == 3, "Ouch");
static_assert(u8"123"_len == 3, "Ouch");
static_assert( L"123"_len == 3, "Ouch");
static_assert( u"123"_len == 3, "Ouch");
static_assert( U"123"_len == 3, "Ouch");