OSDN Git Service

PR preprocessor/48740
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 23 Apr 2011 23:32:09 +0000 (23:32 +0000)
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 23 Apr 2011 23:32:09 +0000 (23:32 +0000)
* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172903 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/testsuite/ChangeLog
gcc/testsuite/c-c++-common/raw-string-11.c [new file with mode: 0644]
libcpp/ChangeLog
libcpp/lex.c

index 2cf73c7..0ec9b20 100644 (file)
@@ -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 (file)
index 0000000..49ceba2
--- /dev/null
@@ -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 } }
index eb93719..2601302 100644 (file)
@@ -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.
index c9b5c95..3bf4886 100644 (file)
@@ -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