From db127392bc1a1179de8c9dc34e5fbf4b945dc989 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Wed, 7 Oct 1998 09:57:38 +0000 Subject: [PATCH] Warning fixes: * Makefile.in (c-gperf.h): Add -L KR-C -F ', 0, 0' flags to gperf. (c-parse.gperf): Update comments describing invocation flags. (c-gperf.h): Regenerate using gperf 2.7.1 (19981006 egcs). From-SVN: r22889 --- gcc/ChangeLog | 6 ++ gcc/Makefile.in | 4 +- gcc/c-gperf.h | 281 ++++++++++++++++++++++++++++-------------------------- gcc/c-parse.gperf | 2 +- 4 files changed, 156 insertions(+), 137 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e176a7e..674da88 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Wed Oct 7 12:55:26 1998 Kaveh R. Ghazi + + * Makefile.in (c-gperf.h): Add -L KR-C -F ', 0, 0' flags to gperf. + (c-parse.gperf): Update comments describing invocation flags. + (c-gperf.h): Regenerate using gperf 2.7.1 (19981006 egcs). + 1998-10-07 Manfred Hollstein * reload1.c (reload): Call free before clobbering the memory diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 6fc5062..9f24109 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1265,8 +1265,8 @@ $(srcdir)/c-parse.y: c-parse.in $(srcdir)/move-if-change tmp-c-parse.y $(srcdir)/c-parse.y $(srcdir)/c-gperf.h: c-parse.gperf - gperf -p -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,$$ \ - $(srcdir)/c-parse.gperf >tmp-gperf.h + gperf -L KR-C -F ', 0, 0' -p -j1 -i 1 -g -o -t -G -N is_reserved_word \ + -k1,3,$$ $(srcdir)/c-parse.gperf >tmp-gperf.h $(srcdir)/move-if-change tmp-gperf.h $(srcdir)/c-gperf.h c-decl.o : c-decl.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-lex.h flags.h \ diff --git a/gcc/c-gperf.h b/gcc/c-gperf.h index b20f82b..2932feb 100644 --- a/gcc/c-gperf.h +++ b/gcc/c-gperf.h @@ -1,6 +1,6 @@ -/* C code produced by gperf version 2.5 (GNU C++ version) */ -/* Command-line: gperf -p -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,$ /puke/law/tmp/merge/egcs/gcc/c-parse.gperf */ -/* Command-line: gperf -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ +/* KR-C code produced by gperf version 2.7.1 (19981006 egcs) */ +/* Command-line: gperf -L KR-C -F , 0, 0 -p -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,$ ./c-parse.gperf */ +/* Command-line: gperf -L KR-C -F ', 0, 0' -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ struct resword { char *name; short token; enum rid rid; }; #define TOTAL_KEYWORDS 79 @@ -11,28 +11,41 @@ struct resword { char *name; short token; enum rid rid; }; /* maximum key range = 135, duplicates = 0 */ #ifdef __GNUC__ -inline +__inline #endif static unsigned int hash (str, len) register char *str; - register int unsigned len; + register unsigned int len; { static unsigned char asso_values[] = { - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 25, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 1, 145, 46, 8, 15, - 61, 6, 36, 48, 3, 5, 145, 18, 63, 25, - 29, 76, 1, 145, 13, 2, 1, 51, 37, 9, - 9, 1, 3, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 25, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 1, 145, 46, 8, 15, + 61, 6, 36, 48, 3, 5, 145, 18, 63, 25, + 29, 76, 1, 145, 13, 2, 1, 51, 37, 9, + 9, 1, 3, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145 }; register int hval = len; @@ -40,130 +53,130 @@ hash (str, len) { default: case 3: - hval += asso_values[str[2]]; + hval += asso_values[(unsigned char)str[2]]; case 2: case 1: - hval += asso_values[str[0]]; + hval += asso_values[(unsigned char)str[0]]; break; } - return hval + asso_values[str[len - 1]]; + return hval + asso_values[(unsigned char)str[len - 1]]; } static struct resword wordlist[] = -{ - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, - {"int", TYPESPEC, RID_INT}, - {"",}, {"",}, - {"__typeof__", TYPEOF, NORID}, - {"__signed__", TYPESPEC, RID_SIGNED}, - {"__imag__", IMAGPART, NORID}, - {"switch", SWITCH, NORID}, - {"__inline__", SCSPEC, RID_INLINE}, - {"else", ELSE, NORID}, - {"__iterator__", SCSPEC, RID_ITERATOR}, - {"__inline", SCSPEC, RID_INLINE}, - {"__extension__", EXTENSION, NORID}, - {"struct", STRUCT, NORID}, - {"__real__", REALPART, NORID}, - {"__const", TYPE_QUAL, RID_CONST}, - {"while", WHILE, NORID}, - {"__const__", TYPE_QUAL, RID_CONST}, - {"case", CASE, NORID}, - {"__complex__", TYPESPEC, RID_COMPLEX}, - {"__iterator", SCSPEC, RID_ITERATOR}, - {"bycopy", TYPE_QUAL, RID_BYCOPY}, - {"",}, {"",}, {"",}, - {"__complex", TYPESPEC, RID_COMPLEX}, - {"",}, - {"in", TYPE_QUAL, RID_IN}, - {"break", BREAK, NORID}, - {"@defs", DEFS, NORID}, - {"",}, {"",}, {"",}, - {"extern", SCSPEC, RID_EXTERN}, - {"if", IF, NORID}, - {"typeof", TYPEOF, NORID}, - {"typedef", SCSPEC, RID_TYPEDEF}, - {"__typeof", TYPEOF, NORID}, - {"sizeof", SIZEOF, NORID}, - {"",}, - {"return", RETURN, NORID}, - {"const", TYPE_QUAL, RID_CONST}, - {"__volatile__", TYPE_QUAL, RID_VOLATILE}, - {"@private", PRIVATE, NORID}, - {"@selector", SELECTOR, NORID}, - {"__volatile", TYPE_QUAL, RID_VOLATILE}, - {"__asm__", ASM_KEYWORD, NORID}, - {"",}, {"",}, - {"continue", CONTINUE, NORID}, - {"__alignof__", ALIGNOF, NORID}, - {"__imag", IMAGPART, NORID}, - {"__attribute__", ATTRIBUTE, NORID}, - {"",}, {"",}, - {"__attribute", ATTRIBUTE, NORID}, - {"for", FOR, NORID}, - {"",}, - {"@encode", ENCODE, NORID}, - {"id", OBJECTNAME, RID_ID}, - {"static", SCSPEC, RID_STATIC}, - {"@interface", INTERFACE, NORID}, - {"",}, - {"__signed", TYPESPEC, RID_SIGNED}, - {"",}, - {"__label__", LABEL, NORID}, - {"",}, {"",}, - {"__asm", ASM_KEYWORD, NORID}, - {"char", TYPESPEC, RID_CHAR}, - {"",}, - {"inline", SCSPEC, RID_INLINE}, - {"out", TYPE_QUAL, RID_OUT}, - {"register", SCSPEC, RID_REGISTER}, - {"__real", REALPART, NORID}, - {"short", TYPESPEC, RID_SHORT}, - {"",}, - {"enum", ENUM, NORID}, - {"inout", TYPE_QUAL, RID_INOUT}, - {"",}, - {"oneway", TYPE_QUAL, RID_ONEWAY}, - {"union", UNION, NORID}, - {"",}, - {"__alignof", ALIGNOF, NORID}, - {"",}, - {"@implementation", IMPLEMENTATION, NORID}, - {"",}, - {"@class", CLASS, NORID}, - {"",}, - {"@public", PUBLIC, NORID}, - {"asm", ASM_KEYWORD, NORID}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"default", DEFAULT, NORID}, - {"",}, - {"void", TYPESPEC, RID_VOID}, - {"",}, - {"@protected", PROTECTED, NORID}, - {"@protocol", PROTOCOL, NORID}, - {"",}, {"",}, {"",}, - {"volatile", TYPE_QUAL, RID_VOLATILE}, - {"",}, {"",}, - {"signed", TYPESPEC, RID_SIGNED}, - {"float", TYPESPEC, RID_FLOAT}, - {"@end", END, NORID}, - {"",}, {"",}, - {"unsigned", TYPESPEC, RID_UNSIGNED}, - {"@compatibility_alias", ALIAS, NORID}, - {"double", TYPESPEC, RID_DOUBLE}, - {"",}, {"",}, - {"auto", SCSPEC, RID_AUTO}, - {"",}, - {"goto", GOTO, NORID}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"do", DO, NORID}, - {"",}, {"",}, {"",}, {"",}, - {"long", TYPESPEC, RID_LONG}, -}; + { + {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, + {"", 0, 0}, + {"int", TYPESPEC, RID_INT}, + {"", 0, 0}, {"", 0, 0}, + {"__typeof__", TYPEOF, NORID}, + {"__signed__", TYPESPEC, RID_SIGNED}, + {"__imag__", IMAGPART, NORID}, + {"switch", SWITCH, NORID}, + {"__inline__", SCSPEC, RID_INLINE}, + {"else", ELSE, NORID}, + {"__iterator__", SCSPEC, RID_ITERATOR}, + {"__inline", SCSPEC, RID_INLINE}, + {"__extension__", EXTENSION, NORID}, + {"struct", STRUCT, NORID}, + {"__real__", REALPART, NORID}, + {"__const", TYPE_QUAL, RID_CONST}, + {"while", WHILE, NORID}, + {"__const__", TYPE_QUAL, RID_CONST}, + {"case", CASE, NORID}, + {"__complex__", TYPESPEC, RID_COMPLEX}, + {"__iterator", SCSPEC, RID_ITERATOR}, + {"bycopy", TYPE_QUAL, RID_BYCOPY}, + {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, + {"__complex", TYPESPEC, RID_COMPLEX}, + {"", 0, 0}, + {"in", TYPE_QUAL, RID_IN}, + {"break", BREAK, NORID}, + {"@defs", DEFS, NORID}, + {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, + {"extern", SCSPEC, RID_EXTERN}, + {"if", IF, NORID}, + {"typeof", TYPEOF, NORID}, + {"typedef", SCSPEC, RID_TYPEDEF}, + {"__typeof", TYPEOF, NORID}, + {"sizeof", SIZEOF, NORID}, + {"", 0, 0}, + {"return", RETURN, NORID}, + {"const", TYPE_QUAL, RID_CONST}, + {"__volatile__", TYPE_QUAL, RID_VOLATILE}, + {"@private", PRIVATE, NORID}, + {"@selector", SELECTOR, NORID}, + {"__volatile", TYPE_QUAL, RID_VOLATILE}, + {"__asm__", ASM_KEYWORD, NORID}, + {"", 0, 0}, {"", 0, 0}, + {"continue", CONTINUE, NORID}, + {"__alignof__", ALIGNOF, NORID}, + {"__imag", IMAGPART, NORID}, + {"__attribute__", ATTRIBUTE, NORID}, + {"", 0, 0}, {"", 0, 0}, + {"__attribute", ATTRIBUTE, NORID}, + {"for", FOR, NORID}, + {"", 0, 0}, + {"@encode", ENCODE, NORID}, + {"id", OBJECTNAME, RID_ID}, + {"static", SCSPEC, RID_STATIC}, + {"@interface", INTERFACE, NORID}, + {"", 0, 0}, + {"__signed", TYPESPEC, RID_SIGNED}, + {"", 0, 0}, + {"__label__", LABEL, NORID}, + {"", 0, 0}, {"", 0, 0}, + {"__asm", ASM_KEYWORD, NORID}, + {"char", TYPESPEC, RID_CHAR}, + {"", 0, 0}, + {"inline", SCSPEC, RID_INLINE}, + {"out", TYPE_QUAL, RID_OUT}, + {"register", SCSPEC, RID_REGISTER}, + {"__real", REALPART, NORID}, + {"short", TYPESPEC, RID_SHORT}, + {"", 0, 0}, + {"enum", ENUM, NORID}, + {"inout", TYPE_QUAL, RID_INOUT}, + {"", 0, 0}, + {"oneway", TYPE_QUAL, RID_ONEWAY}, + {"union", UNION, NORID}, + {"", 0, 0}, + {"__alignof", ALIGNOF, NORID}, + {"", 0, 0}, + {"@implementation", IMPLEMENTATION, NORID}, + {"", 0, 0}, + {"@class", CLASS, NORID}, + {"", 0, 0}, + {"@public", PUBLIC, NORID}, + {"asm", ASM_KEYWORD, NORID}, + {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, + {"default", DEFAULT, NORID}, + {"", 0, 0}, + {"void", TYPESPEC, RID_VOID}, + {"", 0, 0}, + {"@protected", PROTECTED, NORID}, + {"@protocol", PROTOCOL, NORID}, + {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, + {"volatile", TYPE_QUAL, RID_VOLATILE}, + {"", 0, 0}, {"", 0, 0}, + {"signed", TYPESPEC, RID_SIGNED}, + {"float", TYPESPEC, RID_FLOAT}, + {"@end", END, NORID}, + {"", 0, 0}, {"", 0, 0}, + {"unsigned", TYPESPEC, RID_UNSIGNED}, + {"@compatibility_alias", ALIAS, NORID}, + {"double", TYPESPEC, RID_DOUBLE}, + {"", 0, 0}, {"", 0, 0}, + {"auto", SCSPEC, RID_AUTO}, + {"", 0, 0}, + {"goto", GOTO, NORID}, + {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, + {"do", DO, NORID}, + {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, + {"long", TYPESPEC, RID_LONG} + }; #ifdef __GNUC__ -inline +__inline #endif struct resword * is_reserved_word (str, len) @@ -178,7 +191,7 @@ is_reserved_word (str, len) { register char *s = wordlist[key].name; - if (*s == *str && !strcmp (str + 1, s + 1)) + if (*str == *s && !strcmp (str + 1, s + 1)) return &wordlist[key]; } } diff --git a/gcc/c-parse.gperf b/gcc/c-parse.gperf index 90cab6a..017dcb5 100644 --- a/gcc/c-parse.gperf +++ b/gcc/c-parse.gperf @@ -1,5 +1,5 @@ %{ -/* Command-line: gperf -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ +/* Command-line: gperf -L KR-C -F ', 0, 0' -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ %} struct resword { char *name; short token; enum rid rid; }; %% -- 2.7.4