37th Cygnus<->FSF merge

From-SVN: r7290

1 files changed, 92 insertions, 78 deletions

diff --git a/gcc/cp/hash.h b/gcc/cp/hash.h
index 86bc4ca..0780d02 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,$ /deneb/blob/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 80
+#define TOTAL_KEYWORDS 83
 #define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 13
+#define MAX_WORD_LENGTH 16
 #define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 166
-/* maximum key range = 163, duplicates = 0 */
+#define MAX_HASH_VALUE 170
+/* maximum key range = 167, duplicates = 0 */
 
 #ifdef __GNUC__
 inline
@@ -20,19 +20,19 @@ hash (str, len)
 {
   static unsigned char asso_values[] =
     {
-     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,
+     171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+     171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+     171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+     171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+     171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+     171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+     171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+     171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+     171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+     171, 171, 171, 171, 171,   0, 171,  62,   5,  65,
+      27,   0,  18,   7,  10,  48, 171,   1,  30,   7,
+      79,   0,  33, 171,  18,   0,   4,  26,  13,   0,
+       1,  24, 171, 171, 171, 171, 171, 171,
     };
   register int hval = len;
 
@@ -68,103 +68,117 @@ is_reserved_word (str, len)
       {"",}, {"",}, 
       {"__asm__",  GCC_ASM_KEYWORD, NORID},
       {"this",  THIS, NORID,},
-      {"goto",  GOTO, NORID,},
+      {"throw",  THROW, NORID,},
       {"__headof__",  HEADOF, NORID},
-      {"",}, 
+      {"goto",  GOTO, 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},
-      {"throw",  THROW, NORID,},
+      {"",}, 
       {"enum",  ENUM, NORID,},
-      {"do",  DO, NORID,},
-      {"template",  TEMPLATE, NORID,},
+      {"static_cast",  STATIC_CAST, NORID,},
+      {"switch",  SWITCH, NORID,},
+      {"",}, {"",}, 
       {"sigof",  SIGOF, NORID		/* Extension */,},
       {"sizeof",  SIZEOF, NORID,},
-      {"delete",  DELETE, NORID,},
+      {"",}, 
       {"__headof",  HEADOF, NORID},
-      {"try",  TRY, NORID,},
+      {"short",  TYPESPEC, RID_SHORT,},
       {"typeof",  TYPEOF, NORID,},
-      {"typeid",  TYPEID, NORID,},
+      {"do",  DO, NORID,},
+      {"",}, 
+      {"try",  TRY, NORID,},
+      {"",}, 
+      {"delete",  DELETE, NORID,},
       {"__typeof__",  TYPEOF, NORID},
+      {"while",  WHILE, NORID,},
+      {"struct",  AGGR, RID_RECORD,},
+      {"typeid",  TYPEID, NORID,},
       {"double",  TYPESPEC, RID_DOUBLE,},
-      {"private",  VISSPEC, RID_PRIVATE,},
-      {"short",  TYPESPEC, RID_SHORT,},
-      {"extern",  SCSPEC, RID_EXTERN,},
-      {"__classof__",  CLASSOF, NORID},
+      {"for",  FOR, NORID,},
       {"",}, 
-      {"while",  WHILE, NORID,},
+      {"__classof__",  CLASSOF, NORID},
+      {"",}, {"",}, 
+      {"operator",  OPERATOR, NORID,},
+      {"",}, {"",}, 
+      {"typedef",  SCSPEC, RID_TYPEDEF,},
       {"long",  TYPESPEC, RID_LONG,},
-      {"new",  NEW, NORID,},
-      {"protected",  VISSPEC, RID_PROTECTED,},
-      {"friend",  SCSPEC, RID_FRIEND,},
-      {"auto",  SCSPEC, RID_AUTO,},
-      {"for",  FOR, NORID,},
+      {"template",  TEMPLATE, RID_TEMPLATE,},
       {"__typeof",  TYPEOF, NORID},
-      {"typedef",  SCSPEC, RID_TYPEDEF,},
-      {"__extension__",  EXTENSION, NORID},
+      {"friend",  SCSPEC, RID_FRIEND,},
+      {"",}, 
+      {"private",  VISSPEC, RID_PRIVATE,},
+      {"",}, 
       {"int",  TYPESPEC, RID_INT,},
-      {"asm",  ASM_KEYWORD, NORID,},
+      {"",}, 
       {"__classof",  CLASSOF, NORID},
       {"__signed__",  TYPESPEC, RID_SIGNED},
-      {"signed",  TYPESPEC, RID_SIGNED,},
-      {"mutable",  SCSPEC, RID_MUTABLE,},
-      {"switch",  SWITCH, NORID,},
-      {"operator",  OPERATOR, NORID,},
+      {"",}, {"",}, 
+      {"headof",  HEADOF, NORID,},
+      {"",}, 
       {"__attribute",  ATTRIBUTE, NORID},
-      {"struct",  AGGR, RID_RECORD,},
+      {"",}, 
       {"__attribute__",  ATTRIBUTE, NORID},
+      {"auto",  SCSPEC, RID_AUTO,},
+      {"",}, 
       {"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,},
-      {"",}, 
-      {"__label__",  LABEL, NORID},
-      {"default",  DEFAULT, NORID,},
+      {"void",  TYPESPEC, RID_VOID,},
+      {"asm",  ASM_KEYWORD, NORID,},
+      {"break",  BREAK, NORID,},
       {"const",  TYPE_QUAL, RID_CONST,},
       {"static",  SCSPEC, RID_STATIC,},
-      {"",}, {"",}, 
-      {"__alignof",  ALIGNOF, NORID},
+      {"mutable",  SCSPEC, RID_MUTABLE,},
+      {"protected",  VISSPEC, RID_PROTECTED,},
+      {"",}, {"",}, {"",}, {"",}, 
+      {"new",  NEW, NORID,},
+      {"__signed",  TYPESPEC, RID_SIGNED},
       {"virtual",  SCSPEC, RID_VIRTUAL,},
-      {"union",  AGGR, RID_UNION,},
+      {"extern",  SCSPEC, RID_EXTERN,},
       {"",}, {"",}, {"",}, 
-      {"signature",  AGGR, RID_SIGNATURE	/* Extension */,},
-      {"headof",  HEADOF, NORID,},
-      {"",}, 
-      {"inline",  SCSPEC, RID_INLINE,},
-      {"overload",  OVERLOAD, NORID,},
-      {"",}, 
-      {"volatile",  TYPE_QUAL, RID_VOLATILE,},
-      {"",}, {"",}, {"",}, {"",}, 
+      {"float",  TYPESPEC, RID_FLOAT,},
+      {"",}, {"",}, 
       {"register",  SCSPEC, RID_REGISTER,},
-      {"",}, 
-      {"public",  VISSPEC, RID_PUBLIC,},
+      {"__extension__",  EXTENSION, NORID},
       {"",}, {"",}, 
       {"__wchar_t",  TYPESPEC, RID_WCHAR  /* Unique to ANSI C++ */,},
+      {"",}, {"",}, {"",}, {"",}, 
+      {"__label__",  LABEL, NORID},
+      {"inline",  SCSPEC, RID_INLINE,},
+      {"continue",  CONTINUE, NORID,},
+      {"default",  DEFAULT, NORID,},
+      {"char",  TYPESPEC, RID_CHAR,},
       {"",}, {"",}, 
-      {"return",  RETURN, NORID,},
       {"classof",  CLASSOF, NORID,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"unsigned",  TYPESPEC, RID_UNSIGNED,},
-      {"char",  TYPESPEC, RID_CHAR,},
+      {"union",  AGGR, RID_UNION,},
+      {"",}, 
+      {"signed",  TYPESPEC, RID_SIGNED,},
+      {"volatile",  TYPE_QUAL, RID_VOLATILE,},
+      {"signature",  AGGR, RID_SIGNATURE	/* Extension */,},
+      {"overload",  OVERLOAD, NORID,},
+      {"",}, {"",}, {"",}, {"",}, 
+      {"__alignof__",  ALIGNOF, NORID},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"return",  RETURN, NORID,},
+      {"",}, {"",}, {"",}, {"",}, 
+      {"public",  VISSPEC, RID_PUBLIC,},
+      {"reinterpret_cast",  REINTERPRET_CAST, NORID,},
+      {"__alignof",  ALIGNOF, NORID},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"continue",  CONTINUE, NORID,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"",}, {"",}, {"",}, 
-      {"dynamic_cast",  DYNAMIC_CAST, NORID,},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"const_cast",  CONST_CAST, NORID,},
+      {"catch",  CATCH, NORID,},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      
-      {"catch",  CATCH, NORID,},
+      {"",}, {"",}, 
+      {"__inline",  SCSPEC, RID_INLINE},
+      {"",}, 
+      {"__inline__",  SCSPEC, RID_INLINE},
+      {"",}, 
+      {"dynamic_cast",  DYNAMIC_CAST, NORID,},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)