diff options
| -rw-r--r-- | gcc/java/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/java/gjavah.c | 4 | ||||
| -rw-r--r-- | gcc/java/lex.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 43a6560..f04ebf2 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,8 @@ 2001-12-08 Tom Tromey <tromey@redhat.com> + * gjavah.c (cxx_keywords): Re-sorted. + * lex.c (cxx_keywords): Re-sorted. + * gjavah.c (HANDLE_METHOD): Set `decompiled' before doing anything else. diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c index 779e3ed..7248775 100644 --- a/gcc/java/gjavah.c +++ b/gcc/java/gjavah.c @@ -424,9 +424,9 @@ static const char *const cxx_keywords[] = "__typeof__", "__volatile", "__volatile__", - "asm", "and", "and_eq", + "asm", "auto", "bitand", "bitor", @@ -486,8 +486,8 @@ static const char *const cxx_keywords[] = "true", "try", "typedef", - "typename", "typeid", + "typename", "typeof", "union", "unsigned", diff --git a/gcc/java/lex.c b/gcc/java/lex.c index 1eed233..0b7e93d 100644 --- a/gcc/java/lex.c +++ b/gcc/java/lex.c @@ -1887,9 +1887,9 @@ static const char *const cxx_keywords[] = "__typeof__", "__volatile", "__volatile__", - "asm", "and", "and_eq", + "asm", "auto", "bitand", "bitor", @@ -1949,8 +1949,8 @@ static const char *const cxx_keywords[] = "true", "try", "typedef", - "typename", "typeid", + "typename", "typeof", "union", "unsigned", |