--- gcc/cp/hash.h 2018/04/24 18:20:22 1.1 +++ gcc/cp/hash.h 2018/04/24 18:27:21 1.1.1.2 @@ -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,$ /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,$ ../../../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 86 +#define TOTAL_KEYWORDS 97 #define MIN_WORD_LENGTH 2 #define MAX_WORD_LENGTH 16 #define MIN_HASH_VALUE 4 -#define MAX_HASH_VALUE 171 -/* maximum key range = 168, 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[] = { - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 0, 172, 36, 1, 61, - 0, 0, 30, 44, 44, 35, 172, 7, 12, 53, - 40, 17, 6, 172, 28, 2, 4, 35, 31, 51, - 5, 7, 172, 172, 172, 172, 172, 172, + 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,120 +65,144 @@ is_reserved_word (str, len) { {"",}, {"",}, {"",}, {"",}, {"else", ELSE, NORID,}, - {"",}, - {"delete", DELETE, NORID,}, - {"double", TYPESPEC, RID_DOUBLE,}, {"true", CXX_TRUE, NORID,}, - {"__asm__", GCC_ASM_KEYWORD, NORID}, - {"typeid", TYPEID, NORID,}, - {"",}, - {"this", THIS, NORID,}, {"",}, + {"while", WHILE, NORID,}, + {"virtual", SCSPEC, RID_VIRTUAL,}, + {"",}, {"",}, {"try", TRY, NORID,}, {"",}, {"",}, {"",}, {"",}, - {"do", DO, NORID,}, + {"typeof", TYPEOF, NORID,}, + {"not", '!', NORID,}, + {"new", NEW, NORID,}, + {"extern", SCSPEC, RID_EXTERN,}, + {"bool", TYPESPEC, RID_BOOL,}, + {"",}, {"",}, + {"case", CASE, NORID,}, + {"__alignof__", ALIGNOF, NORID}, {"",}, - {"static_cast", STATIC_CAST, NORID,}, - {"template", TEMPLATE, RID_TEMPLATE,}, - {"protected", VISSPEC, RID_PROTECTED,}, + {"typedef", SCSPEC, RID_TYPEDEF,}, + {"",}, + {"__extension__", EXTENSION, NORID}, + {"",}, {"",}, + {"__alignof", ALIGNOF, NORID}, + {"xor", '^', NORID,}, {"",}, - {"__classof__", CLASSOF, NORID}, + {"__inline", SCSPEC, RID_INLINE}, {"",}, - {"__headof__", HEADOF, NORID}, + {"__inline__", SCSPEC, RID_INLINE}, {"",}, - {"bool", TYPESPEC, RID_BOOL,}, + {"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}, + {"delete", DELETE, NORID,}, + {"typeid", TYPEID, NORID,}, + {"return", RETURN, NORID,}, {"__typeof__", TYPEOF, NORID}, - {"void", TYPESPEC, RID_VOID,}, + {"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,}, {"false", CXX_FALSE, NORID,}, {"sizeof", SIZEOF, NORID,}, - {"short", TYPESPEC, RID_SHORT,}, - {"typeof", TYPEOF, NORID,}, + {"or", OROR, 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,}, - {"__signed", TYPESPEC, RID_SIGNED}, - {"private", VISSPEC, RID_PRIVATE,}, + {"const", TYPE_QUAL, RID_CONST,}, + {"static", SCSPEC, RID_STATIC,}, + {"reinterpret_cast", REINTERPRET_CAST, NORID,}, + {"",}, + {"explicit", SCSPEC, RID_EXPLICIT,}, {"__signed__", TYPESPEC, RID_SIGNED}, - {"extern", SCSPEC, RID_EXTERN,}, - {"struct", AGGR, RID_RECORD,}, - {"signed", TYPESPEC, RID_SIGNED,}, - {"break", BREAK, NORID,}, + {"if", IF, NORID,}, {"__attribute", ATTRIBUTE, NORID}, - {"default", DEFAULT, NORID,}, + {"short", TYPESPEC, RID_SHORT,}, {"__attribute__", ATTRIBUTE, NORID}, - {"__classof", CLASSOF, NORID}, - {"sigof", SIGOF, NORID /* Extension */,}, - {"__headof", HEADOF, NORID}, - {"switch", SWITCH, NORID,}, + {"bitor", '|', NORID,}, + {"signature", AGGR, RID_SIGNATURE /* Extension */,}, + {"",}, + {"__sigof__", SIGOF, NORID /* Extension */,}, + {"volatile", TYPE_QUAL, RID_VOLATILE,}, {"__label__", LABEL, NORID}, - {"__extension__", EXTENSION, NORID}, + {"do", DO, NORID,}, {"",}, {"__asm", GCC_ASM_KEYWORD, NORID}, - {"for", FOR, NORID,}, - {"__typeof", TYPEOF, NORID}, - {"__alignof__", ALIGNOF, NORID}, - {"",}, - {"case", CASE, NORID,}, - {"virtual", SCSPEC, RID_VIRTUAL,}, - {"if", IF, NORID,}, - {"while", WHILE, NORID,}, + {"protected", VISSPEC, RID_PROTECTED,}, {"",}, - {"class", AGGR, RID_CLASS,}, - {"typedef", SCSPEC, RID_TYPEDEF,}, - {"const", TYPE_QUAL, RID_CONST,}, - {"static", SCSPEC, RID_STATIC,}, - {"auto", SCSPEC, RID_AUTO,}, {"float", TYPESPEC, RID_FLOAT,}, - {"inline", SCSPEC, RID_INLINE,}, - {"throw", THROW, NORID,}, - {"unsigned", TYPESPEC, RID_UNSIGNED,}, + {"using", USING, NORID,}, {"",}, - {"headof", HEADOF, NORID,}, + {"const_cast", CONST_CAST, NORID,}, {"",}, - {"goto", GOTO, NORID,}, - {"",}, {"",}, - {"public", VISSPEC, RID_PUBLIC,}, - {"signature", AGGR, RID_SIGNATURE /* Extension */,}, - {"volatile", TYPE_QUAL, RID_VOLATILE,}, - {"__inline", SCSPEC, RID_INLINE}, - {"overload", OVERLOAD, NORID,}, - {"__inline__", SCSPEC, RID_INLINE}, - {"__alignof", ALIGNOF, 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,}, {"asm", ASM_KEYWORD, NORID,}, - {"",}, - {"new", NEW, NORID,}, - {"",}, + {"",}, {"",}, {"",}, {"mutable", SCSPEC, RID_MUTABLE,}, - {"union", AGGR, RID_UNION,}, - {"operator", OPERATOR, NORID,}, + {"",}, {"",}, {"",}, + {"__signed", TYPESPEC, RID_SIGNED}, + {"class", AGGR, RID_CLASS,}, {"register", SCSPEC, RID_REGISTER,}, - {"",}, {"",}, - {"__wchar_t", TYPESPEC, RID_WCHAR /* Unique to ANSI C++ */,}, - {"",}, - {"long", TYPESPEC, RID_LONG,}, {"",}, {"",}, {"",}, - {"continue", CONTINUE, NORID,}, - {"return", RETURN, NORID,}, - {"enum", ENUM, NORID,}, - {"",}, {"",}, - {"dynamic_cast", DYNAMIC_CAST, NORID,}, - {"",}, {"",}, - {"reinterpret_cast", REINTERPRET_CAST, NORID,}, + {"and", ANDAND, NORID,}, {"",}, {"",}, {"",}, {"",}, - {"char", TYPESPEC, RID_CHAR,}, + {"long", TYPESPEC, RID_LONG,}, + {"default", DEFAULT, NORID,}, + {"operator", OPERATOR, NORID,}, + {"unsigned", TYPESPEC, RID_UNSIGNED,}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"classof", CLASSOF, NORID,}, + {"inline", SCSPEC, RID_INLINE,}, + {"",}, + {"bitand", '&', NORID,}, + {"",}, + {"goto", GOTO, NORID,}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"const_cast", CONST_CAST, NORID,}, + {"dynamic_cast", DYNAMIC_CAST, NORID,}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"__signature__", AGGR, RID_SIGNATURE /* Extension */,}, + {"",}, + {"auto", SCSPEC, RID_AUTO,}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"catch", CATCH, NORID,}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"overload", OVERLOAD, NORID,}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)