diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-04-24 01:32:09 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-04-24 01:32:09 +0200 |
| commit | 6cfae07011d50127089bc1ae02837f924cefccb2 (patch) | |
| tree | 512c00cfe469cc71e5b4077ab0e7dfb1018b4b2b | |
| parent | 8d6a2f696859496139e6e484dec046c405a69c36 (diff) | |
| download | gcc-6cfae07011d50127089bc1ae02837f924cefccb2.zip gcc-6cfae07011d50127089bc1ae02837f924cefccb2.tar.gz gcc-6cfae07011d50127089bc1ae02837f924cefccb2.tar.bz2 | |
re PR preprocessor/48740 (Raw C++0x strings and trigraphs mix badly)
PR preprocessor/48740
* lex.c (lex_raw_string): When raw string ends with
??) followed by raw prefix and ", ensure it is preprocessed
with ??) rather than ??].
* c-c++-common/raw-string-11.c: New test.
From-SVN: r172903
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/raw-string-11.c | 13 | ||||
| -rw-r--r-- | libcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | libcpp/lex.c | 4 |
4 files changed, 28 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2cf73c7..0ec9b20 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-04-24 Jakub Jelinek <jakub@redhat.com> + + PR preprocessor/48740 + * c-c++-common/raw-string-11.c: New test. + 2011-04-23 John David Anglin <dave.anglin@nrc-cnrc.ca> * gcc.dg/pr48616.c (dg-options): Add -fno-common to options on diff --git a/gcc/testsuite/c-c++-common/raw-string-11.c b/gcc/testsuite/c-c++-common/raw-string-11.c new file mode 100644 index 0000000..49ceba2 --- /dev/null +++ b/gcc/testsuite/c-c++-common/raw-string-11.c @@ -0,0 +1,13 @@ +// PR preprocessor/48740 +// { dg-options "-std=gnu99 -trigraphs -save-temps" { target c } } +// { dg-options "-std=c++0x -save-temps" { target c++ } } +// { dg-do run } + +int main () +{ + return __builtin_memcmp (R"raw(foo%sbar%sfred%sbob?????)raw", + "foo%sbar%sfred%sbob?""?""?""?""?", + sizeof ("foo%sbar%sfred%sbob?""?""?""?""?")); +} + +// { dg-final { cleanup-saved-temps } } diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index eb93719e..2601302 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,10 @@ +2011-04-24 Jakub Jelinek <jakub@redhat.com> + + PR preprocessor/48740 + * lex.c (lex_raw_string): When raw string ends with + ??) followed by raw prefix and ", ensure it is preprocessed + with ??) rather than ??]. + 2011-04-20 Jim Meyering <meyering@redhat.com> * files.c (destroy_cpp_file): Remove useless if-before-free. diff --git a/libcpp/lex.c b/libcpp/lex.c index c9b5c95..3bf4886 100644 --- a/libcpp/lex.c +++ b/libcpp/lex.c @@ -1410,7 +1410,9 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base, raw_prefix_len) == 0 && cur[raw_prefix_len+1] == '"') { - cur += raw_prefix_len+2; + BUF_APPEND (")", 1); + base++; + cur += raw_prefix_len + 2; goto break_outer_loop; } else |