36th Cygnus<->FSF merge

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@7221 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 85 insertions, 109 deletions

diff --git a/gcc/cp/hash.h b/gcc/cp/hash.h
index fceaa63ccfc..86bc4caea55 100644
--- a/gcc/cp/hash.h
+++ b/gcc/cp/hash.h
@@ -3,12 +3,12 @@
 /* Command-line: gperf -p -j1 -g -o -t -N is_reserved_word -k1,4,$,7 gplus.gperf  */
 struct resword { char *name; short token; enum rid rid;};
 
-#define TOTAL_KEYWORDS 86
+#define TOTAL_KEYWORDS 80
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 13
 #define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 196
-/* maximum key range = 193, duplicates = 0 */
+#define MAX_HASH_VALUE 166
+/* maximum key range = 163, duplicates = 0 */
 
 #ifdef __GNUC__
 inline
@@ -20,19 +20,19 @@ hash (str, len)
 {
   static unsigned char asso_values[] =
     {
-     197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
-     197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
-     197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
-     197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
-     197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
-     197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
-     197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
-     197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
-     197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
-     197, 197, 197, 197, 197,   0, 197,  93,   3,  35,
-       3,   0,  71,   8,   4,  78, 197,   3,  30,   6,
-      29,  18,  37, 197,  55,   0,   4,  11,   7,  20,
-       0,   8, 197, 197, 197, 197, 197, 197,
+     167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+     167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+     167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+     167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+     167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+     167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+     167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+     167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+     167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+     167, 167, 167, 167, 167,   0, 167,  36,   6,  60,
+      17,   0,  16,   5,  41,  38, 167,  11,  22,   7,
+      26,   0,   4, 167,  22,   0,   4,  44,  19,   8,
+       5,  18, 167, 167, 167, 167, 167, 167,
     };
   register int hval = len;
 
@@ -68,127 +68,103 @@ is_reserved_word (str, len)
       {"",}, {"",}, 
       {"__asm__",  GCC_ASM_KEYWORD, NORID},
       {"this",  THIS, NORID,},
-      {"delete",  DELETE, NORID,},
-      {"except",  EXCEPT, NORID		/* Extension */,},
-      {"__asm",  GCC_ASM_KEYWORD, NORID},
-      {"double",  TYPESPEC, RID_DOUBLE,},
-      {"typeid",  TYPEID, NORID,},
-      {"switch",  SWITCH, NORID,},
-      {"try",  TRY, NORID			/* Extension */,},
-      {"enum",  ENUM, NORID,},
-      {"void",  TYPESPEC, RID_VOID,},
-      {"",}, {"",}, {"",}, 
-      {"struct",  AGGR, RID_RECORD,},
-      {"",}, 
-      {"do",  DO, NORID,},
-      {"",}, {"",}, {"",}, {"",}, 
+      {"goto",  GOTO, NORID,},
       {"__headof__",  HEADOF, NORID},
-      {"",}, {"",}, 
+      {"",}, 
+      {"__asm",  GCC_ASM_KEYWORD, NORID},
       {"__const__",  TYPE_QUAL, RID_CONST},
       {"__volatile",  TYPE_QUAL, RID_VOLATILE},
       {"__const",  TYPE_QUAL, RID_CONST},
       {"__volatile__",  TYPE_QUAL, RID_VOLATILE},
-      {"extern",  SCSPEC, RID_EXTERN,},
+      {"throw",  THROW, NORID,},
+      {"enum",  ENUM, NORID,},
+      {"do",  DO, NORID,},
+      {"template",  TEMPLATE, NORID,},
+      {"sigof",  SIGOF, NORID		/* Extension */,},
+      {"sizeof",  SIZEOF, NORID,},
+      {"delete",  DELETE, NORID,},
+      {"__headof",  HEADOF, NORID},
+      {"try",  TRY, NORID,},
+      {"typeof",  TYPEOF, NORID,},
+      {"typeid",  TYPEID, NORID,},
       {"__typeof__",  TYPEOF, NORID},
-      {"",}, 
-      {"signed",  TYPESPEC, RID_SIGNED,},
-      {"case",  CASE, NORID,},
-      {"class",  AGGR, RID_CLASS,},
+      {"double",  TYPESPEC, RID_DOUBLE,},
+      {"private",  VISSPEC, RID_PRIVATE,},
+      {"short",  TYPESPEC, RID_SHORT,},
+      {"extern",  SCSPEC, RID_EXTERN,},
       {"__classof__",  CLASSOF, NORID},
-      {"__extension__",  EXTENSION, NORID},
-      {"",}, 
-      {"const",  TYPE_QUAL, RID_CONST,},
-      {"static",  SCSPEC, RID_STATIC,},
       {"",}, 
-      {"throw",  THROW, NORID		/* Extension */,},
-      {"goto",  GOTO, NORID,},
-      {"signature",  AGGR, RID_SIGNATURE	/* Extension */,},
+      {"while",  WHILE, NORID,},
       {"long",  TYPESPEC, RID_LONG,},
-      {"private",  VISSPEC, RID_PRIVATE,},
       {"new",  NEW, NORID,},
-      {"template",  TEMPLATE, NORID,},
-      {"",}, 
-      {"while",  WHILE, NORID,},
-      {"",}, 
       {"protected",  VISSPEC, RID_PROTECTED,},
-      {"continue",  CONTINUE, NORID,},
-      {"",}, 
-      {"raise",  RAISE, NORID		/* Extension */,},
-      {"raises",  RAISES, NORID		/* Extension */,},
-      {"",}, 
-      {"union",  AGGR, RID_UNION,},
-      {"short",  TYPESPEC, RID_SHORT,},
-      {"",}, 
-      {"__inline",  SCSPEC, RID_INLINE},
-      {"",}, 
-      {"__inline__",  SCSPEC, RID_INLINE},
-      {"",}, 
-      {"__alignof__",  ALIGNOF, NORID},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"sizeof",  SIZEOF, NORID,},
-      {"virtual",  SCSPEC, RID_VIRTUAL,},
-      {"catch",  CATCH, NORID,},
       {"friend",  SCSPEC, RID_FRIEND,},
