87th Cygnus<->FSF quick merge

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

1 files changed, 124 insertions, 116 deletions

diff --git a/gcc/cp/hash.h b/gcc/cp/hash.h
index 4848aba4775..d8bdc06ee2b 100644
--- a/gcc/cp/hash.h
+++ b/gcc/cp/hash.h
@@ -1,14 +1,14 @@
 /* C code produced by gperf version 2.5 (GNU C++ version) */
-/* Command-line: gperf -p -j1 -g -o -t -N is_reserved_word -k1,4,7,$ ../../../devo/gcc/cp/gxx.gperf  */
+/* Command-line: gperf -p -j1 -g -o -t -N is_reserved_word -k1,4,7,$ /yorick/splunge/jason/g++/small/devo/gcc/cp/gxx.gperf  */
 /* 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 97
+#define TOTAL_KEYWORDS 98
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 16
 #define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 219
-/* maximum key range = 216, duplicates = 0 */
+#define MAX_HASH_VALUE 258
+/* maximum key range = 255, duplicates = 0 */
 
 #ifdef __GNUC__
 inline
@@ -18,21 +18,21 @@ hash (str, len)
      register char *str;
      register int unsigned len;
 {
-  static unsigned char asso_values[] =
+  static unsigned short asso_values[] =
     {
-     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,
+     259, 259, 259, 259, 259, 259, 259, 259, 259, 259,
+     259, 259, 259, 259, 259, 259, 259, 259, 259, 259,
+     259, 259, 259, 259, 259, 259, 259, 259, 259, 259,
+     259, 259, 259, 259, 259, 259, 259, 259, 259, 259,
+     259, 259, 259, 259, 259, 259, 259, 259, 259, 259,
+     259, 259, 259, 259, 259, 259, 259, 259, 259, 259,
+     259, 259, 259, 259, 259, 259, 259, 259, 259, 259,
+     259, 259, 259, 259, 259, 259, 259, 259, 259, 259,
+     259, 259, 259, 259, 259, 259, 259, 259, 259, 259,
+     259, 259, 259, 259, 259,   0, 259,  27,  17,  20,
+      40,   0,  64,   6,  10,  89, 259,   2, 110,  44,
+      13, 107,  40,  10,  18,  55,   1,   3,   5,  17,
+       2,   4, 259, 259, 259, 259, 259, 259,
     };
   register int hval = len;
 
@@ -49,6 +49,7 @@ hash (str, len)
       case 2:
       case 1:
         hval += asso_values[str[0]];
+        break;
     }
   return hval + asso_values[str[len - 1]];
 }
@@ -66,143 +67,150 @@ is_reserved_word (str, len)
       {"",}, {"",}, {"",}, {"",}, 
       {"else",  ELSE, NORID,},
       {"true",  CXX_TRUE, NORID,},
-      {"",}, 
-      {"while",  WHILE, NORID,},
-      {"virtual",  SCSPEC, RID_VIRTUAL,},
       {"",}, {"",}, 
       {"try",  TRY, NORID,},
-      {"",}, {"",}, {"",}, {"",}, 
-      {"typeof",  TYPEOF, NORID,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"not",  '!', NORID,},
-      {"new",  NEW, NORID,},
+      {"xor_eq",  ASSIGN, NORID,},
       {"extern",  SCSPEC, RID_EXTERN,},
-      {"bool",  TYPESPEC, RID_BOOL,},
-      {"",}, {"",}, 
+      {"",}, {"",}, {"",}, 
+      {"xor",  '^', NORID,},
       {"case",  CASE, NORID,},
-      {"__alignof__",  ALIGNOF, NORID},
-      {"",}, 
-      {"typedef",  SCSPEC, RID_TYPEDEF,},
-      {"",}, 
+      {"",}, {"",}, 
+      {"using",  USING, NORID,},
       {"__extension__",  EXTENSION, NORID},
+      {"not_eq",  EQCOMPARE, NORID,},
       {"",}, {"",}, 
-      {"__alignof",  ALIGNOF, NORID},
-      {"xor",  '^', NORID,},
-      {"",}, 
+      {"continue",  CONTINUE, NORID,},
+      {"new",  NEW, NORID,},
       {"__inline",  SCSPEC, RID_INLINE},
       {"",}, 
       {"__inline__",  SCSPEC, RID_INLINE},
