gjavah.c (cxx_keywords): Update from the definitive list in cp/lex.c.

	* gjavah.c (cxx_keywords): Update from the definitive list in cp/lex.c.
	* lex.c (cxx_keywords): Likewise.

From-SVN: r40773

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d7d0e77a43c1c29cb0ae1370e21ecce4cf4fbbf5..387b41544fa9e0ef8ba2e0003dcc1177c628f1d7 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-23  Bryce McKinlay  <bryce@albatross.co.nz>
+
+       * gjavah.c (cxx_keywords): Update from the definitive list in cp/lex.c.
+       * lex.c (cxx_keywords): Likewise.
+
 2001-03-21  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * gjavah.c (process_file): Mark interface definitions with 

diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 7f6084955a129814e7cbcd47b4145e64694dd558..b56c0a61d83313ca59cb12b8d4080e3c6c7ff1d3 100644 (file)
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -392,37 +392,110 @@ utf8_cmp (str, length, name)
 
 static const char *cxx_keywords[] =
 {
+  "_Complex",
+  "__alignof",
+  "__alignof__",
+  "__asm",
+  "__asm__",
+  "__attribute",
+  "__attribute__",
+  "__builtin_va_arg",
+  "__complex",
+  "__complex__",
+  "__const",
+  "__const__",
+  "__extension__",
+  "__imag",
+  "__imag__",
+  "__inline",
+  "__inline__",
+  "__label__",
+  "__null",
+  "__real",
+  "__real__",
+  "__restrict",
+  "__restrict__",
+  "__signed",
+  "__signed__",
+  "__typeof",
+  "__typeof__",
+  "__volatile",
+  "__volatile__",
   "asm",
+  "and",
+  "and_eq",
   "auto",
+  "bitand",
+  "bitor",
   "bool",
+  "break",
+  "case",
+  "catch",
+  "char",
+  "class",
+  "compl",
+  "const",
   "const_cast",
+  "continue",
+  "default",
   "delete",
+  "do",
+  "double",
   "dynamic_cast",
+  "else",
   "enum",
   "explicit",
+  "export",
   "extern",
+  "false",
+  "float",
+  "for",
   "friend",
+  "goto",
+  "if",
   "inline",
+  "int",
+  "long",
   "mutable",
   "namespace",
-  "overload",
+  "new",
+  "not",
+  "not_eq",
+  "operator",
+  "or",
+  "or_eq",
+  "private",
+  "protected",
+  "public",
   "register",
   "reinterpret_cast",
+  "return",
+  "short",
   "signed",
   "sizeof",
+  "static",
   "static_cast",
   "struct",
+  "switch",
   "template",
+  "this",      
+  "throw",
+  "true",
+  "try",
   "typedef",
-  "typeid",
   "typename",
-  "typenameopt",
+  "typeid",
+  "typeof",
   "union",
   "unsigned",
   "using",
   "virtual",
+  "void",
   "volatile",
-  "wchar_t"
+  "wchar_t",
+  "while",
+  "xor",
+  "xor_eq"
 };
 
 

diff --git a/gcc/java/lex.c b/gcc/java/lex.c
index 4f9a731f7658965d44ca3e9dd2769710334097d6..f66ed579d0797ebc51f438b88b5bfce18f6c4991 100644 (file)
--- a/gcc/java/lex.c
+++ b/gcc/java/lex.c
@@ -1802,37 +1802,110 @@ utf8_cmp (str, length, name)
 
 static const char *cxx_keywords[] =
 {
+  "_Complex",
+  "__alignof",
+  "__alignof__",
+  "__asm",
+  "__asm__",
+  "__attribute",
+  "__attribute__",
+  "__builtin_va_arg",
+  "__complex",
+  "__complex__",
+  "__const",
+  "__const__",
+  "__extension__",
+  "__imag",
+  "__imag__",
+  "__inline",
+  "__inline__",
+  "__label__",
+  "__null",
+  "__real",
+  "__real__",
+  "__restrict",
+  "__restrict__",
+  "__signed",
+  "__signed__",
+  "__typeof",
+  "__typeof__",
+  "__volatile",
+  "__volatile__",
   "asm",
+  "and",
+  "and_eq",
   "auto",
+  "bitand",
+  "bitor",
   "bool",
+  "break",
+  "case",
+  "catch",
+  "char",
+  "class",
+  "compl",
+  "const",
   "const_cast",
+  "continue",
+  "default",
   "delete",
+  "do",
+  "double",
   "dynamic_cast",
+  "else",
   "enum",
   "explicit",
+  "export",
   "extern",
+  "false",
+  "float",
+  "for",
   "friend",
+  "goto",
+  "if",
   "inline",
+  "int",
+  "long",
   "mutable",
   "namespace",
-  "overload",
+  "new",
+  "not",
+  "not_eq",
+  "operator",
+  "or",
+  "or_eq",
+  "private",
+  "protected",
+  "public",
   "register",
   "reinterpret_cast",
+  "return",
+  "short",
   "signed",
   "sizeof",
+  "static",
   "static_cast",
   "struct",
+  "switch",
   "template",
+  "this",      
+  "throw",
+  "true",
+  "try",
   "typedef",
-  "typeid",
   "typename",
-  "typenameopt",
+  "typeid",
+  "typeof",
   "union",
   "unsigned",
   "using",
   "virtual",
+  "void",
   "volatile",
-  "wchar_t"
+  "wchar_t",
+  "while",
+  "xor",
+  "xor_eq"
 };
 
 /* Return true if NAME is a C++ keyword.  */