-      {"typeof",  TYPEOF, NORID,},
-      {"",}, {"",}, 
-      {"headof",  HEADOF, NORID,},
+      {"auto",  SCSPEC, RID_AUTO,},
+      {"for",  FOR, NORID,},
+      {"__typeof",  TYPEOF, NORID},
+      {"typedef",  SCSPEC, RID_TYPEDEF,},
+      {"__extension__",  EXTENSION, NORID},
       {"int",  TYPESPEC, RID_INT,},
-      {"",}, {"",}, 
+      {"asm",  ASM_KEYWORD, NORID,},
+      {"__classof",  CLASSOF, NORID},
       {"__signed__",  TYPESPEC, RID_SIGNED},
-      {"__signed",  TYPESPEC, RID_SIGNED},
-      {"",}, {"",}, {"",}, 
+      {"signed",  TYPESPEC, RID_SIGNED,},
+      {"mutable",  SCSPEC, RID_MUTABLE,},
+      {"switch",  SWITCH, NORID,},
+      {"operator",  OPERATOR, NORID,},
       {"__attribute",  ATTRIBUTE, NORID},
-      {"sigof",  SIGOF, NORID		/* Extension */,},
+      {"struct",  AGGR, RID_RECORD,},
       {"__attribute__",  ATTRIBUTE, NORID},
