From 35b82d26e5b92ba0471f59f0073590de3550f00a Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Tue, 10 Oct 2017 18:56:31 +0000 Subject: [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 --- libcpp/macro.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'libcpp/macro.c') 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; -- cgit v1.1