1
0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00

Completely new asso_values search algorithm.

This commit is contained in:
Bruno Haible
2003-03-18 10:22:37 +00:00
parent 40f37680ac
commit 6d268d095b
20 changed files with 1918 additions and 2117 deletions

View File

@@ -7,8 +7,8 @@ struct resword { char *name; short token; enum rid rid; };
#define TOTAL_KEYWORDS 59
#define MIN_WORD_LENGTH 2
#define MAX_WORD_LENGTH 15
#define MIN_HASH_VALUE 11
#define MAX_HASH_VALUE 98
#define MIN_HASH_VALUE 8
#define MAX_HASH_VALUE 95
/* maximum key range = 88, duplicates = 0 */
#ifdef __GNUC__
@@ -25,32 +25,32 @@ hash (str, len)
{
static unsigned char asso_values[] =
{
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 16, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 1, 99, 2, 1, 32,
1, 5, 19, 36, 25, 13, 99, 1, 8, 37,
2, 41, 34, 99, 27, 12, 1, 42, 21, 28,
99, 99, 12, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 19, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 2, 96, 2, 1, 10,
26, 1, 23, 27, 27, 24, 96, 1, 25, 36,
10, 34, 23, 96, 10, 6, 8, 11, 41, 2,
96, 96, 23, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 96, 96, 96, 96
};
register int hval = len;
@@ -77,77 +77,76 @@ is_reserved_word (str, len)
{
static struct resword wordlist[] =
{
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""},
{"__asm__", ASM, NORID},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{"break", BREAK, NORID},
{"__typeof__", TYPEOF, NORID},
{"extern", SCSPEC, RID_EXTERN},
{"__alignof__", ALIGNOF, NORID},
{""},
{"__attribute__", ATTRIBUTE, NORID},
{"int", TYPESPEC, RID_INT},
{"__attribute", ATTRIBUTE, NORID},
{"__extension__", EXTENSION, NORID},
{""},
{"__signed", TYPESPEC, RID_SIGNED},
{"@end", END, NORID},
{"__signed__", TYPESPEC, RID_SIGNED},
{"__inline__", SCSPEC, RID_INLINE},
{""}, {""}, {""},
{"else", ELSE, NORID},
{"__inline", SCSPEC, RID_INLINE},
{"default", DEFAULT, NORID},
{"__typeof", TYPEOF, NORID},
{"@encode", ENCODE, NORID},
{"__alignof", ALIGNOF, NORID},
{"inline", SCSPEC, RID_INLINE},
{"@interface", INTERFACE, NORID},
{"if", IF, NORID},
{"__volatile__", TYPE_QUAL, RID_VOLATILE},
{"return", RETURN, NORID},
{"__volatile", TYPE_QUAL, RID_VOLATILE},
{"@defs", DEFS, NORID},
{"void", TYPESPEC, RID_VOID},
{"const", TYPE_QUAL, RID_CONST},
{"__const", TYPE_QUAL, RID_CONST},
{"volatile", TYPE_QUAL, RID_VOLATILE},
{"__const__", TYPE_QUAL, RID_CONST},
{"do", DO, NORID},
{"__asm", ASM, NORID},
{"struct", STRUCT, NORID},
{"continue", CONTINUE, NORID},
{"auto", SCSPEC, RID_AUTO},
{"sizeof", SIZEOF, NORID},
{"long", TYPESPEC, RID_LONG},
{"while", WHILE, NORID},
{"static", SCSPEC, RID_STATIC},
{"__asm__", ASM, NORID},
{""}, {""},
{"__attribute", ATTRIBUTE, NORID},
{"__alignof__", ALIGNOF, NORID},
{"__extension__", EXTENSION, NORID},
{"__attribute__", ATTRIBUTE, NORID},
{"__signed__", TYPESPEC, RID_SIGNED},
{"case", CASE, NORID},
{"double", TYPESPEC, RID_DOUBLE},
{"signed", TYPESPEC, RID_SIGNED},
{"switch", SWITCH, NORID},
{"@selector", SELECTOR, NORID},
{"__typeof__", TYPEOF, NORID},
{"__const__", TYPE_QUAL, RID_CONST},
{"static", SCSPEC, RID_STATIC},
{"extern", SCSPEC, RID_EXTERN},
{"char", TYPESPEC, RID_CHAR},
{"__const", TYPE_QUAL, RID_CONST},
{""},
{"short", TYPESPEC, RID_SHORT},
{"typeof", TYPEOF, NORID},
{"typedef", SCSPEC, RID_TYPEDEF},
{"continue", CONTINUE, NORID},
{"struct", STRUCT, NORID},
{"@defs", DEFS, NORID},
{"while", WHILE, NORID},
{"const", TYPE_QUAL, RID_CONST},
{"return", RETURN, NORID},
{"__inline", SCSPEC, RID_INLINE},
{"__alignof", ALIGNOF, NORID},
{"@encode", ENCODE, NORID},
{"__inline__", SCSPEC, RID_INLINE},
{"@selector", SELECTOR, NORID},
{"@interface", INTERFACE, NORID},
{"__typeof", TYPEOF, NORID},
{"__signed", TYPESPEC, RID_SIGNED},
{"int", TYPESPEC, RID_INT},
{"double", TYPESPEC, RID_DOUBLE},
{"__asm", ASM, NORID},
{"for", FOR, NORID},
{"@public", PUBLIC, NORID},
{"auto", SCSPEC, RID_AUTO},
{"if", IF, NORID},
{"union", UNION, NORID},
{"unsigned", TYPESPEC, RID_UNSIGNED},
{""},
{"char", TYPESPEC, RID_CHAR},
{"float", TYPESPEC, RID_FLOAT},
{"enum", ENUM, NORID},
{"short", TYPESPEC, RID_SHORT},
{"__volatile", TYPE_QUAL, RID_VOLATILE},
{"register", SCSPEC, RID_REGISTER},
{"inline", SCSPEC, RID_INLINE},
{"__volatile__", TYPE_QUAL, RID_VOLATILE},
{"sizeof", SIZEOF, NORID},
{"@end", END, NORID},
{"typeof", TYPEOF, NORID},
{"typedef", SCSPEC, RID_TYPEDEF},
{"do", DO, NORID},
{"switch", SWITCH, NORID},
{"default", DEFAULT, NORID},
{"signed", TYPESPEC, RID_SIGNED},
{"long", TYPESPEC, RID_LONG},
{""}, {""}, {""},
{"@implementation", IMPLEMENTATION, NORID},
{""}, {""}, {""}, {""}, {""},
{"for", FOR, NORID},
{""}, {""},
{"asm", ASM, NORID},
{"float", TYPESPEC, RID_FLOAT},
{""}, {""},
{"goto", GOTO, NORID},
{""},
{"volatile", TYPE_QUAL, RID_VOLATILE},
{""},
{"asm", ASM, NORID},
{""}, {""},
{"@implementation", IMPLEMENTATION, NORID},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""},
{"enum", ENUM, NORID},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{"@public", PUBLIC, NORID},
{"register", SCSPEC, RID_REGISTER}
{"void", TYPESPEC, RID_VOID}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)