-      {"",}, 
-      {"xor_eq",  ASSIGN, NORID,},
-      {"for",  FOR, NORID,},
+      {"",}, {"",}, {"",}, 
+      {"return",  RETURN, NORID,},
       {"",}, {"",}, 
-      {"continue",  CONTINUE, NORID,},
-      {"",}, 
-      {"catch",  CATCH, NORID,},
-      {"private",  VISSPEC, RID_PRIVATE,},
-      {"",}, 
-      {"typename",  TYPENAME_KEYWORD, NORID,},
-      {"template",  TEMPLATE, RID_TEMPLATE,},
-      {"not_eq",  EQCOMPARE, NORID,},
+      {"and_eq",  ASSIGN, NORID,},
       {"",}, {"",}, 
-      {"throw",  THROW, NORID,},
-      {"__const",  TYPE_QUAL, RID_CONST},
-      {"__const__",  TYPE_QUAL, RID_CONST},
-      {"__volatile",  TYPE_QUAL, RID_VOLATILE},
-      {"__wchar_t",  TYPESPEC, RID_WCHAR  /* Unique to ANSI C++ */,},
-      {"__volatile__",  TYPE_QUAL, RID_VOLATILE},
       {"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,},
+      {"__wchar_t",  TYPESPEC, RID_WCHAR  /* Unique to ANSI C++ */,},
+      {"namespace",  NAMESPACE, NORID,},
+      {"template",  TEMPLATE, RID_TEMPLATE,},
+      {"break",  BREAK, NORID,},
+      {"private",  VISSPEC, RID_PRIVATE,},
+      {"typename",  TYPENAME_KEYWORD, NORID,},
       {"",}, 
-      {"friend",  SCSPEC, RID_FRIEND,},
-      {"__typeof",  TYPEOF, NORID},
+      {"catch",  CATCH, NORID,},
+      {"",}, {"",}, {"",}, {"",}, 
+      {"char",  TYPESPEC, RID_CHAR,},
       {"",}, 
-      {"static_cast",  STATIC_CAST, NORID,},
-      {"false",  CXX_FALSE, NORID,},
-      {"sizeof",  SIZEOF, NORID,},
-      {"or",  OROR, NORID,},
+      {"__asm__",  GCC_ASM_KEYWORD, NORID},
       {"double",  TYPESPEC, RID_DOUBLE,},
       {"",}, 
-      {"union",  AGGR, RID_UNION,},
-      {"char",  TYPESPEC, RID_CHAR,},
       {"struct",  AGGR, RID_RECORD,},
-      {"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},
+      {"static_cast",  STATIC_CAST, NORID,},
+      {"",}, 
+      {"and",  ANDAND, NORID,},
+      {"typeof",  TYPEOF, NORID,},
+      {"switch",  SWITCH, NORID,},
+      {"",}, 
+      {"asm",  ASM_KEYWORD, NORID,},
+      {"",}, 
+      {"default",  DEFAULT, NORID,},
+      {"",}, 
+      {"mutable",  SCSPEC, RID_MUTABLE,},
       {"short",  TYPESPEC, RID_SHORT,},
-      {"__attribute__",  ATTRIBUTE, NORID},
-      {"bitor",  '|', NORID,},
       {"signature",  AGGR, RID_SIGNATURE	/* Extension */,},
+      {"const",  TYPE_QUAL, RID_CONST,},
+      {"static",  SCSPEC, RID_STATIC,},
+      {"",}, {"",}, 
+      {"for",  FOR, NORID,},
+      {"",}, {"",}, {"",}, 
+      {"void",  TYPESPEC, RID_VOID,},
+      {"bitand",  '&', NORID,},
+      {"protected",  VISSPEC, RID_PROTECTED,},
+      {"enum",  ENUM, NORID,},
+      {"int",  TYPESPEC, RID_INT,},
+      {"",}, {"",}, {"",}, 
+      {"float",  TYPESPEC, RID_FLOAT,},
       {"",}, 
-      {"__sigof__",  SIGOF, NORID		/* Extension */,},
-      {"volatile",  TYPE_QUAL, RID_VOLATILE,},
-      {"__label__",  LABEL, NORID},
-      {"do",  DO, NORID,},
+      {"__signed__",  TYPESPEC, RID_SIGNED},
+      {"dynamic_cast",  DYNAMIC_CAST, NORID,},
+      {"__attribute",  ATTRIBUTE, NORID},
       {"",}, 
+      {"__attribute__",  ATTRIBUTE, NORID},
       {"__asm",  GCC_ASM_KEYWORD, NORID},
-      {"protected",  VISSPEC, RID_PROTECTED,},
-      {"",}, 
-      {"float",  TYPESPEC, RID_FLOAT,},
-      {"using",  USING, NORID,},
       {"",}, 
       {"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,},
+      {"friend",  SCSPEC, RID_FRIEND,},
       {"",}, {"",}, {"",}, 
       {"signed",  TYPESPEC, RID_SIGNED,},
-      {"asm",  ASM_KEYWORD, NORID,},
-      {"",}, {"",}, {"",}, 
-      {"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,},
+      {"this",  THIS, NORID,},
+      {"__const",  TYPE_QUAL, RID_CONST},
+      {"__const__",  TYPE_QUAL, RID_CONST},
+      {"__volatile",  TYPE_QUAL, RID_VOLATILE},
+      {"__null",  CONSTANT, RID_NULL},
+      {"__volatile__",  TYPE_QUAL, RID_VOLATILE},
+      {"__typeof__",  TYPEOF, NORID},
+      {"or_eq",  ASSIGN, NORID,},
       {"",}, 
-      {"bitand",  '&', NORID,},
+      {"false",  CXX_FALSE, NORID,},
+      {"sizeof",  SIZEOF, NORID,},
+      {"long",  TYPESPEC, RID_LONG,},
+      {"or",  OROR, NORID,},
+      {"union",  AGGR, RID_UNION,},
+      {"__signature__",  AGGR, RID_SIGNATURE	/* Extension */,},
+      {"throw",  THROW, NORID,},
       {"",}, 
-      {"goto",  GOTO, NORID,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"dynamic_cast",  DYNAMIC_CAST, NORID,},
+      {"while",  WHILE, NORID,},
+      {"register",  SCSPEC, RID_REGISTER,},
+      {"__alignof__",  ALIGNOF, NORID},
+      {"class",  AGGR, RID_CLASS,},
+      {"typedef",  SCSPEC, RID_TYPEDEF,},
+      {"__signed",  TYPESPEC, RID_SIGNED},
+      {"",}, {"",}, 
+      {"unsigned",  TYPESPEC, RID_UNSIGNED,},
       {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"__signature__",  AGGR, RID_SIGNATURE	/* Extension */,},
+      {"__label__",  LABEL, NORID},
+      {"bitor",  '|', NORID,},
       {"",}, 
-      {"auto",  SCSPEC, RID_AUTO,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"do",  DO, NORID,},
+      {"volatile",  TYPE_QUAL, RID_VOLATILE,},
+      {"",}, {"",}, {"",}, {"",}, 
+      {"if",  IF, NORID,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"__sigof__",  SIGOF, NORID		/* Extension */,},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, 
+      {"compl",  '~', NORID,},
+      {"public",  VISSPEC, RID_PUBLIC,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"__typeof",  TYPEOF, NORID},
+      {"inline",  SCSPEC, RID_INLINE,},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"",}, {"",}, 
+      {"__alignof",  ALIGNOF, NORID},
+      {"",}, {"",}, {"",}, 
       {"overload",  OVERLOAD, NORID,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"explicit",  SCSPEC, RID_EXPLICIT,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"goto",  GOTO, NORID,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"sigof",  SIGOF, NORID		/* Extension */,},
+      {"",}, 
+      {"virtual",  SCSPEC, RID_VIRTUAL,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"bool",  TYPESPEC, RID_BOOL,},
+      {"",}, {"",}, {"",}, 
+      {"auto",  SCSPEC, RID_AUTO,},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, 
+      {"operator",  OPERATOR, NORID,},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)