From 7b35f6c94ff5ec2fd0b3563646b74271976f3b91 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 9 Dec 2001 05:06:45 +0000 Subject: [PATCH] gjavah.c (cxx_keywords): Re-sorted. * gjavah.c (cxx_keywords): Re-sorted. * lex.c (cxx_keywords): Re-sorted. From-SVN: r47803 --- gcc/java/ChangeLog | 3 +++ gcc/java/gjavah.c | 4 ++-- gcc/java/lex.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 43a6560aec0..f04ebf26daa 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,8 @@ 2001-12-08 Tom Tromey + * 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 779e3ed43c4..724877507e0 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 1eed2337341..0b7e93d6032 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", -- 2.30.2