diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2001-03-23 05:16:13 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-03-23 05:16:13 +0000 |
| commit | f2a29271d5c70dd6706e17362facc196a4ca4a1b (patch) | |
| tree | ec7feb60ef934ce6e6c5c7169c75e31947ef53f1 | |
| parent | d7cfa17ce1c842fdbb6a0811d04fdcc3eb66cbea (diff) | |
| download | gcc-f2a29271d5c70dd6706e17362facc196a4ca4a1b.zip gcc-f2a29271d5c70dd6706e17362facc196a4ca4a1b.tar.gz gcc-f2a29271d5c70dd6706e17362facc196a4ca4a1b.tar.bz2 | |
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
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/gjavah.c | 81 | ||||
| -rw-r--r-- | gcc/java/lex.c | 81 |
3 files changed, 159 insertions, 8 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index d7d0e77..387b415 100644 --- 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 7f60849..b56c0a6 100644 --- 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 4f9a731..f66ed57 100644 --- 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. */ |