From d5e48350b40fcec6459dceef282f2ecf6eba3201 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 10 Jul 2013 18:52:19 +0200 Subject: re PR preprocessor/57824 (Raw string literals not handled correctly in macro arguments or deferred pragmas) PR preprocessor/57824 * lex.c (lex_raw_string): Allow reading new-lines if in_deferred_pragma or if parsing_args and there is still data in the current buffer. * c-c++-common/raw-string-17.c: New test. * c-c++-common/gomp/pr57824.c: New test. From-SVN: r200879 --- libcpp/ChangeLog | 5 +++++ libcpp/lex.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'libcpp') diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 195d728..9213232 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,5 +1,10 @@ 2013-07-10 Jakub Jelinek + PR preprocessor/57824 + * lex.c (lex_raw_string): Allow reading new-lines if + in_deferred_pragma or if parsing_args and there is still + data in the current buffer. + * include/cpplib.h (cpp_token_val_index): Change parameter type to const cpp_token *. * lex.c (cpp_token_val_index): Likewise. diff --git a/libcpp/lex.c b/libcpp/lex.c index 84e2af6..fc89baf 100644 --- a/libcpp/lex.c +++ b/libcpp/lex.c @@ -1543,8 +1543,8 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base, else if (c == '\n') { if (pfile->state.in_directive - || pfile->state.parsing_args - || pfile->state.in_deferred_pragma) + || (pfile->state.parsing_args + && pfile->buffer->next_line >= pfile->buffer->rlimit)) { cur--; type = CPP_OTHER; -- cgit v1.1