+      {"if",  IF, NORID,},
+      {"void",  TYPESPEC, RID_VOID,},
+      {"break",  BREAK, NORID,},
+      {"__alignof__",  ALIGNOF, NORID},
+      {"__inline",  SCSPEC, RID_INLINE},
+      {"float",  TYPESPEC, RID_FLOAT,},
+      {"__inline__",  SCSPEC, RID_INLINE},
+      {"__signed",  TYPESPEC, RID_SIGNED},
+      {"case",  CASE, NORID,},
+      {"class",  AGGR, RID_CLASS,},
       {"",}, 
-      {"__headof",  HEADOF, NORID},
+      {"__label__",  LABEL, NORID},
+      {"default",  DEFAULT, NORID,},
+      {"const",  TYPE_QUAL, RID_CONST,},
+      {"static",  SCSPEC, RID_STATIC,},
       {"",}, {"",}, 
-      {"unsigned",  TYPESPEC, RID_UNSIGNED,},
-      {"return",  RETURN, NORID,},
-      {"asm",  ASM_KEYWORD, NORID,},
-      {"__wchar_t",  TYPESPEC, RID_WCHAR  /* Unique to ANSI C++ */,},
-      {"break",  BREAK, NORID,},
-      {"__typeof",  TYPEOF, NORID},
-      {"mutable",  SCSPEC, RID_MUTABLE,},
+      {"__alignof",  ALIGNOF, NORID},
+      {"virtual",  SCSPEC, RID_VIRTUAL,},
+      {"union",  AGGR, RID_UNION,},
+      {"",}, {"",}, {"",}, 
+      {"signature",  AGGR, RID_SIGNATURE	/* Extension */,},
+      {"headof",  HEADOF, NORID,},
       {"",}, 
-      {"public",  VISSPEC, RID_PUBLIC,},
+      {"inline",  SCSPEC, RID_INLINE,},
+      {"overload",  OVERLOAD, NORID,},
       {"",}, 
-      {"__classof",  CLASSOF, NORID},
-      {"default",  DEFAULT, NORID,},
+      {"volatile",  TYPE_QUAL, RID_VOLATILE,},
       {"",}, {"",}, {"",}, {"",}, 
-      {"exception",  AGGR, RID_EXCEPTION	/* Extension */,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"all",  ALL, NORID			/* Extension */,},
+      {"register",  SCSPEC, RID_REGISTER,},
+      {"",}, 
+      {"public",  VISSPEC, RID_PUBLIC,},
       {"",}, {"",}, 
-      {"for",  FOR, NORID,},
+      {"__wchar_t",  TYPESPEC, RID_WCHAR  /* Unique to ANSI C++ */,},
       {"",}, {"",}, 
-      {"__label__",  LABEL, NORID},
-      {"auto",  SCSPEC, RID_AUTO,},
-      {"",}, {"",}, {"",}, {"",}, 
-      {"volatile",  TYPE_QUAL, RID_VOLATILE,},
-      {"__alignof",  ALIGNOF, NORID},
+      {"return",  RETURN, NORID,},
+      {"classof",  CLASSOF, NORID,},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"dynamic_cast",  DYNAMIC_CAST, NORID,},
-      {"",}, 
+      {"unsigned",  TYPESPEC, RID_UNSIGNED,},
       {"char",  TYPESPEC, RID_CHAR,},
-      {"",}, 
-      {"if",  IF, NORID,},
-      {"",}, 
-      {"typedef",  SCSPEC, RID_TYPEDEF,},
-      {"operator",  OPERATOR, NORID,},
-      {"reraise",  RERAISE, NORID		/* Extension */,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"inline",  SCSPEC, RID_INLINE,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"continue",  CONTINUE, NORID,},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"",}, 
-      {"float",  TYPESPEC, RID_FLOAT,},
       {"",}, {"",}, {"",}, 
-      {"overload",  OVERLOAD, NORID,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"classof",  CLASSOF, NORID,},
+      {"dynamic_cast",  DYNAMIC_CAST, NORID,},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"",}, {"",}, 
-      {"register",  SCSPEC, RID_REGISTER,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      
+      {"catch",  CATCH, NORID,},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)