Commit 6506ecd7 by Richard Stallman

(init_lex): Set up ridpointers for `iterator'.

But maybe turn it off again.

From-SVN: r3588
parent 75621238
...@@ -96,12 +96,12 @@ static int ignore_escape_flag = 0; ...@@ -96,12 +96,12 @@ static int ignore_escape_flag = 0;
/* Command-line: gperf -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ /* Command-line: gperf -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; }; struct resword { char *name; short token; enum rid rid; };
#define TOTAL_KEYWORDS 53 #define TOTAL_KEYWORDS 55
#define MIN_WORD_LENGTH 2 #define MIN_WORD_LENGTH 2
#define MAX_WORD_LENGTH 13 #define MAX_WORD_LENGTH 13
#define MIN_HASH_VALUE 7 #define MIN_HASH_VALUE 8
#define MAX_HASH_VALUE 102 #define MAX_HASH_VALUE 81
/* maximum key range = 96, duplicates = 0 */ /* maximum key range = 74, duplicates = 0 */
#ifdef __GNUC__ #ifdef __GNUC__
__inline __inline
...@@ -113,19 +113,19 @@ hash (str, len) ...@@ -113,19 +113,19 @@ hash (str, len)
{ {
static unsigned char asso_values[] = static unsigned char asso_values[] =
{ {
103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
103, 103, 103, 103, 103, 1, 103, 2, 1, 24, 82, 82, 82, 82, 82, 1, 82, 18, 13, 25,
1, 5, 19, 39, 16, 13, 103, 1, 25, 1, 7, 11, 1, 9, 2, 5, 82, 1, 26, 19,
34, 34, 24, 103, 13, 12, 1, 45, 24, 7, 26, 46, 12, 82, 14, 2, 1, 32, 36, 1,
103, 103, 2, 103, 103, 103, 103, 103, 82, 82, 3, 82, 82, 82, 82, 82,
}; };
register int hval = len; register int hval = len;
...@@ -151,78 +151,70 @@ is_reserved_word (str, len) ...@@ -151,78 +151,70 @@ is_reserved_word (str, len)
{ {
static struct resword wordlist[] = static struct resword wordlist[] =
{ {
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
{"asm", ASM_KEYWORD, NORID}, {"if", IF, NORID},
{"",},
{"__asm", ASM_KEYWORD, NORID},
{"",},
{"__asm__", ASM_KEYWORD, NORID},
{"break", BREAK, NORID},
{"__typeof__", TYPEOF, NORID},
{"",},
{"__alignof__", ALIGNOF, NORID},
{"",}, {"",},
{"__attribute__", ATTRIBUTE, NORID},
{"int", TYPESPEC, RID_INT}, {"int", TYPESPEC, RID_INT},
{"__attribute", ATTRIBUTE, NORID}, {"__typeof", TYPEOF, NORID},
{"__extension__", EXTENSION, NORID}, {"sizeof", SIZEOF, NORID},
{"",}, {"__typeof__", TYPEOF, NORID},
{"__signed", TYPESPEC, RID_SIGNED},
{"",},
{"__signed__", TYPESPEC, RID_SIGNED}, {"__signed__", TYPESPEC, RID_SIGNED},
{"__inline__", SCSPEC, RID_INLINE}, {"switch", SWITCH, NORID},
{"else", ELSE, NORID},
{"__inline", SCSPEC, RID_INLINE},
{"default", DEFAULT, NORID}, {"default", DEFAULT, NORID},
{"__typeof", TYPEOF, NORID}, {"__inline__", SCSPEC, RID_INLINE},
{"__signed", TYPESPEC, RID_SIGNED},
{"__iterator__", SCSPEC, RID_ITERATOR},
{"typeof", TYPEOF, NORID},
{"typedef", SCSPEC, RID_TYPEDEF},
{"while", WHILE, NORID}, {"while", WHILE, NORID},
{"__alignof", ALIGNOF, NORID},
{"struct", STRUCT, NORID}, {"struct", STRUCT, NORID},
{"signed", TYPESPEC, RID_SIGNED},
{"__inline", SCSPEC, RID_INLINE},
{"__extension__", EXTENSION, NORID},
{"__asm__", ASM_KEYWORD, NORID},
{"else", ELSE, NORID},
{"__alignof", ALIGNOF, NORID},
{"break", BREAK, NORID},
{"__alignof__", ALIGNOF, NORID},
{"for", FOR, NORID},
{"__attribute__", ATTRIBUTE, NORID},
{"__const", TYPE_QUAL, RID_CONST}, {"__const", TYPE_QUAL, RID_CONST},
{"if", IF, NORID}, {"",},
{"__const__", TYPE_QUAL, RID_CONST}, {"__const__", TYPE_QUAL, RID_CONST},
{"__label__", LABEL, NORID}, {"__label__", LABEL, NORID},
{"do", DO, NORID}, {"iterator", SCSPEC, RID_ITERATOR},
{"__volatile__", TYPE_QUAL, RID_VOLATILE}, {"",}, {"",},
{"sizeof", SIZEOF, NORID}, {"__attribute", ATTRIBUTE, NORID},
{"__volatile", TYPE_QUAL, RID_VOLATILE},
{"auto", SCSPEC, RID_AUTO},
{"void", TYPESPEC, RID_VOID},
{"char", TYPESPEC, RID_CHAR},
{"static", SCSPEC, RID_STATIC},
{"case", CASE, NORID}, {"case", CASE, NORID},
{"__asm", ASM_KEYWORD, NORID},
{"extern", SCSPEC, RID_EXTERN}, {"extern", SCSPEC, RID_EXTERN},
{"switch", SWITCH, NORID}, {"register", SCSPEC, RID_REGISTER},
{"for", FOR, NORID},
{"inline", SCSPEC, RID_INLINE},
{"typeof", TYPEOF, NORID},
{"typedef", SCSPEC, RID_TYPEDEF},
{"short", TYPESPEC, RID_SHORT},
{"",}, {"",},
{"return", RETURN, NORID}, {"return", RETURN, NORID},
{"enum", ENUM, NORID}, {"inline", SCSPEC, RID_INLINE},
{"",}, {"unsigned", TYPESPEC, RID_UNSIGNED},
{"double", TYPESPEC, RID_DOUBLE}, {"__volatile__", TYPE_QUAL, RID_VOLATILE},
{"signed", TYPESPEC, RID_SIGNED}, {"static", SCSPEC, RID_STATIC},
{"void", TYPESPEC, RID_VOID},
{"float", TYPESPEC, RID_FLOAT}, {"float", TYPESPEC, RID_FLOAT},
{"",}, {"",}, {"short", TYPESPEC, RID_SHORT},
{"volatile", TYPE_QUAL, RID_VOLATILE}, {"do", DO, NORID},
{"",}, {"double", TYPESPEC, RID_DOUBLE},
{"const", TYPE_QUAL, RID_CONST}, {"const", TYPE_QUAL, RID_CONST},
{"__volatile", TYPE_QUAL, RID_VOLATILE},
{"asm", ASM_KEYWORD, NORID},
{"goto", GOTO, NORID},
{"char", TYPESPEC, RID_CHAR},
{"",}, {"",}, {"",},
{"long", TYPESPEC, RID_LONG},
{"enum", ENUM, NORID},
{"",}, {"",},
{"unsigned", TYPESPEC, RID_UNSIGNED}, {"union", UNION, NORID},
{"",}, {"",}, {"",}, {"",}, {"auto", SCSPEC, RID_AUTO},
{"continue", CONTINUE, NORID}, {"continue", CONTINUE, NORID},
{"",},
{"register", SCSPEC, RID_REGISTER},
{"",}, {"",}, {"",}, {"",},
{"goto", GOTO, NORID},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
{"volatile", TYPE_QUAL, RID_VOLATILE},
{"union", UNION, NORID},
{"",}, {"",}, {"",}, {"",},
{"long", TYPESPEC, RID_LONG},
}; };
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
...@@ -290,6 +282,7 @@ init_lex () ...@@ -290,6 +282,7 @@ init_lex ()
ridpointers[(int) RID_EXTERN] = get_identifier ("extern"); ridpointers[(int) RID_EXTERN] = get_identifier ("extern");
ridpointers[(int) RID_TYPEDEF] = get_identifier ("typedef"); ridpointers[(int) RID_TYPEDEF] = get_identifier ("typedef");
ridpointers[(int) RID_REGISTER] = get_identifier ("register"); ridpointers[(int) RID_REGISTER] = get_identifier ("register");
ridpointers[(int) RID_ITERATOR] = get_identifier ("iterator");
/* Some options inhibit certain reserved words. /* Some options inhibit certain reserved words.
Clear those words out of the hash table so they won't be recognized. */ Clear those words out of the hash table so they won't be recognized. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment