OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/61038 (g++ -E is unusable with UDL strings)

Browse Source 
gcc/testsuite/

2014-05-20  Edward Smith-Rowland  <3dw4rd@verizon.net>

	PR C++/61038
	* g++.dg/cpp0x/pr61038.C: New.

libcpp/

2014-05-20  Edward Smith-Rowland  <3dw4rd@verizon.net>

	PR C++/61038
	* macro.c (stringify_arg (cpp_reader *, macro_arg *)):
	Check for user-defined literal strings and user-defined literal chars
	to escape necessary characters.

From-SVN: r210666
This commit is contained in:
Edward Smith-Rowland 2014-05-21 00:35:29 +00:00 committed by Edward Smith-Rowland
parent 956dd0932c
commit 49039169f3
4 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2014-05-20 Edward Smith-Rowland <3dw4rd@verizon.net>
PR C++/61038
* g++.dg/cpp0x/pr61038.C: New.
2014-05-20 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58753

40
gcc/testsuite/g++.dg/cpp0x/pr61038.C Normal file
View File

@ -0,0 +1,40 @@
// PR c++/61038
// { dg-do compile { target c++11 } }
#include <cstring>
#include <cstdlib>
void
operator "" _s(const char *, unsigned long)
{ }
void
operator "" _t(const char)
{ }
#define QUOTE(s) #s
#define QQUOTE(s) QUOTE(s)
int
main()
{
const char *s = QQUOTE(QUOTE("hello"_s));
const char *t = QUOTE("\"hello\"_s");
if (strcmp(s, t) != 0)
abort();
const char *c = QQUOTE(QUOTE('"'_t));
const char *d = QUOTE("'\"'_t");
if (strcmp(c, d) != 0)
abort();
const char *e = QQUOTE(QUOTE('\''_t));
const char *f = QUOTE("'\\''_t");
if (strcmp(e, f) != 0)
abort();
const char *g = QQUOTE(QUOTE('\\'_t));
const char *h = QUOTE("'\\\\'_t");
if (strcmp(g, h) != 0)
abort();
}

7
libcpp/ChangeLog
View File

@ -1,3 +1,10 @@
2014-05-20 Edward Smith-Rowland <3dw4rd@verizon.net>
PR C++/61038
* macro.c (stringify_arg (cpp_reader *, macro_arg *)):
Check for user-defined literal strings and user-defined literal chars
to escape necessary characters.
2014-05-20 Richard Biener <rguenther@suse.de>
* configure.ac: Copy gcc logic of detecting a 64bit type.

3
libcpp/macro.c
View File

@ -494,6 +494,9 @@ stringify_arg (cpp_reader *pfile, macro_arg *arg)
|| token->type == CPP_STRING16 || token->type == CPP_CHAR16
|| token->type == CPP_UTF8STRING);
escape_it = escape_it || cpp_userdef_string_p (token->type)
|| cpp_userdef_char_p (token->type);
/* Room for each char being written in octal, initial space and
final quote and NUL. */
len = cpp_token_len (token);