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

[PATCH] preprocessor stringizing raw strings 

https://gcc.gnu.org/ml/gcc-patches/2017-10/msg00611.html
	libcpp/
	PR preprocessor/82506
	* macro.c (cpp_quote_string): Escape raw LFs.

	gcc/testsuite/
	PR preprocessor/82506
	* g++.dg/cpp/string-3.C: New.

From-SVN: r253605
This commit is contained in:
Nathan Sidwell 2017-10-10 18:56:31 +00:00 committed by Nathan Sidwell
parent eb484969f6
commit 35b82d26e5
4 changed files with 30 additions and 3 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 @@
2017-10-10 Nathan Sidwell <nathan@acm.org>
PR preprocessor/82506
* g++.dg/cpp/string-3.C: New.
2017-10-10 Will Schmidt <will_schmidt@vnet.ibm.com>
* gcc.target/powerpc/fold-vec-splat-16.c: New

9
gcc/testsuite/g++.dg/cpp/string-3.C Normal file
View File

@ -0,0 +1,9 @@
// PR c++/82506
// { dg-do preprocess { target c++11 } }
#define STRINGIZE(A) #A
BEGIN STRINGIZE(R"(
)") END
// { dg-final { scan-file string-3.ii "BEGIN \"R\\\"(\\n)\\\"\"\n END" } }

5
libcpp/ChangeLog
View File

@ -1,3 +1,8 @@
2017-10-10 Nathan Sidwell <nathan@acm.org>
PR preprocessor/82506
* macro.c (cpp_quote_string): Escape raw LFs.
2017-09-15 Andrew Sutton <andrew.n.sutton@gmail.com>
Jakub Jelinek <jakub@redhat.com>

14
libcpp/macro.c
View File

@ -502,13 +502,21 @@ cpp_quote_string (uchar *dest, const uchar *src, unsigned int len)
{
uchar c = *src++;
if (c == '\\' || c == '"')
switch (c)
{
case '\n':
/* Naked LF can appear in raw string literals */
c = 'n';
/* FALLTHROUGH */
case '\\':
case '"':
*dest++ = '\\';
/* FALLTHROUGH */
default:
*dest++ = c;
}
else
*dest++ = c;
}
return dest;