diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp/string-3.C | 9 | ||||
| -rw-r--r-- | libcpp/ChangeLog | 5 | ||||
| -rw-r--r-- | libcpp/macro.c | 14 |
4 files changed, 30 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c2e064c..0cc5e32 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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 diff --git a/gcc/testsuite/g++.dg/cpp/string-3.C b/gcc/testsuite/g++.dg/cpp/string-3.C new file mode 100644 index 0000000..92bd930 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp/string-3.C @@ -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" } } diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 0621074..f2c0d4d 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -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> diff --git a/libcpp/macro.c b/libcpp/macro.c index de18c22..fab1cb0 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -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; |