75th Cygnus<->FSF merge

From-SVN: r10438

1 files changed, 115 insertions, 115 deletions

diff --git a/gcc/cp/hash.h b/gcc/cp/hash.h
index 6f6a97a..4848aba 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 101
+#define TOTAL_KEYWORDS 97
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 16
 #define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 210
-/* maximum key range = 207, duplicates = 0 */
+#define MAX_HASH_VALUE 219
+/* maximum key range = 216, duplicates = 0 */
 
 #ifdef __GNUC__
 inline
@@ -20,19 +20,19 @@ hash (str, len)
 {
   static unsigned char asso_values[] =
     {
-     211, 211, 211, 211, 211, 211, 211, 211, 211, 211,
-     211, 211, 211, 211, 211, 211, 211, 211, 211, 211,
-     211, 211, 211, 211, 211, 211, 211, 211, 211, 211,
-     211, 211, 211, 211, 211, 211, 211, 211, 211, 211,
-     211, 211, 211, 211, 211, 211, 211, 211, 211, 211,
-     211, 211, 211, 211, 211, 211, 211, 211, 211, 211,
-     211, 211, 211, 211, 211, 211, 211, 211, 211, 211,
-     211, 211, 211, 211, 211, 211, 211, 211, 211, 211,
-     211, 211, 211, 211, 211, 211, 211, 211, 211, 211,
-     211, 211, 211, 211, 211,   0, 211,  35,   1,  69,
-      61,   0,  19,  65,  20, 100, 211,   5,  11,  52,
-       3,  25,   6,   2,  31,  26,   4,  41,  24,  64,
-      10,  24, 211, 211, 211, 211, 211, 211,
+     220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
+     220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
+     220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
+     220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
+     220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
+     220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
+     220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
+     220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
+     220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
+     220, 220, 220, 220, 220,   0, 220,  88,  16,  19,
+      52,   0,   9,  72,   1,  77, 220,   0,   0,  38,
+      13,  44,  38,  30,  27,  57,   1,  14,   0,   2,
+       2,   7, 220, 220, 220, 220, 220, 220,
     };
   register int hval = len;
 
@@ -65,144 +65,144 @@ is_reserved_word (str, len)
     {
       {"",}, {"",}, {"",}, {"",}, 
       {"else",  ELSE, NORID,},
-      {"",}, {"",}, {"",}, 
       {"true",  CXX_TRUE, NORID,},
-      {"extern",  SCSPEC, RID_EXTERN,},
+      {"",}, 
+      {"while",  WHILE, NORID,},
+      {"virtual",  SCSPEC, RID_VIRTUAL,},
+      {"",}, {"",}, 
+      {"try",  TRY, NORID,},
+      {"",}, {"",}, {"",}, {"",}, 
+      {"typeof",  TYPEOF, NORID,},
       {"not",  '!', NORID,},
-      {"not_eq",  EQCOMPARE, NORID,},
+      {"new",  NEW, NORID,},
+      {"extern",  SCSPEC, RID_EXTERN,},
+      {"bool",  TYPESPEC, RID_BOOL,},
       {"",}, {"",}, 
-      {"__inline",  SCSPEC, RID_INLINE},
+      {"case",  CASE, NORID,},
+      {"__alignof__",  ALIGNOF, NORID},
       {"",}, 
-      {"__inline__",  SCSPEC, RID_INLINE},
+      {"typedef",  SCSPEC, RID_TYPEDEF,},
       {"",}, 
-      {"xor_eq",  ASSIGN, NORID,},
-      {"",}, {"",}, {"",}, 
-      {"template",  TEMPLATE, RID_TEMPLATE,},
-      {"",}, {"",}, 
-      {"__alignof__",  ALIGNOF, NORID},
       {"__extension__",  EXTENSION, NORID},
-      {"bool",  TYPESPEC, RID_BOOL,},
+      {"",}, {"",}, 
+      {"__alignof",  ALIGNOF, NORID},
+      {"xor",  '^', NORID,},
       {"",}, 
-      {"typeof",  TYPEOF, NORID,},
+      {"__inline",  SCSPEC, RID_INLINE},
       {"",}, 
-      {"try",  TRY, NORID,},
-      {"or_eq",  ASSIGN, NORID,},
-      {"__asm__",  GCC_ASM_KEYWORD, NORID},
+      {"__inline__",  SCSPEC, RID_INLINE},
       {"",}, 
-      {"__headof__",  HEADOF, NORID},
+      {"xor_eq",  ASSIGN, NORID,},
+      {"for",  FOR, NORID,},
+      {"",}, {"",}, 
+      {"continue",  CONTINUE, NORID,},
       {"",}, 
+      {"catch",  CATCH, NORID,},
       {"private",  VISSPEC, RID_PRIVATE,},
+      {"",}, 
+      {"typename",  TYPENAME_KEYWORD, NORID,},
+      {"template",  TEMPLATE, RID_TEMPLATE,},
+      {"not_eq",  EQCOMPARE, NORID,},
+      {"",}, {"",}, 
+      {"throw",  THROW, NORID,},
+      {"__const",  TYPE_QUAL, RID_CONST},
       {"__const__",  TYPE_QUAL, RID_CONST},
       {"__volatile",  TYPE_QUAL, RID_VOLATILE},
-      {"__const",  TYPE_QUAL, RID_CONST},
+      {"__wchar_t",  TYPESPEC, RID_WCHAR  /* Unique to ANSI C++ */,},
       {"__volatile__",  TYPE_QUAL, RID_VOLATILE},
-      {"__alignof",  ALIGNOF, NORID},
-      {"and_eq",  ASSIGN, NORID,},
-      {"xor",  '^', NORID,},
+      {"delete",  DELETE, NORID,},
+      {"typeid",  TYPEID, NORID,},
+      {"return",  RETURN, NORID,},
+      {"__typeof__",  TYPEOF, NORID},
+      {"compl",  '~', NORID,},
+      {"public",  VISSPEC, RID_PUBLIC,},
+      {"__asm__",  GCC_ASM_KEYWORD, NORID},
+      {"switch",  SWITCH, NORID,},
+      {"",}, 
+      {"friend",  SCSPEC, RID_FRIEND,},
+      {"__typeof",  TYPEOF, NORID},
+      {"",}, 
       {"static_cast",  STATIC_CAST, NORID,},
-      {"break",  BREAK, NORID,},
-      {"namespace",  NAMESPACE, NORID,},
-      {"__classof__",  CLASSOF, NORID},
-      {"typedef",  SCSPEC, RID_TYPEDEF,},
       {"false",  CXX_FALSE, NORID,},
       {"sizeof",  SIZEOF, NORID,},
-      {"__headof",  HEADOF, NORID},
-      {"for",  FOR, NORID,},
-      {"",}, 
-      {"__label__",  LABEL, NORID},
-      {"switch",  SWITCH, NORID,},
-      {"virtual",  SCSPEC, RID_VIRTUAL,},
       {"or",  OROR, NORID,},
-      {"__typeof__",  TYPEOF, NORID},
-      {"this",  THIS, NORID,},
-      {"",}, 
-      {"bitor",  '|', NORID,},
-      {"float",  TYPESPEC, RID_FLOAT,},
-      {"typename",  TYPENAME_KEYWORD, NORID,},
-      {"__classof",  CLASSOF, NORID},
-      {"short",  TYPESPEC, RID_SHORT,},
-      {"delete",  DELETE, NORID,},
       {"double",  TYPESPEC, RID_DOUBLE,},
       {"",}, 
-      {"new",  NEW, NORID,},
-      {"typeid",  TYPEID, NORID,},
-      {"",}, 
-      {"case",  CASE, NORID,},
       {"union",  AGGR, RID_UNION,},
-      {"sigof",  SIGOF, NORID		/* Extension */,},
-      {"__typeof",  TYPEOF, NORID},
+      {"char",  TYPESPEC, RID_CHAR,},
       {"struct",  AGGR, RID_RECORD,},
-      {"volatile",  TYPE_QUAL, RID_VOLATILE,},
+      {"or_eq",  ASSIGN, NORID,},
+      {"enum",  ENUM, NORID,},
+      {"int",  TYPESPEC, RID_INT,},
+      {"const",  TYPE_QUAL, RID_CONST,},
+      {"static",  SCSPEC, RID_STATIC,},
+      {"reinterpret_cast",  REINTERPRET_CAST, NORID,},
+      {"",}, 
+      {"explicit",  SCSPEC, RID_EXPLICIT,},
+      {"__signed__",  TYPESPEC, RID_SIGNED},
+      {"if",  IF, NORID,},
+      {"__attribute",  ATTRIBUTE, NORID},
+      {"short",  TYPESPEC, RID_SHORT,},
+      {"__attribute__",  ATTRIBUTE, NORID},
+      {"bitor",  '|', NORID,},
       {"signature",  AGGR, RID_SIGNATURE	/* Extension */,},
-      {"while",  WHILE, NORID,},
-      {"return",  RETURN, NORID,},
+      {"",}, 
+      {"__sigof__",  SIGOF, NORID		/* Extension */,},
+      {"volatile",  TYPE_QUAL, RID_VOLATILE,},
+      {"__label__",  LABEL, NORID},
+      {"do",  DO, NORID,},
       {"",}, 
       {"__asm",  GCC_ASM_KEYWORD, NORID},
       {"protected",  VISSPEC, RID_PROTECTED,},
-      {"reinterpret_cast",  REINTERPRET_CAST, NORID,},
-      {"friend",  SCSPEC, RID_FRIEND,},
       {"",}, 
-      {"do",  DO, NORID,},
-      {"auto",  SCSPEC, RID_AUTO,},
-      {"asm",  ASM_KEYWORD, NORID,},
-      {"compl",  '~', NORID,},
-      {"public",  VISSPEC, RID_PUBLIC,},
+      {"float",  TYPESPEC, RID_FLOAT,},
+      {"using",  USING, NORID,},
       {"",}, 
-      {"mutable",  SCSPEC, RID_MUTABLE,},
+      {"const_cast",  CONST_CAST, NORID,},
       {"",}, 
+      {"void",  TYPESPEC, RID_VOID,},
+      {"break",  BREAK, NORID,},
+      {"namespace",  NAMESPACE, NORID,},
+      {"",}, {"",}, {"",}, {"",}, 
+      {"sigof",  SIGOF, NORID		/* Extension */,},
+      {"",}, {"",}, {"",}, 
+      {"this",  THIS, NORID,},
+      {"",}, {"",}, {"",}, {"",}, 
+      {"and_eq",  ASSIGN, NORID,},
+      {"",}, {"",}, {"",}, 
       {"signed",  TYPESPEC, RID_SIGNED,},
-      {"",}, 
-      {"throw",  THROW, NORID,},
-      {"and",  ANDAND, NORID,},
+      {"asm",  ASM_KEYWORD, NORID,},
       {"",}, {"",}, {"",}, 
-      {"bitand",  '&', NORID,},
-      {"const",  TYPE_QUAL, RID_CONST,},
-      {"static",  SCSPEC, RID_STATIC,},
-      {"headof",  HEADOF, NORID,},
-      {"int",  TYPESPEC, RID_INT,},
-      {"enum",  ENUM, NORID,},
-      {"",}, 
-      {"__signed__",  TYPESPEC, RID_SIGNED},
+      {"mutable",  SCSPEC, RID_MUTABLE,},
+      {"",}, {"",}, {"",}, 
+      {"__signed",  TYPESPEC, RID_SIGNED},
+      {"class",  AGGR, RID_CLASS,},
+      {"register",  SCSPEC, RID_REGISTER,},
+      {"",}, {"",}, {"",}, 
+      {"and",  ANDAND, NORID,},
+      {"",}, {"",}, {"",}, {"",}, 
+      {"long",  TYPESPEC, RID_LONG,},
       {"default",  DEFAULT, NORID,},
+      {"operator",  OPERATOR, NORID,},
+      {"unsigned",  TYPESPEC, RID_UNSIGNED,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"inline",  SCSPEC, RID_INLINE,},
       {"",}, 
-      {"__wchar_t",  TYPESPEC, RID_WCHAR  /* Unique to ANSI C++ */,},
-      {"using",  USING, NORID,},
-      {"__attribute",  ATTRIBUTE, NORID},
-      {"",}, 
-      {"__attribute__",  ATTRIBUTE, NORID},
+      {"bitand",  '&', NORID,},
       {"",}, 
       {"goto",  GOTO, NORID,},
-      {"operator",  OPERATOR, NORID,},
-      {"if",  IF, NORID,},
-      {"continue",  CONTINUE, NORID,},
-      {"explicit",  SCSPEC, RID_EXPLICIT,},
-      {"",}, {"",}, 
-      {"class",  AGGR, RID_CLASS,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"char",  TYPESPEC, RID_CHAR,},
-      {"",}, {"",}, {"",}, {"",}, 
-      {"classof",  CLASSOF, NORID,},
-      {"",}, {"",}, {"",}, {"",}, 
-      {"long",  TYPESPEC, RID_LONG,},
-      {"",}, {"",}, {"",}, {"",}, 
-      {"void",  TYPESPEC, RID_VOID,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"overload",  OVERLOAD, NORID,},
-      {"",}, {"",}, 
-      {"catch",  CATCH, NORID,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"__signed",  TYPESPEC, RID_SIGNED},
-      {"register",  SCSPEC, RID_REGISTER,},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"const_cast",  CONST_CAST, NORID,},
-      {"",}, {"",}, 
       {"dynamic_cast",  DYNAMIC_CAST, NORID,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"__signature__",  AGGR, RID_SIGNATURE	/* Extension */,},
+      {"",}, 
+      {"auto",  SCSPEC, RID_AUTO,},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"inline",  SCSPEC, RID_INLINE,},
-      {"",}, {"",}, {"",}, 
-      {"unsigned",  TYPESPEC, RID_UNSIGNED,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, 
+      {"overload",  OVERLOAD, NORID,},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)