Index: libcpp/ChangeLog

2005-03-14  Geoffrey Keating  <geoffk@apple.com>

	* lex.c (forms_identifier_p): Disable UCNs in C89 mode.

Index: gcc/testsuite/ChangeLog
2005-03-14  Geoffrey Keating  <geoffk@apple.com>

	* gcc.dg/cpp/ucnid-6.c: New.

From-SVN: r96475

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 765cc43c43c42ef03d9d2208770eb9bfdaedbae1..6805e68ba8aa1ffb9b18d6db622949b6fb6a8dbe 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -15,6 +15,8 @@
 
 2005-03-14  Geoffrey Keating  <geoffk@apple.com>
 
+       * gcc.dg/cpp/ucnid-6.c: New.
+
        * gcc.dg/cpp/normalize-1.c: New.
        * gcc.dg/cpp/normalize-2.c: New.
        * gcc.dg/cpp/normalize-3.c: New.

diff --git a/gcc/testsuite/gcc.dg/cpp/ucnid-6.c b/gcc/testsuite/gcc.dg/cpp/ucnid-6.c
new file mode 100644 (file)
index 0000000..9ee0858
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/ucnid-6.c
@@ -0,0 +1,5 @@
+/* { dg-do compile } */
+/* { dg-options "-std=c89" } */
+#define a b(
+#define b(x) q
+int a\u00aa);

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 9f4303c221c32ba92f907a0b620c4d320a9f8c51..043aceed71a818cef3373f482a63f4a67f8ed97c 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,5 +1,9 @@
 2005-03-14  Geoffrey Keating  <geoffk@apple.com>
 
+       * lex.c (forms_identifier_p): Disable UCNs in C89 mode.
+
+2005-03-14  Geoffrey Keating  <geoffk@apple.com>
+       
        * init.c (cpp_create_reader): Default warn_normalize to normalized_C.
        * charset.c: Update for new format of ucnid.h.
        (ucn_valid_in_identifier): Update for new format of ucnid.h.

diff --git a/libcpp/lex.c b/libcpp/lex.c
index 9bcb91c04723a15fdc414843c57f5ef10a62ad02..289f7b3503329d5346a718a6548c82f04769d1cb 100644 (file)
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -476,7 +476,8 @@ forms_identifier_p (cpp_reader *pfile, int first,
     }
 
   /* Is this a syntactically valid UCN?  */
-  if (*buffer->cur == '\\'
+  if ((CPP_OPTION (pfile, cplusplus) || CPP_OPTION (pfile, c99))
+      && *buffer->cur == '\\'
       && (buffer->cur[1] == 'u' || buffer->cur[1] == 'U'))
     {
       buffer->cur += 2;