From dfa90a47532f2ad6a086e31cc39ba2bd2b668255 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 24 Sep 1998 22:29:28 +0000 Subject: [PATCH] spew.c (yylex): Give diagnostic. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit � 1998-09-24 Benjamin Kosnik * spew.c (yylex): Give diagnostic. * hash.h (is_reserved_word): Add export. * gxx.gperf: Ditto. * lex.h (rid): Add RID_EXPORT. * lex.c (init_parse): Ditto. From-SVN: r22578 --- gcc/cp/hash.h | 235 ++++++++++++++++++++++++++------------------------ 1 file changed, 121 insertions(+), 114 deletions(-) diff --git a/gcc/cp/hash.h b/gcc/cp/hash.h index 1e31a354724..3d4200e84c3 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,$ ../../../gcc/cp/gxx.gperf */ +/* Command-line: gperf -p -j1 -g -o -t -N is_reserved_word -k1,4,7,$ /home/bkoz/src.egcs/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 103 +#define TOTAL_KEYWORDS 104 #define MIN_WORD_LENGTH 2 #define MAX_WORD_LENGTH 16 #define MIN_HASH_VALUE 4 -#define MAX_HASH_VALUE 195 -/* maximum key range = 192, duplicates = 0 */ +#define MAX_HASH_VALUE 261 +/* maximum key range = 258, 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[] = { - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 0, 196, 80, 26, 28, - 44, 0, 49, 38, 6, 81, 196, 2, 0, 41, - 16, 47, 4, 31, 32, 5, 6, 62, 20, 96, - 17, 25, 196, 196, 196, 196, 196, 196, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 0, 262, 87, 25, 96, + 60, 0, 55, 7, 4, 41, 262, 2, 15, 49, + 14, 63, 32, 29, 3, 23, 6, 8, 2, 2, + 0, 7, 262, 262, 262, 262, 262, 262, }; register int hval = len; @@ -67,147 +67,154 @@ is_reserved_word (str, len) {"",}, {"",}, {"",}, {"",}, {"else", ELSE, NORID,}, {"",}, - {"__real", REALPART, NORID}, + {"xor", '^', NORID,}, {"",}, {"__real__", REALPART, NORID}, {"",}, {"true", CXX_TRUE, NORID,}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"try", TRY, NORID,}, + {"",}, {"",}, + {"new", NEW, NORID,}, + {"extern", SCSPEC, RID_EXTERN,}, + {"__real", REALPART, NORID}, + {"while", WHILE, NORID,}, + {"not", '!', NORID,}, + {"",}, {"",}, {"",}, + {"__extension__", EXTENSION, NORID}, {"",}, + {"__null", CONSTANT, RID_NULL}, {"__asm__", ASM_KEYWORD, NORID}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"this", THIS, NORID,}, + {"return", RETURN, NORID,}, {"",}, - {"extern", SCSPEC, RID_EXTERN,}, + {"long", TYPESPEC, RID_LONG,}, + {"using", USING, NORID,}, + {"xor_eq", ASSIGN, NORID,}, + {"__inline", SCSPEC, RID_INLINE}, + {"short", TYPESPEC, RID_SHORT,}, + {"__inline__", SCSPEC, RID_INLINE}, {"switch", SWITCH, NORID,}, - {"template", TEMPLATE, RID_TEMPLATE,}, - {"not", '!', NORID,}, - {"",}, {"__alignof__", ALIGNOF, NORID}, - {"static_cast", STATIC_CAST, NORID,}, - {"",}, - {"bool", TYPESPEC, RID_BOOL,}, {"private", VISSPEC, RID_PRIVATE,}, - {"case", CASE, NORID,}, + {"reinterpret_cast", REINTERPRET_CAST, NORID,}, + {"struct", AGGR, RID_RECORD,}, + {"",}, {"virtual", SCSPEC, RID_VIRTUAL,}, - {"try", TRY, NORID,}, + {"static_cast", STATIC_CAST, NORID,}, {"",}, {"",}, - {"compl", '~', NORID,}, - {"public", VISSPEC, RID_PUBLIC,}, - {"",}, - {"__inline", SCSPEC, RID_INLINE}, - {"",}, - {"__inline__", SCSPEC, RID_INLINE}, - {"class", AGGR, RID_CLASS,}, - {"const", CV_QUALIFIER, RID_CONST,}, - {"static", SCSPEC, RID_STATIC,}, - {"__extension__", EXTENSION, NORID}, + {"not_eq", EQCOMPARE, NORID,}, + {"int", TYPESPEC, RID_INT,}, + {"__signed__", TYPESPEC, RID_SIGNED}, + {"template", TEMPLATE, RID_TEMPLATE,}, {"",}, - {"short", TYPESPEC, RID_SHORT,}, + {"signature", AGGR, RID_SIGNATURE /* Extension */,}, + {"register", SCSPEC, RID_REGISTER,}, + {"this", THIS, NORID,}, {"__imag__", IMAGPART, NORID}, - {"delete", DELETE, NORID,}, - {"__asm", ASM_KEYWORD, NORID}, - {"xor", '^', NORID,}, - {"not_eq", EQCOMPARE, NORID,}, - {"xor_eq", ASSIGN, NORID,}, + {"__attribute", ATTRIBUTE, NORID}, + {"bool", TYPESPEC, RID_BOOL,}, + {"__attribute__", ATTRIBUTE, NORID}, + {"for", FOR, NORID,}, + {"__imag", IMAGPART, NORID}, {"typename", TYPENAME_KEYWORD, NORID,}, - {"typeid", TYPEID, NORID,}, - {"",}, - {"__complex__", TYPESPEC, RID_COMPLEX}, - {"false", CXX_FALSE, NORID,}, - {"sizeof", SIZEOF, NORID,}, + {"",}, {"",}, + {"delete", DELETE, NORID,}, {"typeof", TYPEOF, NORID,}, + {"or", OROR, NORID,}, + {"",}, + {"explicit", SCSPEC, RID_EXPLICIT,}, + {"",}, + {"typeid", TYPEID, NORID,}, + {"",}, {"",}, + {"export", SCSPEC, RID_EXPORT,}, + {"throw", THROW, NORID,}, + {"__asm", ASM_KEYWORD, NORID}, {"__const__", CV_QUALIFIER, RID_CONST}, {"__volatile", CV_QUALIFIER, RID_VOLATILE}, - {"",}, + {"__typeof__", TYPEOF, NORID}, {"__volatile__", CV_QUALIFIER, RID_VOLATILE}, {"__const", CV_QUALIFIER, RID_CONST}, - {"catch", CATCH, NORID,}, - {"__null", CONSTANT, RID_NULL}, - {"protected", VISSPEC, RID_PROTECTED,}, - {"",}, - {"signed", TYPESPEC, RID_SIGNED,}, - {"",}, + {"false", CXX_FALSE, NORID,}, + {"sizeof", SIZEOF, NORID,}, + {"",}, {"",}, {"__complex", TYPESPEC, RID_COMPLEX}, - {"__alignof", ALIGNOF, NORID}, - {"__wchar_t", TYPESPEC, RID_WCHAR /* Unique to ANSI C++ */,}, + {"inline", SCSPEC, RID_INLINE,}, + {"__complex__", TYPESPEC, RID_COMPLEX}, + {"union", AGGR, RID_UNION,}, {"double", TYPESPEC, RID_DOUBLE,}, - {"const_cast", CONST_CAST, NORID,}, {"",}, - {"struct", AGGR, RID_RECORD,}, - {"long", TYPESPEC, RID_LONG,}, - {"or", OROR, NORID,}, - {"__typeof__", TYPEOF, NORID}, - {"or_eq", ASSIGN, NORID,}, - {"for", FOR, NORID,}, - {"__imag", IMAGPART, NORID}, - {"enum", ENUM, NORID,}, + {"__alignof", ALIGNOF, NORID}, {"",}, {"",}, - {"__label__", LABEL, NORID}, - {"int", TYPESPEC, RID_INT,}, - {"__signed__", TYPESPEC, RID_SIGNED}, - {"signature", AGGR, RID_SIGNATURE /* Extension */,}, - {"do", DO, NORID,}, + {"bitor", '|', NORID,}, + {"or_eq", ASSIGN, NORID,}, + {"if", IF, NORID,}, {"",}, - {"explicit", SCSPEC, RID_EXPLICIT,}, - {"char", TYPESPEC, RID_CHAR,}, + {"case", CASE, NORID,}, {"",}, - {"__attribute", ATTRIBUTE, NORID}, - {"friend", SCSPEC, RID_FRIEND,}, - {"__attribute__", ATTRIBUTE, NORID}, - {"while", WHILE, NORID,}, - {"reinterpret_cast", REINTERPRET_CAST, NORID,}, + {"enum", ENUM, NORID,}, + {"signed", TYPESPEC, RID_SIGNED,}, {"",}, - {"continue", CONTINUE, NORID,}, + {"__sigof__", SIGOF, NORID /* Extension */,}, + {"char", TYPESPEC, RID_CHAR,}, + {"",}, {"",}, + {"__signed", TYPESPEC, RID_SIGNED}, {"namespace", NAMESPACE, NORID,}, - {"sigof", SIGOF, NORID /* Extension */,}, - {"",}, + {"__label__", LABEL, NORID}, {"volatile", CV_QUALIFIER, RID_VOLATILE,}, + {"protected", VISSPEC, RID_PROTECTED,}, + {"__wchar_t", TYPESPEC, RID_WCHAR /* Unique to ANSI C++ */,}, + {"",}, {"",}, + {"unsigned", TYPESPEC, RID_UNSIGNED,}, + {"continue", CONTINUE, NORID,}, + {"break", BREAK, NORID,}, {"",}, - {"bitor", '|', NORID,}, + {"friend", SCSPEC, RID_FRIEND,}, + {"and_eq", ASSIGN, NORID,}, {"typedef", SCSPEC, RID_TYPEDEF,}, + {"",}, + {"do", DO, NORID,}, {"void", TYPESPEC, RID_VOID,}, - {"break", BREAK, NORID,}, + {"",}, {"",}, {"",}, + {"const", CV_QUALIFIER, RID_CONST,}, + {"static", SCSPEC, RID_STATIC,}, {"",}, - {"new", NEW, NORID,}, - {"return", RETURN, NORID,}, - {"and_eq", ASSIGN, NORID,}, + {"__typeof", TYPEOF, NORID}, {"",}, {"",}, {"",}, - {"using", USING, NORID,}, - {"",}, {"",}, + {"goto", GOTO, NORID,}, + {"",}, {"asm", ASM_KEYWORD, NORID,}, - {"",}, {"",}, - {"and", ANDAND, NORID,}, - {"mutable", SCSPEC, RID_MUTABLE,}, - {"__typeof", TYPEOF, NORID}, - {"union", AGGR, RID_UNION,}, + {"operator", OPERATOR, NORID,}, + {"__signature__", AGGR, RID_SIGNATURE /* Extension */,}, {"",}, - {"if", IF, NORID,}, - {"__signed", TYPESPEC, RID_SIGNED}, + {"mutable", SCSPEC, RID_MUTABLE,}, {"",}, {"",}, - {"goto", GOTO, NORID,}, + {"sigof", SIGOF, NORID /* Extension */,}, + {"class", AGGR, RID_CLASS,}, + {"compl", '~', NORID,}, + {"public", VISSPEC, RID_PUBLIC,}, + {"and", ANDAND, NORID,}, {"",}, {"",}, - {"__sigof__", SIGOF, NORID /* Extension */,}, {"float", TYPESPEC, RID_FLOAT,}, - {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"default", DEFAULT, NORID,}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"register", SCSPEC, RID_REGISTER,}, - {"throw", THROW, NORID,}, - {"",}, + {"",}, {"",}, {"bitand", '&', NORID,}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"operator", OPERATOR, NORID,}, - {"",}, - {"inline", SCSPEC, RID_INLINE,}, - {"",}, - {"dynamic_cast", DYNAMIC_CAST, NORID,}, - {"",}, {"",}, {"",}, - {"__signature__", AGGR, RID_SIGNATURE /* Extension */,}, - {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"catch", CATCH, NORID,}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"auto", SCSPEC, RID_AUTO,}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"unsigned", TYPESPEC, RID_UNSIGNED,}, + {"",}, {"",}, {"",}, {"",}, + {"const_cast", CONST_CAST, NORID,}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"dynamic_cast", DYNAMIC_CAST, NORID,}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) -- 2.30.2