Skip to content

L
linux
Commit a88bab9a authored by Michal Marek's avatar Michal Marek
Browse files
Options

Merge branch 'genksyms-enum' into kbuild/kbuild

parents 00759c0e 303fc01f
Show whitespace changes
Inline Side-by-side
Showing with 988 additions and 863 deletions
scripts/genksyms/Makefile
View file @ a88bab9a
...@@ -28,9 +28,9 @@ $(obj)/keywords.c: $(obj)/keywords.gperf FORCE ...@@ -28,9 +28,9 @@ $(obj)/keywords.c: $(obj)/keywords.gperf FORCE
# flex # flex
quiet_cmd_lex.c = FLEX $@ quiet_cmd_lex.c = FLEX $@
cmd_lex.c = flex -o$@ -d $< $(obj)/parse.h cmd_lex.c = flex -o$@ -d $<
$(obj)/lex.c: $(obj)/lex.l $(obj)/parse.h $(obj)/keywords.c FORCE $(obj)/lex.c: $(obj)/lex.l $(obj)/keywords.c FORCE
$(call if_changed,lex.c) $(call if_changed,lex.c)
cp $@ $@_shipped cp $@ $@_shipped
......
scripts/genksyms/genksyms.c
View file @ a88bab9a
...@@ -53,12 +53,22 @@ static int nsyms; ...@@ -53,12 +53,22 @@ static int nsyms;
static struct symbol *expansion_trail; static struct symbol *expansion_trail;
static struct symbol *visited_symbols; static struct symbol *visited_symbols;
static const char *const symbol_type_name[] = { static const struct {
"normal", "typedef", "enum", "struct", "union" int n;
const char *name;
} symbol_types[] = {
[SYM_NORMAL] = { 0, NULL},
[SYM_TYPEDEF] = {'t', "typedef"},
[SYM_ENUM] = {'e', "enum"},
[SYM_STRUCT] = {'s', "struct"},
[SYM_UNION] = {'u', "union"},
[SYM_ENUM_CONST] = {'E', "enum constant"},
}; };
static int equal_list(struct string_list *a, struct string_list *b); static int equal_list(struct string_list *a, struct string_list *b);
static void print_list(FILE * f, struct string_list *list); static void print_list(FILE * f, struct string_list *list);
static struct string_list *concat_list(struct string_list *start, ...);
static struct string_list *mk_node(const char *string);
static void print_location(void); static void print_location(void);
static void print_type_name(enum symbol_type type, const char *name); static void print_type_name(enum symbol_type type, const char *name);
...@@ -140,14 +150,20 @@ static unsigned long crc32(const char *s) ...@@ -140,14 +150,20 @@ static unsigned long crc32(const char *s)
static enum symbol_type map_to_ns(enum symbol_type t) static enum symbol_type map_to_ns(enum symbol_type t)
{ {
if (t == SYM_TYPEDEF) switch (t) {
t = SYM_NORMAL; case SYM_ENUM_CONST:
else if (t == SYM_UNION) case SYM_NORMAL:
t = SYM_STRUCT; case SYM_TYPEDEF:
return SYM_NORMAL;
case SYM_ENUM:
case SYM_STRUCT:
case SYM_UNION:
return SYM_STRUCT;
}
return t; return t;
} }
struct symbol *find_symbol(const char *name, enum symbol_type ns) struct symbol *find_symbol(const char *name, enum symbol_type ns, int exact)
{ {
unsigned long h = crc32(name) % HASH_BUCKETS; unsigned long h = crc32(name) % HASH_BUCKETS;
struct symbol *sym; struct symbol *sym;
...@@ -158,6 +174,8 @@ struct symbol *find_symbol(const char *name, enum symbol_type ns) ...@@ -158,6 +174,8 @@ struct symbol *find_symbol(const char *name, enum symbol_type ns)
sym->is_declared) sym->is_declared)
break; break;
if (exact && sym && sym->type != ns)
return NULL;
return sym; return sym;
} }
...@@ -180,10 +198,47 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type, ...@@ -180,10 +198,47 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type,
struct string_list *defn, int is_extern, struct string_list *defn, int is_extern,
int is_reference) int is_reference)
{ {
unsigned long h = crc32(name) % HASH_BUCKETS; unsigned long h;
struct symbol *sym; struct symbol *sym;
enum symbol_status status = STATUS_UNCHANGED; enum symbol_status status = STATUS_UNCHANGED;
/* The parser adds symbols in the order their declaration completes,
* so it is safe to store the value of the previous enum constant in
* a static variable.
*/
static int enum_counter;
static struct string_list *last_enum_expr;
if (type == SYM_ENUM_CONST) {
if (defn) {
free_list(last_enum_expr, NULL);
last_enum_expr = copy_list_range(defn, NULL);
enum_counter = 1;
} else {
struct string_list *expr;
char buf[20];
snprintf(buf, sizeof(buf), "%d", enum_counter++);
if (last_enum_expr) {
expr = copy_list_range(last_enum_expr, NULL);
defn = concat_list(mk_node("("),
expr,
mk_node(")"),
mk_node("+"),
mk_node(buf), NULL);
} else {
defn = mk_node(buf);
}
}
} else if (type == SYM_ENUM) {
free_list(last_enum_expr, NULL);
last_enum_expr = NULL;
enum_counter = 0;
if (!name)
/* Anonymous enum definition, nothing more to do */
return NULL;
}
h = crc32(name) % HASH_BUCKETS;
for (sym = symtab[h]; sym; sym = sym->hash_next) { for (sym = symtab[h]; sym; sym = sym->hash_next) {
if (map_to_ns(sym->type) == map_to_ns(type) && if (map_to_ns(sym->type) == map_to_ns(type) &&
strcmp(name, sym->name) == 0) { strcmp(name, sym->name) == 0) {
...@@ -247,8 +302,12 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type, ...@@ -247,8 +302,12 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type,
sym->is_override = 0; sym->is_override = 0;
if (flag_debug) { if (flag_debug) {
if (symbol_types[type].name)
fprintf(debugfile, "Defn for %s %s == <", fprintf(debugfile, "Defn for %s %s == <",
symbol_type_name[type], name); symbol_types[type].name, name);
else
fprintf(debugfile, "Defn for type%d %s == <",
type, name);
if (is_extern) if (is_extern)
fputs("extern ", debugfile); fputs("extern ", debugfile);
print_list(debugfile, defn); print_list(debugfile, defn);
...@@ -288,6 +347,35 @@ void free_list(struct string_list *s, struct string_list *e) ...@@ -288,6 +347,35 @@ void free_list(struct string_list *s, struct string_list *e)
} }
} }
static struct string_list *mk_node(const char *string)
{
struct string_list *newnode;
newnode = xmalloc(sizeof(*newnode));
newnode->string = xstrdup(string);
newnode->tag = SYM_NORMAL;
newnode->next = NULL;
return newnode;
}
static struct string_list *concat_list(struct string_list *start, ...)
{
va_list ap;
struct string_list *n, *n2;
if (!start)
return NULL;
for (va_start(ap, start); (n = va_arg(ap, struct string_list *));) {
for (n2 = n; n2->next; n2 = n2->next)
;
n2->next = start;
start = n;
}
va_end(ap);
return start;
}
struct string_list *copy_node(struct string_list *node) struct string_list *copy_node(struct string_list *node)
{ {
struct string_list *newnode; struct string_list *newnode;
...@@ -299,6 +387,22 @@ struct string_list *copy_node(struct string_list *node) ...@@ -299,6 +387,22 @@ struct string_list *copy_node(struct string_list *node)
return newnode; return newnode;
} }
struct string_list *copy_list_range(struct string_list *start,
struct string_list *end)
{
struct string_list *res, *n;
if (start == end)
return NULL;
n = res = copy_node(start);
for (start = start->next; start != end; start = start->next) {
n->next = copy_node(start);
n = n->next;
}
n->next = NULL;
return res;
}
static int equal_list(struct string_list *a, struct string_list *b) static int equal_list(struct string_list *a, struct string_list *b)
{ {
while (a && b) { while (a && b) {
...@@ -346,8 +450,8 @@ static struct string_list *read_node(FILE *f) ...@@ -346,8 +450,8 @@ static struct string_list *read_node(FILE *f)
if (node.string[1] == '#') { if (node.string[1] == '#') {
int n; int n;
for (n = 0; n < ARRAY_SIZE(symbol_type_name); n++) { for (n = 0; n < ARRAY_SIZE(symbol_types); n++) {
if (node.string[0] == symbol_type_name[n][0]) { if (node.string[0] == symbol_types[n].n) {
node.tag = n; node.tag = n;
node.string += 2; node.string += 2;
return copy_node(&node); return copy_node(&node);
...@@ -397,8 +501,8 @@ static void read_reference(FILE *f) ...@@ -397,8 +501,8 @@ static void read_reference(FILE *f)
static void print_node(FILE * f, struct string_list *list) static void print_node(FILE * f, struct string_list *list)
{ {
if (list->tag != SYM_NORMAL) { if (symbol_types[list->tag].n) {
putc(symbol_type_name[list->tag][0], f); putc(symbol_types[list->tag].n, f);
putc('#', f); putc('#', f);
} }
fputs(list->string, f); fputs(list->string, f);
...@@ -468,8 +572,9 @@ static unsigned long expand_and_crc_sym(struct symbol *sym, unsigned long crc) ...@@ -468,8 +572,9 @@ static unsigned long expand_and_crc_sym(struct symbol *sym, unsigned long crc)
crc = partial_crc32_one(' ', crc); crc = partial_crc32_one(' ', crc);
break; break;
case SYM_ENUM_CONST:
case SYM_TYPEDEF: case SYM_TYPEDEF:
subsym = find_symbol(cur->string, cur->tag); subsym = find_symbol(cur->string, cur->tag, 0);
/* FIXME: Bad reference files can segfault here. */ /* FIXME: Bad reference files can segfault here. */
if (subsym->expansion_trail) { if (subsym->expansion_trail) {
if (flag_dump_defs) if (flag_dump_defs)
...@@ -486,55 +591,30 @@ static unsigned long expand_and_crc_sym(struct symbol *sym, unsigned long crc) ...@@ -486,55 +591,30 @@ static unsigned long expand_and_crc_sym(struct symbol *sym, unsigned long crc)
case SYM_STRUCT: case SYM_STRUCT:
case SYM_UNION: case SYM_UNION:
case SYM_ENUM: case SYM_ENUM:
subsym = find_symbol(cur->string, cur->tag); subsym = find_symbol(cur->string, cur->tag, 0);
if (!subsym) { if (!subsym) {
struct string_list *n, *t = NULL; struct string_list *n;
error_with_pos("expand undefined %s %s", error_with_pos("expand undefined %s %s",
symbol_type_name[cur->tag], symbol_types[cur->tag].name,
cur->string); cur->string);
n = concat_list(mk_node
n = xmalloc(sizeof(*n)); (symbol_types[cur->tag].name),
n->string = xstrdup(symbol_type_name[cur->tag]); mk_node(cur->string),
n->tag = SYM_NORMAL; mk_node("{"),
n->next = t; mk_node("UNKNOWN"),
t = n; mk_node("}"), NULL);
n = xmalloc(sizeof(*n));
n->string = xstrdup(cur->string);
n->tag = SYM_NORMAL;
n->next = t;
t = n;
n = xmalloc(sizeof(*n));
n->string = xstrdup("{");
n->tag = SYM_NORMAL;
n->next = t;
t = n;
n = xmalloc(sizeof(*n));
n->string = xstrdup("UNKNOWN");
n->tag = SYM_NORMAL;
n->next = t;
t = n;
n = xmalloc(sizeof(*n));
n->string = xstrdup("}");
n->tag = SYM_NORMAL;
n->next = t;
t = n;
subsym = subsym =
add_symbol(cur->string, cur->tag, n, 0); add_symbol(cur->string, cur->tag, n, 0);
} }
if (subsym->expansion_trail) { if (subsym->expansion_trail) {
if (flag_dump_defs) { if (flag_dump_defs) {
fprintf(debugfile, "%s %s ", fprintf(debugfile, "%s %s ",
symbol_type_name[cur->tag], symbol_types[cur->tag].name,
cur->string); cur->string);
} }
crc = partial_crc32(symbol_type_name[cur->tag], crc = partial_crc32(symbol_types[cur->tag].name,
crc); crc);
crc = partial_crc32_one(' ', crc); crc = partial_crc32_one(' ', crc);
crc = partial_crc32(cur->string, crc); crc = partial_crc32(cur->string, crc);
...@@ -565,7 +645,7 @@ void export_symbol(const char *name) ...@@ -565,7 +645,7 @@ void export_symbol(const char *name)
{ {
struct symbol *sym; struct symbol *sym;
sym = find_symbol(name, SYM_NORMAL); sym = find_symbol(name, SYM_NORMAL, 0);
if (!sym) if (!sym)
error_with_pos("export undefined symbol %s", name); error_with_pos("export undefined symbol %s", name);
else { else {
...@@ -624,8 +704,8 @@ static void print_location(void) ...@@ -624,8 +704,8 @@ static void print_location(void)
static void print_type_name(enum symbol_type type, const char *name) static void print_type_name(enum symbol_type type, const char *name)
{ {
if (type != SYM_NORMAL) if (symbol_types[type].name)
fprintf(stderr, "%s %s", symbol_type_name[type], name); fprintf(stderr, "%s %s", symbol_types[type].name, name);
else else
fprintf(stderr, "%s", name); fprintf(stderr, "%s", name);
} }
...@@ -771,8 +851,8 @@ int main(int argc, char **argv) ...@@ -771,8 +851,8 @@ int main(int argc, char **argv)
if (sym->is_override) if (sym->is_override)
fputs("override ", dumpfile); fputs("override ", dumpfile);
if (sym->type != SYM_NORMAL) { if (symbol_types[sym->type].n) {
putc(symbol_type_name[sym->type][0], dumpfile); putc(symbol_types[sym->type].n, dumpfile);
putc('#', dumpfile); putc('#', dumpfile);
} }
fputs(sym->name, dumpfile); fputs(sym->name, dumpfile);
......
scripts/genksyms/genksyms.h
View file @ a88bab9a
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
#include <stdio.h> #include <stdio.h>
enum symbol_type { enum symbol_type {
SYM_NORMAL, SYM_TYPEDEF, SYM_ENUM, SYM_STRUCT, SYM_UNION SYM_NORMAL, SYM_TYPEDEF, SYM_ENUM, SYM_STRUCT, SYM_UNION,
SYM_ENUM_CONST
}; };
enum symbol_status { enum symbol_status {
...@@ -58,7 +59,7 @@ typedef struct string_list **yystype; ...@@ -58,7 +59,7 @@ typedef struct string_list **yystype;
extern int cur_line; extern int cur_line;
extern char *cur_filename; extern char *cur_filename;
struct symbol *find_symbol(const char *name, enum symbol_type ns); struct symbol *find_symbol(const char *name, enum symbol_type ns, int exact);
struct symbol *add_symbol(const char *name, enum symbol_type type, struct symbol *add_symbol(const char *name, enum symbol_type type,
struct string_list *defn, int is_extern); struct string_list *defn, int is_extern);
void export_symbol(const char *); void export_symbol(const char *);
...@@ -66,6 +67,8 @@ void export_symbol(const char *); ...@@ -66,6 +67,8 @@ void export_symbol(const char *);
void free_node(struct string_list *list); void free_node(struct string_list *list);
void free_list(struct string_list *s, struct string_list *e); void free_list(struct string_list *s, struct string_list *e);
struct string_list *copy_node(struct string_list *); struct string_list *copy_node(struct string_list *);
struct string_list *copy_list_range(struct string_list *start,
struct string_list *end);
int yylex(void); int yylex(void);
int yyparse(void); int yyparse(void);
......
scripts/genksyms/lex.c_shipped
View file @ a88bab9a
...@@ -79,6 +79,7 @@ typedef int flex_int32_t; ...@@ -79,6 +79,7 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t; typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t; typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t; typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
/* Limits of integral types. */ /* Limits of integral types. */
#ifndef INT8_MIN #ifndef INT8_MIN
...@@ -109,8 +110,6 @@ typedef unsigned int flex_uint32_t; ...@@ -109,8 +110,6 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U) #define UINT32_MAX (4294967295U)
#endif #endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */ #endif /* ! FLEXINT_H */
/* %endif */ /* %endif */
...@@ -456,16 +455,16 @@ struct yy_trans_info ...@@ -456,16 +455,16 @@ struct yy_trans_info
flex_int32_t yy_verify; flex_int32_t yy_verify;
flex_int32_t yy_nxt; flex_int32_t yy_nxt;
}; };
static yyconst flex_int16_t yy_accept[76] = static yyconst flex_int16_t yy_accept[73] =
{ 0, { 0,
0, 0, 0, 0, 14, 12, 4, 3, 12, 7, 0, 0, 14, 12, 4, 3, 12, 7, 12, 12,
12, 12, 7, 12, 12, 12, 12, 12, 9, 9, 12, 12, 12, 9, 9, 12, 12, 7, 12, 12,
12, 12, 12, 4, 0, 5, 0, 7, 0, 6, 4, 0, 5, 0, 7, 8, 0, 6, 0, 0,
0, 0, 0, 0, 0, 0, 2, 8, 10, 10, 10, 10, 9, 0, 0, 9, 9, 0, 9, 0,
9, 0, 0, 9, 9, 0, 9, 0, 0, 11, 0, 0, 0, 2, 0, 0, 11, 0, 10, 0,
0, 0, 0, 10, 0, 10, 9, 9, 0, 0, 10, 9, 9, 0, 0, 0, 10, 10, 0, 0,
0, 0, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 0 1, 0
} ; } ;
static yyconst flex_int32_t yy_ec[256] = static yyconst flex_int32_t yy_ec[256] =
...@@ -507,108 +506,104 @@ static yyconst flex_int32_t yy_meta[29] = ...@@ -507,108 +506,104 @@ static yyconst flex_int32_t yy_meta[29] =
8, 7, 3, 3, 3, 1, 3, 1 8, 7, 3, 3, 3, 1, 3, 1
} ; } ;
static yyconst flex_int16_t yy_base[88] = static yyconst flex_int16_t yy_base[85] =
{ 0, { 0,
0, 147, 21, 140, 145, 284, 39, 284, 26, 0, 0, 145, 150, 266, 27, 266, 25, 0, 131, 23,
32, 126, 40, 44, 115, 35, 36, 46, 50, 53, 23, 16, 23, 39, 31, 25, 39, 60, 22, 65,
39, 61, 54, 79, 65, 284, 0, 0, 66, 284, 57, 43, 266, 0, 0, 266, 61, 266, 0, 128,
0, 119, 79, 75, 123, 104, 284, 284, 107, 0, 74, 0, 113, 59, 62, 113, 52, 0, 0, 72,
79, 73, 76, 76, 66, 0, 0, 85, 86, 284, 66, 110, 100, 266, 73, 74, 266, 70, 266, 90,
133, 83, 91, 284, 99, 147, 284, 114, 122, 70, 103, 266, 84, 129, 108, 113, 143, 266, 107, 66,
107, 141, 172, 151, 135, 181, 284, 137, 114, 157, 118, 137, 168, 120, 80, 91, 145, 143, 83, 41,
149, 48, 45, 284, 284, 208, 214, 222, 230, 238, 266, 266, 190, 196, 204, 212, 220, 228, 232, 237,
246, 250, 255, 256, 261, 267, 275 238, 243, 249, 257
} ; } ;
static yyconst flex_int16_t yy_def[88] = static yyconst flex_int16_t yy_def[85] =
{ 0, { 0,
75, 1, 1, 3, 75, 75, 75, 75, 76, 77, 72, 1, 72, 72, 72, 72, 73, 74, 72, 72,
78, 75, 77, 79, 75, 75, 75, 75, 75, 19, 75, 72, 72, 72, 14, 72, 72, 74, 72, 76,
75, 75, 75, 75, 76, 75, 80, 77, 78, 75, 72, 73, 72, 77, 74, 72, 75, 72, 78, 72,
81, 75, 76, 78, 79, 79, 75, 75, 75, 39, 72, 31, 14, 79, 80, 72, 72, 81, 15, 73,
19, 82, 83, 75, 75, 84, 20, 76, 78, 75, 75, 76, 76, 72, 73, 75, 72, 82, 72, 72,
79, 51, 85, 75, 75, 75, 75, 84, 79, 51, 72, 72, 81, 76, 54, 72, 72, 72, 76, 54,
79, 79, 79, 51, 75, 75, 75, 86, 79, 63, 76, 76, 76, 54, 83, 76, 63, 83, 84, 84,
86, 87, 87, 75, 0, 75, 75, 75, 75, 75, 72, 0, 72, 72, 72, 72, 72, 72, 72, 72,
75, 75, 75, 75, 75, 75, 75 72, 72, 72, 72
} ; } ;
static yyconst flex_int16_t yy_nxt[313] = static yyconst flex_int16_t yy_nxt[295] =
{ 0, { 0,
6, 7, 8, 7, 9, 6, 10, 6, 6, 11, 4, 5, 6, 5, 7, 4, 8, 9, 10, 11,
6, 6, 12, 6, 6, 6, 6, 6, 6, 10, 9, 12, 13, 14, 15, 15, 16, 9, 17, 8,
10, 10, 13, 10, 10, 6, 10, 6, 15, 16, 8, 8, 18, 8, 8, 4, 8, 19, 21, 23,
26, 15, 17, 18, 19, 20, 20, 21, 15, 22, 21, 26, 28, 26, 26, 30, 31, 31, 31, 26,
24, 30, 24, 38, 33, 36, 37, 74, 23, 34, 26, 26, 26, 71, 39, 39, 39, 23, 29, 26,
74, 27, 38, 38, 38, 38, 38, 31, 32, 39, 24, 32, 33, 33, 34, 72, 26, 26, 21, 35,
39, 39, 40, 41, 41, 42, 47, 47, 47, 26, 21, 36, 37, 38, 40, 36, 43, 44, 24, 41,
43, 38, 44, 45, 46, 30, 44, 75, 38, 38, 28, 32, 50, 50, 52, 28, 23, 23, 52, 35,
24, 38, 24, 26, 30, 40, 55, 55, 57, 26, 56, 56, 44, 28, 42, 71, 29, 31, 31, 31,
27, 31, 57, 43, 35, 30, 64, 64, 64, 57, 42, 29, 59, 44, 48, 49, 49, 24, 24, 29,
31, 65, 65, 75, 27, 36, 37, 35, 59, 37, 49, 43, 44, 51, 51, 51, 36, 37, 59, 44,
27, 31, 56, 56, 56, 59, 37, 51, 52, 52, 36, 65, 44, 54, 55, 55, 51, 51, 51, 59,
39, 39, 39, 59, 37, 37, 68, 53, 54, 54, 44, 64, 64, 64, 58, 58, 57, 57, 57, 58,
69, 50, 38, 54, 59, 37, 44, 45, 32, 37, 59, 44, 42, 64, 64, 64, 52, 72, 59, 44,
44, 35, 59, 37, 75, 14, 60, 60, 66, 66, 47, 66, 60, 60, 42, 44, 59, 69, 26, 72,
66, 37, 14, 72, 75, 61, 62, 63, 59, 61, 20, 61, 62, 63, 72, 61, 57, 57, 57, 66,
56, 56, 56, 69, 64, 64, 64, 69, 67, 67, 72, 72, 72, 66, 49, 49, 72, 61, 62, 49,
75, 75, 75, 67, 37, 35, 75, 75, 75, 61, 44, 61, 72, 72, 72, 72, 72, 72, 72, 72,
62, 75, 75, 61, 75, 70, 70, 70, 75, 75, 72, 67, 67, 67, 72, 72, 72, 67, 67, 67,
75, 70, 70, 70, 66, 66, 66, 75, 75, 75, 22, 22, 22, 22, 22, 22, 22, 22, 25, 72,
75, 75, 54, 54, 75, 75, 75, 54, 25, 25, 72, 25, 25, 25, 27, 27, 27, 27, 27, 27,
25, 25, 25, 25, 25, 25, 28, 75, 75, 28, 27, 27, 42, 42, 42, 42, 42, 42, 42, 42,
28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 45, 72, 45, 45, 45, 45, 45, 45, 46, 72,
35, 35, 35, 35, 35, 35, 35, 35, 48, 75, 46, 46, 46, 46, 46, 46, 34, 34, 72, 34,
48, 48, 48, 48, 48, 48, 49, 75, 49, 49, 51, 72, 51, 53, 53, 53, 57, 72, 57, 68,
49, 49, 49, 49, 42, 42, 75, 42, 56, 75, 68, 68, 68, 68, 68, 68, 68, 70, 70, 70,
56, 58, 58, 58, 66, 75, 66, 71, 71, 71, 70, 70, 70, 70, 70, 3, 72, 72, 72, 72,
71, 71, 71, 71, 71, 73, 73, 73, 73, 73, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
73, 73, 73, 5, 75, 75, 75, 75, 75, 75, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 72, 72, 72, 72
75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
75, 75
} ; } ;
static yyconst flex_int16_t yy_chk[313] = static yyconst flex_int16_t yy_chk[295] =
{ 0, { 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 5, 7,
9, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 10, 11, 12, 12, 13, 13, 13, 13, 19,
7, 11, 7, 16, 13, 14, 14, 73, 3, 13, 10, 16, 16, 70, 15, 15, 15, 22, 11, 19,
72, 9, 16, 17, 17, 21, 21, 11, 18, 18, 7, 14, 14, 14, 14, 15, 17, 17, 21, 14,
18, 18, 19, 19, 19, 19, 20, 20, 20, 25, 21, 14, 14, 14, 18, 14, 20, 20, 22, 18,
19, 23, 19, 19, 19, 29, 19, 20, 22, 22, 27, 34, 35, 35, 37, 41, 40, 45, 37, 34,
24, 23, 24, 33, 34, 42, 43, 43, 45, 48, 48, 48, 65, 46, 65, 69, 27, 31, 31, 31,
25, 29, 45, 42, 60, 49, 52, 52, 52, 44, 60, 41, 66, 66, 31, 31, 31, 40, 45, 46,
34, 53, 53, 41, 33, 36, 36, 52, 61, 61, 31, 43, 43, 50, 50, 50, 53, 53, 59, 59,
48, 49, 55, 55, 55, 69, 69, 36, 36, 36, 53, 59, 42, 43, 43, 43, 51, 51, 51, 61,
39, 39, 39, 59, 59, 35, 59, 39, 39, 39, 61, 55, 55, 55, 51, 51, 56, 56, 56, 51,
61, 32, 15, 39, 51, 51, 58, 58, 12, 68, 54, 54, 55, 64, 64, 64, 36, 33, 62, 62,
58, 68, 62, 62, 5, 4, 51, 51, 65, 65, 30, 61, 54, 54, 64, 68, 67, 68, 9, 3,
65, 71, 2, 71, 0, 51, 51, 51, 70, 51, 2, 54, 54, 54, 0, 54, 57, 57, 57, 62,
56, 56, 56, 62, 64, 64, 64, 62, 56, 56, 0, 0, 0, 62, 57, 57, 0, 67, 67, 57,
0, 0, 0, 56, 63, 64, 0, 0, 0, 70, 63, 67, 0, 0, 0, 0, 0, 0, 0, 0,
70, 0, 0, 70, 0, 63, 63, 63, 0, 0, 0, 63, 63, 63, 0, 0, 0, 63, 63, 63,
0, 63, 63, 63, 66, 66, 66, 0, 0, 0, 73, 73, 73, 73, 73, 73, 73, 73, 74, 0,
0, 0, 66, 66, 0, 0, 0, 66, 76, 76, 0, 74, 74, 74, 75, 75, 75, 75, 75, 75,
76, 76, 76, 76, 76, 76, 77, 0, 0, 77, 75, 75, 76, 76, 76, 76, 76, 76, 76, 76,
77, 77, 78, 78, 78, 78, 78, 78, 78, 78, 77, 0, 77, 77, 77, 77, 77, 77, 78, 0,
79, 79, 79, 79, 79, 79, 79, 79, 80, 0, 78, 78, 78, 78, 78, 78, 79, 79, 0, 79,
80, 80, 80, 80, 80, 80, 81, 0, 81, 81, 80, 0, 80, 81, 81, 81, 82, 0, 82, 83,
81, 81, 81, 81, 82, 82, 0, 82, 83, 0, 83, 83, 83, 83, 83, 83, 83, 84, 84, 84,
83, 84, 84, 84, 85, 0, 85, 86, 86, 86, 84, 84, 84, 84, 84, 72, 72, 72, 72, 72,
86, 86, 86, 86, 86, 87, 87, 87, 87, 87, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
87, 87, 87, 75, 75, 75, 75, 75, 75, 75, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 72, 72, 72, 72
75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
75, 75
} ; } ;
static yy_state_type yy_last_accepting_state; static yy_state_type yy_last_accepting_state;
...@@ -619,8 +614,8 @@ int yy_flex_debug = 1; ...@@ -619,8 +614,8 @@ int yy_flex_debug = 1;
static yyconst flex_int16_t yy_rule_linenum[13] = static yyconst flex_int16_t yy_rule_linenum[13] =
{ 0, { 0,
71, 72, 73, 76, 79, 80, 81, 87, 88, 89, 67, 68, 69, 72, 75, 76, 77, 83, 84, 85,
91, 94 87, 90
} ; } ;
/* The intent behind this definition is that it'll catch /* The intent behind this definition is that it'll catch
...@@ -667,15 +662,11 @@ char *yytext; ...@@ -667,15 +662,11 @@ char *yytext;
and then we categorize those basic tokens in the second stage. */ and then we categorize those basic tokens in the second stage. */
#define YY_DECL static int yylex1(void) #define YY_DECL static int yylex1(void)
/* Version 2 checksumming does proper tokenization; version 1 wasn't
quite so pedantic. */
/* We don't do multiple input files. */ /* We don't do multiple input files. */
#define YY_NO_INPUT 1 #define YY_NO_INPUT 1
#line 676 "scripts/genksyms/lex.c" #line 668 "scripts/genksyms/lex.c"
#define INITIAL 0 #define INITIAL 0
#define V2_TOKENS 1
#ifndef YY_NO_UNISTD_H #ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way /* Special case for "unistd.h", since it is non-ANSI. We include it way
...@@ -808,7 +799,7 @@ static int input (void ); ...@@ -808,7 +799,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \ { \
int c = '*'; \ int c = '*'; \
size_t n; \ int n; \
for ( n = 0; n < max_size && \ for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \ buf[n] = (char) c; \
...@@ -918,12 +909,12 @@ YY_DECL ...@@ -918,12 +909,12 @@ YY_DECL
register int yy_act; register int yy_act;
/* %% [7.0] user's declarations go here */ /* %% [7.0] user's declarations go here */
#line 67 "scripts/genksyms/lex.l" #line 63 "scripts/genksyms/lex.l"
/* Keep track of our location in the original source files. */ /* Keep track of our location in the original source files. */
#line 927 "scripts/genksyms/lex.c" #line 918 "scripts/genksyms/lex.c"
if ( !(yy_init) ) if ( !(yy_init) )
{ {
...@@ -987,13 +978,13 @@ yy_match: ...@@ -987,13 +978,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 76 ) if ( yy_current_state >= 73 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp; ++yy_cp;
} }
while ( yy_base[yy_current_state] != 284 ); while ( yy_base[yy_current_state] != 266 );
yy_find_action: yy_find_action:
/* %% [10.0] code to find the action number goes here */ /* %% [10.0] code to find the action number goes here */
...@@ -1041,42 +1032,42 @@ do_action: /* This label is used only to access EOF actions. */ ...@@ -1041,42 +1032,42 @@ do_action: /* This label is used only to access EOF actions. */
case 1: case 1:
/* rule 1 can match eol */ /* rule 1 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 71 "scripts/genksyms/lex.l" #line 67 "scripts/genksyms/lex.l"
return FILENAME; return FILENAME;
YY_BREAK YY_BREAK
case 2: case 2:
/* rule 2 can match eol */ /* rule 2 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 72 "scripts/genksyms/lex.l" #line 68 "scripts/genksyms/lex.l"
cur_line++; cur_line++;
YY_BREAK YY_BREAK
case 3: case 3:
/* rule 3 can match eol */ /* rule 3 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 73 "scripts/genksyms/lex.l" #line 69 "scripts/genksyms/lex.l"
cur_line++; cur_line++;
YY_BREAK YY_BREAK
/* Ignore all other whitespace. */ /* Ignore all other whitespace. */
case 4: case 4:
YY_RULE_SETUP YY_RULE_SETUP
#line 76 "scripts/genksyms/lex.l" #line 72 "scripts/genksyms/lex.l"
; ;
YY_BREAK YY_BREAK
case 5: case 5:
/* rule 5 can match eol */ /* rule 5 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 79 "scripts/genksyms/lex.l" #line 75 "scripts/genksyms/lex.l"
return STRING; return STRING;
YY_BREAK YY_BREAK
case 6: case 6:
/* rule 6 can match eol */ /* rule 6 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 80 "scripts/genksyms/lex.l" #line 76 "scripts/genksyms/lex.l"
return CHAR; return CHAR;
YY_BREAK YY_BREAK
case 7: case 7:
YY_RULE_SETUP YY_RULE_SETUP
#line 81 "scripts/genksyms/lex.l" #line 77 "scripts/genksyms/lex.l"
return IDENT; return IDENT;
YY_BREAK YY_BREAK
/* The Pedant requires that the other C multi-character tokens be /* The Pedant requires that the other C multi-character tokens be
...@@ -1085,38 +1076,37 @@ return IDENT; ...@@ -1085,38 +1076,37 @@ return IDENT;
around them properly. */ around them properly. */
case 8: case 8:
YY_RULE_SETUP YY_RULE_SETUP
#line 87 "scripts/genksyms/lex.l" #line 83 "scripts/genksyms/lex.l"
return OTHER; return OTHER;
YY_BREAK YY_BREAK
case 9: case 9:
YY_RULE_SETUP YY_RULE_SETUP
#line 88 "scripts/genksyms/lex.l" #line 84 "scripts/genksyms/lex.l"
return INT; return INT;
YY_BREAK YY_BREAK
case 10: case 10:
YY_RULE_SETUP YY_RULE_SETUP
#line 89 "scripts/genksyms/lex.l" #line 85 "scripts/genksyms/lex.l"
return REAL; return REAL;
YY_BREAK YY_BREAK
case 11: case 11:
YY_RULE_SETUP YY_RULE_SETUP
#line 91 "scripts/genksyms/lex.l" #line 87 "scripts/genksyms/lex.l"
return DOTS; return DOTS;
YY_BREAK YY_BREAK
/* All other tokens are single characters. */ /* All other tokens are single characters. */
case 12: case 12:
YY_RULE_SETUP YY_RULE_SETUP
#line 94 "scripts/genksyms/lex.l" #line 90 "scripts/genksyms/lex.l"
return yytext[0]; return yytext[0];
YY_BREAK YY_BREAK
case 13: case 13:
YY_RULE_SETUP YY_RULE_SETUP
#line 97 "scripts/genksyms/lex.l" #line 93 "scripts/genksyms/lex.l"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 1118 "scripts/genksyms/lex.c" #line 1109 "scripts/genksyms/lex.c"
case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(V2_TOKENS):
yyterminate(); yyterminate();
case YY_END_OF_BUFFER: case YY_END_OF_BUFFER:
...@@ -1429,7 +1419,7 @@ static int yy_get_next_buffer (void) ...@@ -1429,7 +1419,7 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 76 ) if ( yy_current_state >= 73 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
...@@ -1462,11 +1452,11 @@ static int yy_get_next_buffer (void) ...@@ -1462,11 +1452,11 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 76 ) if ( yy_current_state >= 73 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 75); yy_is_jam = (yy_current_state == 72);
return yy_is_jam ? 0 : yy_current_state; return yy_is_jam ? 0 : yy_current_state;
} }
...@@ -2252,7 +2242,7 @@ void yyfree (void * ptr ) ...@@ -2252,7 +2242,7 @@ void yyfree (void * ptr )
/* %ok-for-header */ /* %ok-for-header */
#line 97 "scripts/genksyms/lex.l" #line 93 "scripts/genksyms/lex.l"
...@@ -2263,12 +2253,23 @@ void yyfree (void * ptr ) ...@@ -2263,12 +2253,23 @@ void yyfree (void * ptr )
/* Macros to append to our phrase collection list. */ /* Macros to append to our phrase collection list. */
/*
* We mark any token, that that equals to a known enumerator, as
* SYM_ENUM_CONST. The parser will change this for struct and union tags later,
* the only problem is struct and union members:
* enum e { a, b }; struct s { int a, b; }
* but in this case, the only effect will be, that the ABI checksums become
* more volatile, which is acceptable. Also, such collisions are quite rare,
* so far it was only observed in include/linux/telephony.h.
*/
#define _APP(T,L) do { \ #define _APP(T,L) do { \
cur_node = next_node; \ cur_node = next_node; \
next_node = xmalloc(sizeof(*next_node)); \ next_node = xmalloc(sizeof(*next_node)); \
next_node->next = cur_node; \ next_node->next = cur_node; \
cur_node->string = memcpy(xmalloc(L+1), T, L+1); \ cur_node->string = memcpy(xmalloc(L+1), T, L+1); \
cur_node->tag = SYM_NORMAL; \ cur_node->tag = \
find_symbol(cur_node->string, SYM_ENUM_CONST, 1)?\
SYM_ENUM_CONST : SYM_NORMAL ; \
} while (0) } while (0)
#define APP _APP(yytext, yyleng) #define APP _APP(yytext, yyleng)
...@@ -2294,7 +2295,6 @@ yylex(void) ...@@ -2294,7 +2295,6 @@ yylex(void)
if (lexstate == ST_NOTSTARTED) if (lexstate == ST_NOTSTARTED)
{ {
BEGIN(V2_TOKENS);
next_node = xmalloc(sizeof(*next_node)); next_node = xmalloc(sizeof(*next_node));
next_node->next = NULL; next_node->next = NULL;
lexstate = ST_NORMAL; lexstate = ST_NORMAL;
...@@ -2347,8 +2347,8 @@ repeat: ...@@ -2347,8 +2347,8 @@ repeat:
case STRUCT_KEYW: case STRUCT_KEYW:
case UNION_KEYW: case UNION_KEYW:
dont_want_brace_phrase = 3;
case ENUM_KEYW: case ENUM_KEYW:
dont_want_brace_phrase = 3;
suppress_type_lookup = 2; suppress_type_lookup = 2;
goto fini; goto fini;
...@@ -2358,8 +2358,7 @@ repeat: ...@@ -2358,8 +2358,7 @@ repeat:
} }
if (!suppress_type_lookup) if (!suppress_type_lookup)
{ {
struct symbol *sym = find_symbol(yytext, SYM_TYPEDEF); if (find_symbol(yytext, SYM_TYPEDEF, 1))
if (sym && sym->type == SYM_TYPEDEF)
token = TYPE; token = TYPE;
} }
} }
...@@ -2478,7 +2477,20 @@ repeat: ...@@ -2478,7 +2477,20 @@ repeat:
++count; ++count;
APP; APP;
goto repeat; goto repeat;
case ')': case ']': case '}': case '}':
/* is this the last line of an enum declaration? */
if (count == 0)
{
/* Put back the token we just read so's we can find it again
after registering the expression. */
unput(token);
lexstate = ST_NORMAL;
token = EXPRESSION_PHRASE;
break;
}
/* FALLTHRU */
case ')': case ']':
--count; --count;
APP; APP;
goto repeat; goto repeat;
...@@ -2567,143 +2579,4 @@ fini: ...@@ -2567,143 +2579,4 @@ fini:
return token; return token;
} }
/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton interface for Bison's Yacc-like parsers in C
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton. Alternatively, if you modify or redistribute
the parser skeleton itself, you may (at your option) remove this
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
ASM_KEYW = 258,
ATTRIBUTE_KEYW = 259,
AUTO_KEYW = 260,
BOOL_KEYW = 261,
CHAR_KEYW = 262,
CONST_KEYW = 263,
DOUBLE_KEYW = 264,
ENUM_KEYW = 265,
EXTERN_KEYW = 266,
EXTENSION_KEYW = 267,
FLOAT_KEYW = 268,
INLINE_KEYW = 269,
INT_KEYW = 270,
LONG_KEYW = 271,
REGISTER_KEYW = 272,
RESTRICT_KEYW = 273,
SHORT_KEYW = 274,
SIGNED_KEYW = 275,
STATIC_KEYW = 276,
STRUCT_KEYW = 277,
TYPEDEF_KEYW = 278,
UNION_KEYW = 279,
UNSIGNED_KEYW = 280,
VOID_KEYW = 281,
VOLATILE_KEYW = 282,
TYPEOF_KEYW = 283,
EXPORT_SYMBOL_KEYW = 284,
ASM_PHRASE = 285,
ATTRIBUTE_PHRASE = 286,
BRACE_PHRASE = 287,
BRACKET_PHRASE = 288,
EXPRESSION_PHRASE = 289,
CHAR = 290,
DOTS = 291,
IDENT = 292,
INT = 293,
REAL = 294,
STRING = 295,
TYPE = 296,
OTHER = 297,
FILENAME = 298
};
#endif
/* Tokens. */
#define ASM_KEYW 258
#define ATTRIBUTE_KEYW 259
#define AUTO_KEYW 260
#define BOOL_KEYW 261
#define CHAR_KEYW 262
#define CONST_KEYW 263
#define DOUBLE_KEYW 264
#define ENUM_KEYW 265
#define EXTERN_KEYW 266
#define EXTENSION_KEYW 267
#define FLOAT_KEYW 268
#define INLINE_KEYW 269
#define INT_KEYW 270
#define LONG_KEYW 271
#define REGISTER_KEYW 272
#define RESTRICT_KEYW 273
#define SHORT_KEYW 274
#define SIGNED_KEYW 275
#define STATIC_KEYW 276
#define STRUCT_KEYW 277
#define TYPEDEF_KEYW 278
#define UNION_KEYW 279
#define UNSIGNED_KEYW 280
#define VOID_KEYW 281
#define VOLATILE_KEYW 282
#define TYPEOF_KEYW 283
#define EXPORT_SYMBOL_KEYW 284
#define ASM_PHRASE 285
#define ATTRIBUTE_PHRASE 286
#define BRACE_PHRASE 287
#define BRACKET_PHRASE 288
#define EXPRESSION_PHRASE 289
#define CHAR 290
#define DOTS 291
#define IDENT 292
#define INT 293
#define REAL 294
#define STRING 295
#define TYPE 296
#define OTHER 297
#define FILENAME 298
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif
extern YYSTYPE yylval;
scripts/genksyms/lex.l
View file @ a88bab9a
...@@ -55,10 +55,6 @@ CHAR L?\'([^\\\']*\\.)*[^\\\']*\' ...@@ -55,10 +55,6 @@ CHAR L?\'([^\\\']*\\.)*[^\\\']*\'
MC_TOKEN ([~%^&*+=|<>/-]=)|(&&)|("||")|(->)|(<<)|(>>) MC_TOKEN ([~%^&*+=|<>/-]=)|(&&)|("||")|(->)|(<<)|(>>)
/* Version 2 checksumming does proper tokenization; version 1 wasn't
quite so pedantic. */
%s V2_TOKENS
/* We don't do multiple input files. */ /* We don't do multiple input files. */
%option noyywrap %option noyywrap
...@@ -84,9 +80,9 @@ MC_TOKEN ([~%^&*+=|<>/-]=)|(&&)|("||")|(->)|(<<)|(>>) ...@@ -84,9 +80,9 @@ MC_TOKEN ([~%^&*+=|<>/-]=)|(&&)|("||")|(->)|(<<)|(>>)
recognized as tokens. We don't actually use them since we don't recognized as tokens. We don't actually use them since we don't
parse expressions, but we do want whitespace to be arranged parse expressions, but we do want whitespace to be arranged
around them properly. */ around them properly. */
<V2_TOKENS>{MC_TOKEN} return OTHER; {MC_TOKEN} return OTHER;
<V2_TOKENS>{INT} return INT; {INT} return INT;
<V2_TOKENS>{REAL} return REAL; {REAL} return REAL;
"..." return DOTS; "..." return DOTS;
...@@ -103,12 +99,23 @@ MC_TOKEN ([~%^&*+=|<>/-]=)|(&&)|("||")|(->)|(<<)|(>>) ...@@ -103,12 +99,23 @@ MC_TOKEN ([~%^&*+=|<>/-]=)|(&&)|("||")|(->)|(<<)|(>>)
/* Macros to append to our phrase collection list. */ /* Macros to append to our phrase collection list. */
/*
* We mark any token, that that equals to a known enumerator, as
* SYM_ENUM_CONST. The parser will change this for struct and union tags later,
* the only problem is struct and union members:
* enum e { a, b }; struct s { int a, b; }
* but in this case, the only effect will be, that the ABI checksums become
* more volatile, which is acceptable. Also, such collisions are quite rare,
* so far it was only observed in include/linux/telephony.h.
*/
#define _APP(T,L) do { \ #define _APP(T,L) do { \
cur_node = next_node; \ cur_node = next_node; \
next_node = xmalloc(sizeof(*next_node)); \ next_node = xmalloc(sizeof(*next_node)); \
next_node->next = cur_node; \ next_node->next = cur_node; \
cur_node->string = memcpy(xmalloc(L+1), T, L+1); \ cur_node->string = memcpy(xmalloc(L+1), T, L+1); \
cur_node->tag = SYM_NORMAL; \ cur_node->tag = \
find_symbol(cur_node->string, SYM_ENUM_CONST, 1)?\
SYM_ENUM_CONST : SYM_NORMAL ; \
} while (0) } while (0)
#define APP _APP(yytext, yyleng) #define APP _APP(yytext, yyleng)
...@@ -134,7 +141,6 @@ yylex(void) ...@@ -134,7 +141,6 @@ yylex(void)
if (lexstate == ST_NOTSTARTED) if (lexstate == ST_NOTSTARTED)
{ {
BEGIN(V2_TOKENS);
next_node = xmalloc(sizeof(*next_node)); next_node = xmalloc(sizeof(*next_node));
next_node->next = NULL; next_node->next = NULL;
lexstate = ST_NORMAL; lexstate = ST_NORMAL;
...@@ -187,8 +193,8 @@ repeat: ...@@ -187,8 +193,8 @@ repeat:
case STRUCT_KEYW: case STRUCT_KEYW:
case UNION_KEYW: case UNION_KEYW:
dont_want_brace_phrase = 3;
case ENUM_KEYW: case ENUM_KEYW:
dont_want_brace_phrase = 3;
suppress_type_lookup = 2; suppress_type_lookup = 2;
goto fini; goto fini;
...@@ -198,8 +204,7 @@ repeat: ...@@ -198,8 +204,7 @@ repeat:
} }
if (!suppress_type_lookup) if (!suppress_type_lookup)
{ {
struct symbol *sym = find_symbol(yytext, SYM_TYPEDEF); if (find_symbol(yytext, SYM_TYPEDEF, 1))
if (sym && sym->type == SYM_TYPEDEF)
token = TYPE; token = TYPE;
} }
} }
...@@ -318,7 +323,20 @@ repeat: ...@@ -318,7 +323,20 @@ repeat:
++count; ++count;
APP; APP;
goto repeat; goto repeat;
case ')': case ']': case '}': case '}':
/* is this the last line of an enum declaration? */
if (count == 0)
{
/* Put back the token we just read so's we can find it again
after registering the expression. */
unput(token);
lexstate = ST_NORMAL;
token = EXPRESSION_PHRASE;
break;
}
/* FALLTHRU */
case ')': case ']':
--count; --count;
APP; APP;
goto repeat; goto repeat;
......
scripts/genksyms/parse.c_shipped
View file @ a88bab9a
/* A Bison parser, made by GNU Bison 2.3. */
/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton implementation for Bison's Yacc-like parsers in C /* Skeleton implementation for Bison's Yacc-like parsers in C
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc. Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option) the Free Software Foundation, either version 3 of the License, or
any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
...@@ -16,9 +17,7 @@ ...@@ -16,9 +17,7 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program. If not, see <http://www.gnu.org/licenses/>. */
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains /* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work part or all of the Bison parser skeleton and distribute that work
...@@ -47,7 +46,7 @@ ...@@ -47,7 +46,7 @@
#define YYBISON 1 #define YYBISON 1
/* Bison version. */ /* Bison version. */
#define YYBISON_VERSION "2.3" #define YYBISON_VERSION "2.4.1"
/* Skeleton name. */ /* Skeleton name. */
#define YYSKELETON_NAME "yacc.c" #define YYSKELETON_NAME "yacc.c"
...@@ -55,11 +54,75 @@ ...@@ -55,11 +54,75 @@
/* Pure parsers. */ /* Pure parsers. */
#define YYPURE 0 #define YYPURE 0
/* Push parsers. */
#define YYPUSH 0
/* Pull parsers. */
#define YYPULL 1
/* Using locations. */ /* Using locations. */
#define YYLSP_NEEDED 0 #define YYLSP_NEEDED 0
/* Copy the first part of user declarations. */
/* Line 189 of yacc.c */
#line 24 "scripts/genksyms/parse.y"
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include "genksyms.h"
static int is_typedef;
static int is_extern;
static char *current_name;
static struct string_list *decl_spec;
static void yyerror(const char *);
static inline void
remove_node(struct string_list **p)
{
struct string_list *node = *p;
*p = node->next;
free_node(node);
}
static inline void
remove_list(struct string_list **pb, struct string_list **pe)
{
struct string_list *b = *pb, *e = *pe;
*pb = e;
free_list(b, e);
}
/* Line 189 of yacc.c */
#line 106 "scripts/genksyms/parse.c"
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
#endif
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
# undef YYERROR_VERBOSE
# define YYERROR_VERBOSE 1
#else
# define YYERROR_VERBOSE 0
#endif
/* Enabling the token table. */
#ifndef YYTOKEN_TABLE
# define YYTOKEN_TABLE 0
#endif
/* Tokens. */ /* Tokens. */
#ifndef YYTOKENTYPE #ifndef YYTOKENTYPE
# define YYTOKENTYPE # define YYTOKENTYPE
...@@ -109,117 +172,22 @@ ...@@ -109,117 +172,22 @@
FILENAME = 298 FILENAME = 298
}; };
#endif #endif
/* Tokens. */
#define ASM_KEYW 258
#define ATTRIBUTE_KEYW 259
#define AUTO_KEYW 260
#define BOOL_KEYW 261
#define CHAR_KEYW 262
#define CONST_KEYW 263
#define DOUBLE_KEYW 264
#define ENUM_KEYW 265
#define EXTERN_KEYW 266
#define EXTENSION_KEYW 267
#define FLOAT_KEYW 268
#define INLINE_KEYW 269
#define INT_KEYW 270
#define LONG_KEYW 271
#define REGISTER_KEYW 272
#define RESTRICT_KEYW 273
#define SHORT_KEYW 274
#define SIGNED_KEYW 275
#define STATIC_KEYW 276
#define STRUCT_KEYW 277
#define TYPEDEF_KEYW 278
#define UNION_KEYW 279
#define UNSIGNED_KEYW 280
#define VOID_KEYW 281
#define VOLATILE_KEYW 282
#define TYPEOF_KEYW 283
#define EXPORT_SYMBOL_KEYW 284
#define ASM_PHRASE 285
#define ATTRIBUTE_PHRASE 286
#define BRACE_PHRASE 287
#define BRACKET_PHRASE 288
#define EXPRESSION_PHRASE 289
#define CHAR 290
#define DOTS 291
#define IDENT 292
#define INT 293
#define REAL 294
#define STRING 295
#define TYPE 296
#define OTHER 297
#define FILENAME 298
/* Copy the first part of user declarations. */
#line 24 "scripts/genksyms/parse.y"
#include <assert.h>
#include <stdlib.h>
#include "genksyms.h"
static int is_typedef;
static int is_extern;
static char *current_name;
static struct string_list *decl_spec;
static void yyerror(const char *);
static inline void
remove_node(struct string_list **p)
{
struct string_list *node = *p;
*p = node->next;
free_node(node);
}
static inline void
remove_list(struct string_list **pb, struct string_list **pe)
{
struct string_list *b = *pb, *e = *pe;
*pb = e;
free_list(b, e);
}
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
#endif
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
# undef YYERROR_VERBOSE
# define YYERROR_VERBOSE 1
#else
# define YYERROR_VERBOSE 0
#endif
/* Enabling the token table. */
#ifndef YYTOKEN_TABLE
# define YYTOKEN_TABLE 0
#endif
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE; typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif #endif
/* Copy the second part of user declarations. */ /* Copy the second part of user declarations. */
/* Line 216 of yacc.c. */ /* Line 264 of yacc.c */
#line 223 "scripts/genksyms/parse.c" #line 191 "scripts/genksyms/parse.c"
#ifdef short #ifdef short
# undef short # undef short
...@@ -294,14 +262,14 @@ typedef short int yytype_int16; ...@@ -294,14 +262,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \ #if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER) || defined __cplusplus || defined _MSC_VER)
static int static int
YYID (int i) YYID (int yyi)
#else #else
static int static int
YYID (i) YYID (yyi)
int i; int yyi;
#endif #endif
{ {
return i; return yyi;
} }
#endif #endif
...@@ -382,9 +350,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ ...@@ -382,9 +350,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */ /* A type that is properly aligned for any stack member. */
union yyalloc union yyalloc
{ {
yytype_int16 yyss; yytype_int16 yyss_alloc;
YYSTYPE yyvs; YYSTYPE yyvs_alloc;
}; };
/* The size of the maximum gap between one aligned stack and the next. */ /* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
...@@ -418,12 +386,12 @@ union yyalloc ...@@ -418,12 +386,12 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next stack. Advance YYPTR to a properly aligned location for the next
stack. */ stack. */
# define YYSTACK_RELOCATE(Stack) \ # define YYSTACK_RELOCATE(Stack_alloc, Stack) \
do \ do \
{ \ { \
YYSIZE_T yynewbytes; \ YYSIZE_T yynewbytes; \
YYCOPY (&yyptr->Stack, Stack, yysize); \ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
Stack = &yyptr->Stack; \ Stack = &yyptr->Stack_alloc; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \ yyptr += yynewbytes / sizeof (*yyptr); \
} \ } \
...@@ -434,16 +402,16 @@ union yyalloc ...@@ -434,16 +402,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */ /* YYFINAL -- State number of the termination state. */
#define YYFINAL 4 #define YYFINAL 4
/* YYLAST -- Last index in YYTABLE. */ /* YYLAST -- Last index in YYTABLE. */
#define YYLAST 523 #define YYLAST 532
/* YYNTOKENS -- Number of terminals. */ /* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 53 #define YYNTOKENS 53
/* YYNNTS -- Number of nonterminals. */ /* YYNNTS -- Number of nonterminals. */
#define YYNNTS 46 #define YYNNTS 49
/* YYNRULES -- Number of rules. */ /* YYNRULES -- Number of rules. */
#define YYNRULES 126 #define YYNRULES 132
/* YYNRULES -- Number of states. */ /* YYNRULES -- Number of states. */
#define YYNSTATES 178 #define YYNSTATES 188
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2 #define YYUNDEFTOK 2
...@@ -504,7 +472,8 @@ static const yytype_uint16 yyprhs[] = ...@@ -504,7 +472,8 @@ static const yytype_uint16 yyprhs[] =
239, 242, 245, 247, 248, 250, 252, 257, 262, 265, 239, 242, 245, 247, 248, 250, 252, 257, 262, 265,
269, 273, 277, 278, 280, 283, 287, 291, 292, 294, 269, 273, 277, 278, 280, 283, 287, 291, 292, 294,
296, 299, 303, 306, 307, 309, 311, 315, 318, 321, 296, 299, 303, 306, 307, 309, 311, 315, 318, 321,
323, 326, 327, 330, 333, 334, 336 323, 326, 327, 330, 334, 339, 341, 345, 347, 351,
354, 355, 357
}; };
/* YYRHS -- A `-1'-separated list of the rules' RHS. */ /* YYRHS -- A `-1'-separated list of the rules' RHS. */
...@@ -512,16 +481,16 @@ static const yytype_int8 yyrhs[] = ...@@ -512,16 +481,16 @@ static const yytype_int8 yyrhs[] =
{ {
54, 0, -1, 55, -1, 54, 55, -1, -1, 56, 54, 0, -1, 55, -1, 54, 55, -1, -1, 56,
57, -1, -1, 12, 23, 58, 60, -1, -1, 23, 57, -1, -1, 12, 23, 58, 60, -1, -1, 23,
59, 60, -1, 60, -1, 84, -1, 96, -1, 98, 59, 60, -1, 60, -1, 84, -1, 99, -1, 101,
-1, 1, 44, -1, 1, 45, -1, 64, 61, 44, -1, 1, 44, -1, 1, 45, -1, 64, 61, 44,
-1, -1, 62, -1, 63, -1, 62, 46, 63, -1, -1, -1, 62, -1, 63, -1, 62, 46, 63, -1,
74, 97, 95, 85, -1, -1, 65, -1, 66, -1, 74, 100, 95, 85, -1, -1, 65, -1, 66, -1,
65, 66, -1, 67, -1, 68, -1, 5, -1, 17, 65, 66, -1, 67, -1, 68, -1, 5, -1, 17,
-1, 21, -1, 11, -1, 14, -1, 69, -1, 73, -1, 21, -1, 11, -1, 14, -1, 69, -1, 73,
-1, 28, 47, 65, 48, 49, -1, 28, 47, 65, -1, 28, 47, 65, 48, 49, -1, 28, 47, 65,
49, -1, 22, 37, -1, 24, 37, -1, 10, 37, 49, -1, 22, 37, -1, 24, 37, -1, 10, 37,
-1, 22, 37, 87, -1, 24, 37, 87, -1, 10, -1, 22, 37, 87, -1, 24, 37, 87, -1, 10,
37, 32, -1, 10, 32, -1, 22, 87, -1, 24, 37, 96, -1, 10, 96, -1, 22, 87, -1, 24,
87, -1, 7, -1, 19, -1, 15, -1, 16, -1, 87, -1, 7, -1, 19, -1, 15, -1, 16, -1,
20, -1, 25, -1, 13, -1, 9, -1, 26, -1, 20, -1, 25, -1, 13, -1, 9, -1, 26, -1,
6, -1, 41, -1, 48, 71, -1, -1, 72, -1, 6, -1, 41, -1, 48, 71, -1, -1, 72, -1,
...@@ -543,26 +512,29 @@ static const yytype_int8 yyrhs[] = ...@@ -543,26 +512,29 @@ static const yytype_int8 yyrhs[] =
91, 44, -1, 1, 44, -1, -1, 92, -1, 93, 91, 44, -1, 1, 44, -1, -1, 92, -1, 93,
-1, 92, 46, 93, -1, 76, 95, -1, 37, 94, -1, 92, 46, 93, -1, 76, 95, -1, 37, 94,
-1, 94, -1, 52, 34, -1, -1, 95, 31, -1, -1, 94, -1, 52, 34, -1, -1, 95, 31, -1,
30, 44, -1, -1, 30, -1, 29, 47, 37, 49, 51, 97, 45, -1, 51, 97, 46, 45, -1, 98,
44, -1 -1, 97, 46, 98, -1, 37, -1, 37, 50, 34,
-1, 30, 44, -1, -1, 30, -1, 29, 47, 37,
49, 44, -1
}; };
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] = static const yytype_uint16 yyrline[] =
{ {
0, 103, 103, 104, 108, 108, 114, 114, 116, 116, 0, 104, 104, 105, 109, 109, 115, 115, 117, 117,
118, 119, 120, 121, 122, 123, 127, 141, 142, 146, 119, 120, 121, 122, 123, 124, 128, 142, 143, 147,
154, 167, 173, 174, 178, 179, 183, 189, 193, 194, 155, 168, 174, 175, 179, 180, 184, 190, 194, 195,
195, 196, 197, 201, 202, 203, 204, 208, 210, 212, 196, 197, 198, 202, 203, 204, 205, 209, 211, 213,
216, 223, 230, 239, 240, 241, 245, 246, 247, 248, 217, 224, 231, 241, 244, 245, 249, 250, 251, 252,
249, 250, 251, 252, 253, 254, 255, 259, 264, 265, 253, 254, 255, 256, 257, 258, 259, 263, 268, 269,
269, 270, 274, 274, 274, 275, 283, 284, 288, 297, 273, 274, 278, 278, 278, 279, 287, 288, 292, 301,
299, 301, 303, 305, 312, 313, 317, 318, 319, 321, 303, 305, 307, 309, 316, 317, 321, 322, 323, 325,
323, 325, 327, 332, 333, 334, 338, 339, 343, 344, 327, 329, 331, 336, 337, 338, 342, 343, 347, 348,
349, 354, 356, 360, 361, 369, 373, 375, 377, 379, 353, 358, 360, 364, 365, 373, 377, 379, 381, 383,
381, 386, 395, 396, 401, 406, 407, 411, 412, 416, 385, 390, 399, 400, 405, 410, 411, 415, 416, 420,
417, 421, 423, 428, 429, 433, 434, 438, 439, 440, 421, 425, 427, 432, 433, 437, 438, 442, 443, 444,
444, 448, 449, 453, 457, 458, 462 448, 452, 453, 457, 458, 462, 463, 466, 471, 479,
483, 484, 488
}; };
#endif #endif
...@@ -581,8 +553,8 @@ static const char *const yytname[] = ...@@ -581,8 +553,8 @@ static const char *const yytname[] =
"ATTRIBUTE_PHRASE", "BRACE_PHRASE", "BRACKET_PHRASE", "ATTRIBUTE_PHRASE", "BRACE_PHRASE", "BRACKET_PHRASE",
"EXPRESSION_PHRASE", "CHAR", "DOTS", "IDENT", "INT", "REAL", "STRING", "EXPRESSION_PHRASE", "CHAR", "DOTS", "IDENT", "INT", "REAL", "STRING",
"TYPE", "OTHER", "FILENAME", "';'", "'}'", "','", "'('", "'*'", "')'", "TYPE", "OTHER", "FILENAME", "';'", "'}'", "','", "'('", "'*'", "')'",
"'='", "'{'", "':'", "$accept", "declaration_seq", "declaration", "@1", "'='", "'{'", "':'", "$accept", "declaration_seq", "declaration", "$@1",
"declaration1", "@2", "@3", "simple_declaration", "declaration1", "$@2", "$@3", "simple_declaration",
"init_declarator_list_opt", "init_declarator_list", "init_declarator", "init_declarator_list_opt", "init_declarator_list", "init_declarator",
"decl_specifier_seq_opt", "decl_specifier_seq", "decl_specifier", "decl_specifier_seq_opt", "decl_specifier_seq", "decl_specifier",
"storage_class_specifier", "type_specifier", "simple_type_specifier", "storage_class_specifier", "type_specifier", "simple_type_specifier",
...@@ -596,7 +568,8 @@ static const char *const yytname[] = ...@@ -596,7 +568,8 @@ static const char *const yytname[] =
"member_specification", "member_declaration", "member_specification", "member_declaration",
"member_declarator_list_opt", "member_declarator_list", "member_declarator_list_opt", "member_declarator_list",
"member_declarator", "member_bitfield_declarator", "attribute_opt", "member_declarator", "member_bitfield_declarator", "attribute_opt",
"asm_definition", "asm_phrase_opt", "export_definition", 0 "enum_body", "enumerator_list", "enumerator", "asm_definition",
"asm_phrase_opt", "export_definition", 0
}; };
#endif #endif
...@@ -629,7 +602,8 @@ static const yytype_uint8 yyr1[] = ...@@ -629,7 +602,8 @@ static const yytype_uint8 yyr1[] =
81, 82, 82, 83, 83, 83, 83, 83, 83, 83, 81, 82, 82, 83, 83, 83, 83, 83, 83, 83,
83, 84, 85, 85, 86, 87, 87, 88, 88, 89, 83, 84, 85, 85, 86, 87, 87, 88, 88, 89,
89, 90, 90, 91, 91, 92, 92, 93, 93, 93, 89, 90, 90, 91, 91, 92, 92, 93, 93, 93,
94, 95, 95, 96, 97, 97, 98 94, 95, 95, 96, 96, 97, 97, 98, 98, 99,
100, 100, 101
}; };
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
...@@ -647,7 +621,8 @@ static const yytype_uint8 yyr2[] = ...@@ -647,7 +621,8 @@ static const yytype_uint8 yyr2[] =
2, 2, 1, 0, 1, 1, 4, 4, 2, 3, 2, 2, 1, 0, 1, 1, 4, 4, 2, 3,
3, 3, 0, 1, 2, 3, 3, 0, 1, 1, 3, 3, 0, 1, 2, 3, 3, 0, 1, 1,
2, 3, 2, 0, 1, 1, 3, 2, 2, 1, 2, 3, 2, 0, 1, 1, 3, 2, 2, 1,
2, 0, 2, 2, 0, 1, 5 2, 0, 2, 3, 4, 1, 3, 1, 3, 2,
0, 1, 5
}; };
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
...@@ -659,17 +634,18 @@ static const yytype_uint8 yydefact[] = ...@@ -659,17 +634,18 @@ static const yytype_uint8 yydefact[] =
62, 53, 0, 31, 0, 52, 32, 48, 49, 29, 62, 53, 0, 31, 0, 52, 32, 48, 49, 29,
65, 47, 50, 30, 0, 8, 0, 51, 54, 63, 65, 47, 50, 30, 0, 8, 0, 51, 54, 63,
0, 0, 0, 64, 56, 5, 10, 17, 23, 24, 0, 0, 0, 64, 56, 5, 10, 17, 23, 24,
26, 27, 33, 34, 11, 12, 13, 14, 15, 43, 26, 27, 33, 34, 11, 12, 13, 14, 15, 39,
39, 6, 37, 0, 44, 22, 38, 45, 0, 0, 0, 43, 6, 37, 0, 44, 22, 38, 45, 0,
123, 68, 0, 58, 0, 18, 19, 0, 124, 67, 0, 129, 68, 0, 58, 0, 18, 19, 0, 130,
25, 42, 22, 40, 0, 113, 0, 0, 109, 9, 67, 25, 42, 127, 0, 125, 22, 40, 0, 113,
17, 41, 0, 0, 0, 0, 57, 59, 60, 16, 0, 0, 109, 9, 17, 41, 0, 0, 0, 0,
0, 66, 125, 101, 121, 71, 0, 7, 112, 106, 57, 59, 60, 16, 0, 66, 131, 101, 121, 71,
76, 77, 0, 0, 0, 121, 75, 0, 114, 115, 0, 0, 123, 0, 7, 112, 106, 76, 77, 0,
119, 105, 0, 110, 124, 0, 36, 0, 73, 72, 0, 0, 121, 75, 0, 114, 115, 119, 105, 0,
61, 20, 102, 0, 93, 0, 84, 87, 88, 118, 110, 130, 0, 36, 0, 73, 72, 61, 20, 102,
0, 93, 0, 84, 87, 88, 128, 124, 126, 118,
0, 76, 0, 120, 74, 117, 80, 0, 111, 0, 0, 76, 0, 120, 74, 117, 80, 0, 111, 0,
35, 126, 122, 0, 21, 103, 70, 94, 56, 0, 35, 132, 122, 0, 21, 103, 70, 94, 56, 0,
93, 90, 92, 69, 83, 0, 82, 81, 0, 0, 93, 90, 92, 69, 83, 0, 82, 81, 0, 0,
116, 104, 0, 95, 0, 91, 98, 0, 85, 89, 116, 104, 0, 95, 0, 91, 98, 0, 85, 89,
79, 78, 100, 99, 0, 0, 97, 96 79, 78, 100, 99, 0, 0, 97, 96
...@@ -678,46 +654,47 @@ static const yytype_uint8 yydefact[] = ...@@ -678,46 +654,47 @@ static const yytype_uint8 yydefact[] =
/* YYDEFGOTO[NTERM-NUM]. */ /* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] = static const yytype_int16 yydefgoto[] =
{ {
-1, 1, 2, 3, 35, 72, 55, 36, 64, 65, -1, 1, 2, 3, 35, 76, 56, 36, 65, 66,
66, 75, 38, 39, 40, 41, 42, 67, 86, 87, 67, 79, 38, 39, 40, 41, 42, 68, 90, 91,
43, 114, 69, 105, 106, 125, 126, 127, 128, 151, 43, 121, 70, 112, 113, 132, 133, 134, 135, 161,
152, 44, 144, 145, 54, 76, 77, 78, 107, 108, 162, 44, 154, 155, 55, 80, 81, 82, 114, 115,
109, 110, 122, 45, 94, 46 116, 117, 129, 51, 74, 75, 45, 98, 46
}; };
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */ STATE-NUM. */
#define YYPACT_NINF -134 #define YYPACT_NINF -135
static const yytype_int16 yypact[] = static const yytype_int16 yypact[] =
{ {
-134, 16, -134, 312, -134, -134, 20, -134, -134, -134, -135, 20, -135, 321, -135, -135, 30, -135, -135, -135,
-134, -134, -18, -134, -3, -134, -134, -134, -134, -134, -135, -135, -28, -135, 2, -135, -135, -135, -135, -135,
-134, -134, -134, -134, -26, -134, -25, -134, -134, -134, -135, -135, -135, -135, -6, -135, 9, -135, -135, -135,
-7, 5, 27, -134, -134, -134, -134, 46, 482, -134, -5, 15, -17, -135, -135, -135, -135, 18, 491, -135,
-134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -135, -135, -135, -135, -135, -135, -135, -135, -135, -22,
-8, -134, 30, 97, -134, 482, 30, -134, 482, 7, 31, -135, -135, 19, 106, -135, 491, 19, -135, 491,
-134, -134, 12, 10, 42, 55, -134, 46, -15, 15, 50, -135, -135, 11, -3, 51, 57, -135, 18, -14,
-134, -134, 482, -134, 25, 26, 47, 145, -134, -134, 14, -135, -135, 48, 46, -135, 491, -135, 33, 32,
46, -134, 356, 39, 71, 77, -134, 10, -134, -134, 59, 154, -135, -135, 18, -135, 365, 56, 60, 61,
46, -134, -134, -134, -134, -134, 193, -134, -134, -134, -135, -3, -135, -135, 18, -135, -135, -135, -135, -135,
75, -134, 6, 95, 43, -134, 28, 86, 85, -134, 202, 74, -135, -23, -135, -135, -135, 77, -135, 16,
-134, -134, 88, -134, 103, 87, -134, 91, -134, -134, 101, 49, -135, 34, 92, 93, -135, -135, -135, 94,
-134, -134, -23, 90, 401, 94, 101, 102, -134, -134, -135, 110, 95, -135, 97, -135, -135, -135, -135, -20,
98, -134, 108, -134, -134, 109, -134, 230, -134, 26, 96, 410, 99, 113, 100, -135, -135, -135, -135, -135,
-134, -134, -134, 134, -134, -134, -134, -134, -134, 9, 103, -135, 107, -135, -135, 111, -135, 239, -135, 32,
48, -134, 35, -134, -134, 445, -134, -134, 125, 126, -135, -135, -135, 123, -135, -135, -135, -135, -135, 3,
-134, -134, 128, -134, 129, -134, -134, 267, -134, -134, 52, -135, 38, -135, -135, 454, -135, -135, 117, 128,
-134, -134, -134, -134, 130, 131, -134, -134 -135, -135, 134, -135, 135, -135, -135, 276, -135, -135,
-135, -135, -135, -135, 137, 138, -135, -135
}; };
/* YYPGOTO[NTERM-NUM]. */ /* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] = static const yytype_int16 yypgoto[] =
{ {
-134, -134, 180, -134, -134, -134, -134, -33, -134, -134, -135, -135, 187, -135, -135, -135, -135, -50, -135, -135,
93, 0, -58, -37, -134, -134, -134, -73, -134, -134, 98, 0, -59, -37, -135, -135, -135, -77, -135, -135,
-54, -32, -134, -81, -134, -133, -134, -134, 29, -50, -54, -30, -135, -90, -135, -134, -135, -135, 24, -58,
-134, -134, -134, -134, -20, -134, -134, 110, -134, -134, -135, -135, -135, -135, -18, -135, -135, 109, -135, -135,
49, 96, 80, -134, -134, -134 44, 87, 84, 148, -135, 102, -135, -135, -135
}; };
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
...@@ -727,116 +704,118 @@ static const yytype_int16 yypgoto[] = ...@@ -727,116 +704,118 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -109 #define YYTABLE_NINF -109
static const yytype_int16 yytable[] = static const yytype_int16 yytable[] =
{ {
82, 70, 104, 37, 159, 68, 57, 130, 142, 88, 86, 71, 111, 37, 172, 10, 83, 69, 58, 49,
162, 52, 56, 84, 49, 92, 4, 93, 10, 50, 92, 152, 88, 169, 73, 20, 96, 140, 97, 142,
51, 132, 79, 134, 71, 53, 53, 143, 20, 104, 4, 144, 137, 50, 29, 52, 104, 61, 33, 50,
85, 104, 73, 120, 175, 91, 81, 29, 124, 97, 153, 53, 111, 89, 111, 77, -93, 127, 95, 85,
58, 33, -93, 131, 83, 70, 147, 101, 95, 61, 157, 131, 59, 185, 173, 54, 57, 99, 62, 71,
163, 150, 59, 102, 63, 80, 149, 63, -93, 62, 159, 64, -93, 141, 160, 62, 84, 108, 63, 64,
63, 136, 96, 100, 47, 48, 104, 101, 166, 98, 54, 100, 60, 109, 64, 63, 64, 146, 73, 107,
99, 60, 80, 102, 63, 137, 150, 150, 103, 124, 54, 176, 111, 108, 47, 48, 84, 105, 106, 109,
131, 53, 167, 61, 101, 147, 89, 70, 117, 163, 64, 147, 160, 160, 110, 177, 141, 87, 131, 157,
102, 63, 111, 62, 63, 149, 63, 124, 74, 164, 108, 102, 103, 173, 71, 93, 109, 64, 101, 159,
165, 90, 7, 8, 9, 10, 11, 12, 13, 124, 64, 174, 175, 94, 118, 124, 131, 78, 136, 125,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 126, 7, 8, 9, 10, 11, 12, 13, 131, 15,
118, 26, 27, 28, 29, 30, 119, 103, 33, 133, 16, 17, 18, 19, 20, 21, 22, 23, 24, 110,
138, 139, 98, 92, -22, 141, 140, 154, 34, 146, 26, 27, 28, 29, 30, 143, 148, 33, 105, 149,
142, -22, -107, 153, -22, -22, 112, 156, 155, -22, 96, 151, 152, -22, 150, 156, 165, 34, 163, 164,
7, 8, 9, 10, 11, 12, 13, 157, 15, 16, -22, -107, 166, -22, -22, 119, 167, 171, -22, 7,
17, 18, 19, 20, 21, 22, 23, 24, 161, 26, 8, 9, 10, 11, 12, 13, 180, 15, 16, 17,
27, 28, 29, 30, 170, 171, 33, 172, 173, 176, 18, 19, 20, 21, 22, 23, 24, 181, 26, 27,
177, 5, -22, 121, 169, 135, 34, 113, 160, -22, 28, 29, 30, 182, 183, 33, 186, 187, 5, 179,
-108, 0, -22, -22, 123, 0, 129, -22, 7, 8, 120, -22, 128, 170, 139, 34, 145, 72, -22, -108,
9, 10, 11, 12, 13, 0, 15, 16, 17, 18, 0, -22, -22, 130, 0, 138, -22, 7, 8, 9,
19, 20, 21, 22, 23, 24, 0, 26, 27, 28, 10, 11, 12, 13, 0, 15, 16, 17, 18, 19,
29, 30, 0, 0, 33, 0, 0, 0, 0, -86, 20, 21, 22, 23, 24, 0, 26, 27, 28, 29,
0, 158, 0, 0, 34, 7, 8, 9, 10, 11, 30, 0, 0, 33, 0, 0, 0, 0, -86, 0,
12, 13, -86, 15, 16, 17, 18, 19, 20, 21, 168, 0, 0, 34, 7, 8, 9, 10, 11, 12,
22, 23, 24, 0, 26, 27, 28, 29, 30, 0, 13, -86, 15, 16, 17, 18, 19, 20, 21, 22,
0, 33, 0, 0, 0, 0, -86, 0, 174, 0, 23, 24, 0, 26, 27, 28, 29, 30, 0, 0,
0, 34, 7, 8, 9, 10, 11, 12, 13, -86, 33, 0, 0, 0, 0, -86, 0, 184, 0, 0,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 34, 7, 8, 9, 10, 11, 12, 13, -86, 15,
0, 26, 27, 28, 29, 30, 0, 0, 33, 0,
0, 0, 0, -86, 0, 0, 0, 0, 34, 0,
0, 0, 0, 6, 0, 0, -86, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 0, 0, 0, 0, 0, -22,
0, 0, 0, 34, 0, 0, -22, 0, 0, -22,
-22, 7, 8, 9, 10, 11, 12, 13, 0, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0,
26, 27, 28, 29, 30, 0, 0, 33, 0, 0, 26, 27, 28, 29, 30, 0, 0, 33, 0, 0,
0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 0, -86, 0, 0, 0, 0, 34, 0, 0,
0, 0, 0, 0, 115, 116, 7, 8, 9, 10, 0, 0, 6, 0, 0, -86, 7, 8, 9, 10,
11, 12, 13, 0, 15, 16, 17, 18, 19, 20, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 0, 26, 27, 28, 29, 30, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
0, 0, 33, 0, 0, 0, 0, 0, 147, 0, 31, 32, 33, 0, 0, 0, 0, 0, -22, 0,
0, 0, 148, 0, 0, 0, 0, 0, 149, 63, 0, 0, 34, 0, 0, -22, 0, 0, -22, -22,
7, 8, 9, 10, 11, 12, 13, 0, 15, 16, 7, 8, 9, 10, 11, 12, 13, 0, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 0, 26, 17, 18, 19, 20, 21, 22, 23, 24, 0, 26,
27, 28, 29, 30, 0, 0, 33, 0, 0, 0, 27, 28, 29, 30, 0, 0, 33, 0, 0, 0,
0, 168, 0, 0, 0, 0, 34, 7, 8, 9, 0, 0, 0, 0, 0, 0, 34, 0, 0, 0,
10, 11, 12, 13, 0, 15, 16, 17, 18, 19, 0, 0, 0, 122, 123, 7, 8, 9, 10, 11,
20, 21, 22, 23, 24, 0, 26, 27, 28, 29, 12, 13, 0, 15, 16, 17, 18, 19, 20, 21,
30, 0, 0, 33, 0, 0, 0, 0, 0, 0, 22, 23, 24, 0, 26, 27, 28, 29, 30, 0,
0, 0, 0, 34 0, 33, 0, 0, 0, 0, 0, 157, 0, 0,
0, 158, 0, 0, 0, 0, 0, 159, 64, 7,
8, 9, 10, 11, 12, 13, 0, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 0, 26, 27,
28, 29, 30, 0, 0, 33, 0, 0, 0, 0,
178, 0, 0, 0, 0, 34, 7, 8, 9, 10,
11, 12, 13, 0, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 0, 26, 27, 28, 29, 30,
0, 0, 33, 0, 0, 0, 0, 0, 0, 0,
0, 0, 34
}; };
static const yytype_int16 yycheck[] = static const yytype_int16 yycheck[] =
{ {
58, 38, 75, 3, 137, 37, 26, 1, 31, 63, 59, 38, 79, 3, 1, 8, 56, 37, 26, 37,
1, 37, 37, 1, 32, 30, 0, 32, 8, 37, 64, 31, 1, 147, 37, 18, 30, 1, 32, 109,
23, 102, 55, 104, 32, 51, 51, 50, 18, 102, 0, 111, 45, 51, 27, 23, 76, 44, 31, 51,
62, 104, 52, 87, 167, 67, 56, 27, 96, 72, 50, 37, 109, 63, 111, 53, 33, 91, 68, 57,
47, 31, 33, 37, 37, 82, 37, 41, 33, 37, 37, 100, 47, 177, 41, 51, 37, 33, 37, 86,
41, 124, 47, 47, 48, 55, 47, 48, 49, 47, 47, 48, 49, 37, 131, 37, 56, 41, 47, 48,
48, 33, 47, 37, 44, 45, 139, 41, 33, 44, 51, 47, 47, 47, 48, 47, 48, 33, 37, 37,
45, 44, 72, 47, 48, 47, 149, 150, 52, 137, 51, 33, 149, 41, 44, 45, 76, 44, 45, 47,
37, 51, 47, 37, 41, 37, 44, 124, 49, 41, 48, 47, 159, 160, 52, 47, 37, 37, 147, 37,
47, 48, 45, 47, 48, 47, 48, 155, 1, 149, 41, 45, 46, 41, 131, 44, 47, 48, 50, 47,
150, 46, 5, 6, 7, 8, 9, 10, 11, 167, 48, 159, 160, 46, 45, 49, 165, 1, 34, 49,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 49, 5, 6, 7, 8, 9, 10, 11, 177, 13,
49, 24, 25, 26, 27, 28, 49, 52, 31, 34, 14, 15, 16, 17, 18, 19, 20, 21, 22, 52,
44, 46, 44, 30, 37, 44, 49, 36, 41, 49, 24, 25, 26, 27, 28, 34, 44, 31, 44, 46,
31, 44, 45, 49, 47, 48, 1, 49, 46, 52, 30, 44, 31, 37, 49, 49, 46, 41, 49, 36,
5, 6, 7, 8, 9, 10, 11, 49, 13, 14, 44, 45, 49, 47, 48, 1, 49, 34, 52, 5,
15, 16, 17, 18, 19, 20, 21, 22, 34, 24, 6, 7, 8, 9, 10, 11, 49, 13, 14, 15,
25, 26, 27, 28, 49, 49, 31, 49, 49, 49, 16, 17, 18, 19, 20, 21, 22, 49, 24, 25,
49, 1, 37, 90, 155, 105, 41, 77, 139, 44, 26, 27, 28, 49, 49, 31, 49, 49, 1, 165,
45, -1, 47, 48, 1, -1, 100, 52, 5, 6, 81, 37, 94, 149, 107, 41, 112, 49, 44, 45,
7, 8, 9, 10, 11, -1, 13, 14, 15, 16, -1, 47, 48, 1, -1, 103, 52, 5, 6, 7,
17, 18, 19, 20, 21, 22, -1, 24, 25, 26, 8, 9, 10, 11, -1, 13, 14, 15, 16, 17,
27, 28, -1, -1, 31, -1, -1, -1, -1, 36, 18, 19, 20, 21, 22, -1, 24, 25, 26, 27,
-1, 1, -1, -1, 41, 5, 6, 7, 8, 9, 28, -1, -1, 31, -1, -1, -1, -1, 36, -1,
10, 11, 49, 13, 14, 15, 16, 17, 18, 19, 1, -1, -1, 41, 5, 6, 7, 8, 9, 10,
20, 21, 22, -1, 24, 25, 26, 27, 28, -1, 11, 49, 13, 14, 15, 16, 17, 18, 19, 20,
-1, 31, -1, -1, -1, -1, 36, -1, 1, -1, 21, 22, -1, 24, 25, 26, 27, 28, -1, -1,
-1, 41, 5, 6, 7, 8, 9, 10, 11, 49, 31, -1, -1, -1, -1, 36, -1, 1, -1, -1,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 41, 5, 6, 7, 8, 9, 10, 11, 49, 13,
-1, 24, 25, 26, 27, 28, -1, -1, 31, -1,
-1, -1, -1, 36, -1, -1, -1, -1, 41, -1,
-1, -1, -1, 1, -1, -1, 49, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, -1, -1, -1, -1, -1, 37,
-1, -1, -1, 41, -1, -1, 44, -1, -1, 47,
48, 5, 6, 7, 8, 9, 10, 11, -1, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, -1, 14, 15, 16, 17, 18, 19, 20, 21, 22, -1,
24, 25, 26, 27, 28, -1, -1, 31, -1, -1, 24, 25, 26, 27, 28, -1, -1, 31, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, 36, -1, -1, -1, -1, 41, -1, -1,
-1, -1, -1, -1, 48, 49, 5, 6, 7, 8, -1, -1, 1, -1, -1, 49, 5, 6, 7, 8,
9, 10, 11, -1, 13, 14, 15, 16, 17, 18, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, -1, 24, 25, 26, 27, 28, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
-1, -1, 31, -1, -1, -1, -1, -1, 37, -1, 29, 30, 31, -1, -1, -1, -1, -1, 37, -1,
-1, -1, 41, -1, -1, -1, -1, -1, 47, 48, -1, -1, 41, -1, -1, 44, -1, -1, 47, 48,
5, 6, 7, 8, 9, 10, 11, -1, 13, 14, 5, 6, 7, 8, 9, 10, 11, -1, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, -1, 24, 15, 16, 17, 18, 19, 20, 21, 22, -1, 24,
25, 26, 27, 28, -1, -1, 31, -1, -1, -1, 25, 26, 27, 28, -1, -1, 31, -1, -1, -1,
-1, 36, -1, -1, -1, -1, 41, 5, 6, 7, -1, -1, -1, -1, -1, -1, 41, -1, -1, -1,
8, 9, 10, 11, -1, 13, 14, 15, 16, 17, -1, -1, -1, 48, 49, 5, 6, 7, 8, 9,
18, 19, 20, 21, 22, -1, 24, 25, 26, 27, 10, 11, -1, 13, 14, 15, 16, 17, 18, 19,
28, -1, -1, 31, -1, -1, -1, -1, -1, -1, 20, 21, 22, -1, 24, 25, 26, 27, 28, -1,
-1, -1, -1, 41 -1, 31, -1, -1, -1, -1, -1, 37, -1, -1,
-1, 41, -1, -1, -1, -1, -1, 47, 48, 5,
6, 7, 8, 9, 10, 11, -1, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, -1, 24, 25,
26, 27, 28, -1, -1, 31, -1, -1, -1, -1,
36, -1, -1, -1, -1, 41, 5, 6, 7, 8,
9, 10, 11, -1, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, -1, 24, 25, 26, 27, 28,
-1, -1, 31, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 41
}; };
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
...@@ -847,15 +826,16 @@ static const yytype_uint8 yystos[] = ...@@ -847,15 +826,16 @@ static const yytype_uint8 yystos[] =
8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 41, 57, 60, 64, 65, 66, 28, 29, 30, 31, 41, 57, 60, 64, 65, 66,
67, 68, 69, 73, 84, 96, 98, 44, 45, 32, 67, 68, 69, 73, 84, 99, 101, 44, 45, 37,
37, 23, 37, 51, 87, 59, 37, 87, 47, 47, 51, 96, 23, 37, 51, 87, 59, 37, 87, 47,
44, 37, 47, 48, 61, 62, 63, 70, 74, 75, 47, 44, 37, 47, 48, 61, 62, 63, 70, 74,
66, 32, 58, 87, 1, 64, 88, 89, 90, 60, 75, 66, 96, 37, 97, 98, 58, 87, 1, 64,
64, 87, 65, 37, 1, 74, 71, 72, 73, 44, 88, 89, 90, 60, 64, 87, 65, 37, 1, 74,
46, 74, 30, 32, 97, 33, 47, 60, 44, 45, 71, 72, 73, 44, 46, 74, 30, 32, 100, 33,
37, 41, 47, 52, 70, 76, 77, 91, 92, 93, 47, 50, 45, 46, 60, 44, 45, 37, 41, 47,
94, 45, 1, 90, 74, 48, 49, 49, 49, 49, 52, 70, 76, 77, 91, 92, 93, 94, 45, 1,
73, 63, 95, 1, 65, 78, 79, 80, 81, 94, 90, 74, 48, 49, 49, 49, 49, 73, 63, 95,
1, 65, 78, 79, 80, 81, 34, 45, 98, 94,
1, 37, 76, 34, 76, 95, 33, 47, 44, 46, 1, 37, 76, 34, 76, 95, 33, 47, 44, 46,
49, 44, 31, 50, 85, 86, 49, 37, 41, 47, 49, 44, 31, 50, 85, 86, 49, 37, 41, 47,
70, 82, 83, 49, 36, 46, 49, 49, 1, 78, 70, 82, 83, 49, 36, 46, 49, 49, 1, 78,
...@@ -1045,17 +1025,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) ...@@ -1045,17 +1025,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \ #if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER) || defined __cplusplus || defined _MSC_VER)
static void static void
yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
#else #else
static void static void
yy_stack_print (bottom, top) yy_stack_print (yybottom, yytop)
yytype_int16 *bottom; yytype_int16 *yybottom;
yytype_int16 *top; yytype_int16 *yytop;
#endif #endif
{ {
YYFPRINTF (stderr, "Stack now"); YYFPRINTF (stderr, "Stack now");
for (; bottom <= top; ++bottom) for (; yybottom <= yytop; yybottom++)
YYFPRINTF (stderr, " %d", *bottom); {
int yybot = *yybottom;
YYFPRINTF (stderr, " %d", yybot);
}
YYFPRINTF (stderr, "\n"); YYFPRINTF (stderr, "\n");
} }
...@@ -1089,11 +1072,11 @@ yy_reduce_print (yyvsp, yyrule) ...@@ -1089,11 +1072,11 @@ yy_reduce_print (yyvsp, yyrule)
/* The symbols being reduced. */ /* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++) for (yyi = 0; yyi < yynrhs; yyi++)
{ {
fprintf (stderr, " $%d = ", yyi + 1); YYFPRINTF (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)]) &(yyvsp[(yyi + 1) - (yynrhs)])
); );
fprintf (stderr, "\n"); YYFPRINTF (stderr, "\n");
} }
} }
...@@ -1373,10 +1356,8 @@ yydestruct (yymsg, yytype, yyvaluep) ...@@ -1373,10 +1356,8 @@ yydestruct (yymsg, yytype, yyvaluep)
break; break;
} }
} }
/* Prevent warnings from -Wmissing-prototypes. */ /* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM #ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus #if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM); int yyparse (void *YYPARSE_PARAM);
...@@ -1392,11 +1373,10 @@ int yyparse (); ...@@ -1392,11 +1373,10 @@ int yyparse ();
#endif /* ! YYPARSE_PARAM */ #endif /* ! YYPARSE_PARAM */
/* The lookahead symbol. */
/* The look-ahead symbol. */
int yychar; int yychar;
/* The semantic value of the look-ahead symbol. */ /* The semantic value of the lookahead symbol. */
YYSTYPE yylval; YYSTYPE yylval;
/* Number of syntax errors so far. */ /* Number of syntax errors so far. */
...@@ -1404,9 +1384,9 @@ int yynerrs; ...@@ -1404,9 +1384,9 @@ int yynerrs;
/*----------. /*-------------------------.
| yyparse. | | yyparse or yypush_parse. |
`----------*/ `-------------------------*/
#ifdef YYPARSE_PARAM #ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \ #if (defined __STDC__ || defined __C99__FUNC__ \
...@@ -1431,53 +1411,56 @@ yyparse () ...@@ -1431,53 +1411,56 @@ yyparse ()
#endif #endif
{ {
int yystate; int yystate;
int yyn;
int yyresult;
/* Number of tokens to shift before error messages enabled. */ /* Number of tokens to shift before error messages enabled. */
int yyerrstatus; int yyerrstatus;
/* Look-ahead token as an internal (translated) token number. */
int yytoken = 0;
#if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */
char yymsgbuf[128];
char *yymsg = yymsgbuf;
YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
#endif
/* Three stacks and their tools: /* The stacks and their tools:
`yyss': related to states, `yyss': related to states.
`yyvs': related to semantic values, `yyvs': related to semantic values.
`yyls': related to locations.
Refer to the stacks thru separate pointers, to allow yyoverflow Refer to the stacks thru separate pointers, to allow yyoverflow
to reallocate them elsewhere. */ to reallocate them elsewhere. */
/* The state stack. */ /* The state stack. */
yytype_int16 yyssa[YYINITDEPTH]; yytype_int16 yyssa[YYINITDEPTH];
yytype_int16 *yyss = yyssa; yytype_int16 *yyss;
yytype_int16 *yyssp; yytype_int16 *yyssp;
/* The semantic value stack. */ /* The semantic value stack. */
YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE yyvsa[YYINITDEPTH];
YYSTYPE *yyvs = yyvsa; YYSTYPE *yyvs;
YYSTYPE *yyvsp; YYSTYPE *yyvsp;
YYSIZE_T yystacksize;
int yyn;
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) int yyresult;
/* Lookahead token as an internal (translated) token number. */
YYSIZE_T yystacksize = YYINITDEPTH; int yytoken;
/* The variables used to return semantic value and location from the /* The variables used to return semantic value and location from the
action routines. */ action routines. */
YYSTYPE yyval; YYSTYPE yyval;
#if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */
char yymsgbuf[128];
char *yymsg = yymsgbuf;
YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
#endif
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
/* The number of symbols on the RHS of the reduced rule. /* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */ Keep to zero when no symbol should be popped. */
int yylen = 0; int yylen = 0;
yytoken = 0;
yyss = yyssa;
yyvs = yyvsa;
yystacksize = YYINITDEPTH;
YYDPRINTF ((stderr, "Starting parse\n")); YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0; yystate = 0;
...@@ -1489,7 +1472,6 @@ yyparse () ...@@ -1489,7 +1472,6 @@ yyparse ()
Waste one element of value and location stack Waste one element of value and location stack
so that they stay on the same level as the state stack. so that they stay on the same level as the state stack.
The wasted elements are never initialized. */ The wasted elements are never initialized. */
yyssp = yyss; yyssp = yyss;
yyvsp = yyvs; yyvsp = yyvs;
...@@ -1519,7 +1501,6 @@ yyparse () ...@@ -1519,7 +1501,6 @@ yyparse ()
YYSTYPE *yyvs1 = yyvs; YYSTYPE *yyvs1 = yyvs;
yytype_int16 *yyss1 = yyss; yytype_int16 *yyss1 = yyss;
/* Each stack pointer address is followed by the size of the /* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might conditional around just the two extra args, but that might
...@@ -1527,7 +1508,6 @@ yyparse () ...@@ -1527,7 +1508,6 @@ yyparse ()
yyoverflow (YY_("memory exhausted"), yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp), &yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp), &yyvs1, yysize * sizeof (*yyvsp),
&yystacksize); &yystacksize);
yyss = yyss1; yyss = yyss1;
...@@ -1550,9 +1530,8 @@ yyparse () ...@@ -1550,9 +1530,8 @@ yyparse ()
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr) if (! yyptr)
goto yyexhaustedlab; goto yyexhaustedlab;
YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyss_alloc, yyss);
YYSTACK_RELOCATE (yyvs); YYSTACK_RELOCATE (yyvs_alloc, yyvs);
# undef YYSTACK_RELOCATE # undef YYSTACK_RELOCATE
if (yyss1 != yyssa) if (yyss1 != yyssa)
YYSTACK_FREE (yyss1); YYSTACK_FREE (yyss1);
...@@ -1563,7 +1542,6 @@ yyparse () ...@@ -1563,7 +1542,6 @@ yyparse ()
yyssp = yyss + yysize - 1; yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1; yyvsp = yyvs + yysize - 1;
YYDPRINTF ((stderr, "Stack size increased to %lu\n", YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize)); (unsigned long int) yystacksize));
...@@ -1573,6 +1551,9 @@ yyparse () ...@@ -1573,6 +1551,9 @@ yyparse ()
YYDPRINTF ((stderr, "Entering state %d\n", yystate)); YYDPRINTF ((stderr, "Entering state %d\n", yystate));
if (yystate == YYFINAL)
YYACCEPT;
goto yybackup; goto yybackup;
/*-----------. /*-----------.
...@@ -1581,16 +1562,16 @@ yyparse () ...@@ -1581,16 +1562,16 @@ yyparse ()
yybackup: yybackup:
/* Do appropriate processing given the current state. Read a /* Do appropriate processing given the current state. Read a
look-ahead token if we need one and don't already have one. */ lookahead token if we need one and don't already have one. */
/* First try to decide what to do without reference to look-ahead token. */ /* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate]; yyn = yypact[yystate];
if (yyn == YYPACT_NINF) if (yyn == YYPACT_NINF)
goto yydefault; goto yydefault;
/* Not known => get a look-ahead token if don't already have one. */ /* Not known => get a lookahead token if don't already have one. */
/* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
if (yychar == YYEMPTY) if (yychar == YYEMPTY)
{ {
YYDPRINTF ((stderr, "Reading a token: ")); YYDPRINTF ((stderr, "Reading a token: "));
...@@ -1622,19 +1603,15 @@ yybackup: ...@@ -1622,19 +1603,15 @@ yybackup:
goto yyreduce; goto yyreduce;
} }
if (yyn == YYFINAL)
YYACCEPT;
/* Count tokens shifted since error; after three, turn off error /* Count tokens shifted since error; after three, turn off error
status. */ status. */
if (yyerrstatus) if (yyerrstatus)
yyerrstatus--; yyerrstatus--;
/* Shift the look-ahead token. */ /* Shift the lookahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
/* Discard the shifted token unless it is eof. */ /* Discard the shifted token. */
if (yychar != YYEOF)
yychar = YYEMPTY; yychar = YYEMPTY;
yystate = yyn; yystate = yyn;
...@@ -1675,47 +1652,65 @@ yyreduce: ...@@ -1675,47 +1652,65 @@ yyreduce:
switch (yyn) switch (yyn)
{ {
case 4: case 4:
#line 108 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 109 "scripts/genksyms/parse.y"
{ is_typedef = 0; is_extern = 0; current_name = NULL; decl_spec = NULL; ;} { is_typedef = 0; is_extern = 0; current_name = NULL; decl_spec = NULL; ;}
break; break;
case 5: case 5:
#line 110 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 111 "scripts/genksyms/parse.y"
{ free_list(*(yyvsp[(2) - (2)]), NULL); *(yyvsp[(2) - (2)]) = NULL; ;} { free_list(*(yyvsp[(2) - (2)]), NULL); *(yyvsp[(2) - (2)]) = NULL; ;}
break; break;
case 6: case 6:
#line 114 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 115 "scripts/genksyms/parse.y"
{ is_typedef = 1; ;} { is_typedef = 1; ;}
break; break;
case 7: case 7:
#line 115 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 116 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(4) - (4)]); ;} { (yyval) = (yyvsp[(4) - (4)]); ;}
break; break;
case 8: case 8:
#line 116 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 117 "scripts/genksyms/parse.y"
{ is_typedef = 1; ;} { is_typedef = 1; ;}
break; break;
case 9: case 9:
#line 117 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 118 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 14: case 14:
#line 122 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 123 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 15: case 15:
#line 123 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 124 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 16: case 16:
#line 128 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 129 "scripts/genksyms/parse.y"
{ if (current_name) { { if (current_name) {
struct string_list *decl = (*(yyvsp[(3) - (3)]))->next; struct string_list *decl = (*(yyvsp[(3) - (3)]))->next;
(*(yyvsp[(3) - (3)]))->next = NULL; (*(yyvsp[(3) - (3)]))->next = NULL;
...@@ -1729,12 +1724,16 @@ yyreduce: ...@@ -1729,12 +1724,16 @@ yyreduce:
break; break;
case 17: case 17:
#line 141 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 142 "scripts/genksyms/parse.y"
{ (yyval) = NULL; ;} { (yyval) = NULL; ;}
break; break;
case 19: case 19:
#line 147 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 148 "scripts/genksyms/parse.y"
{ struct string_list *decl = *(yyvsp[(1) - (1)]); { struct string_list *decl = *(yyvsp[(1) - (1)]);
*(yyvsp[(1) - (1)]) = NULL; *(yyvsp[(1) - (1)]) = NULL;
add_symbol(current_name, add_symbol(current_name,
...@@ -1745,7 +1744,9 @@ yyreduce: ...@@ -1745,7 +1744,9 @@ yyreduce:
break; break;
case 20: case 20:
#line 155 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 156 "scripts/genksyms/parse.y"
{ struct string_list *decl = *(yyvsp[(3) - (3)]); { struct string_list *decl = *(yyvsp[(3) - (3)]);
*(yyvsp[(3) - (3)]) = NULL; *(yyvsp[(3) - (3)]) = NULL;
free_list(*(yyvsp[(2) - (3)]), NULL); free_list(*(yyvsp[(2) - (3)]), NULL);
...@@ -1758,27 +1759,37 @@ yyreduce: ...@@ -1758,27 +1759,37 @@ yyreduce:
break; break;
case 21: case 21:
#line 168 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 169 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(4) - (4)]) ? (yyvsp[(4) - (4)]) : (yyvsp[(3) - (4)]) ? (yyvsp[(3) - (4)]) : (yyvsp[(2) - (4)]) ? (yyvsp[(2) - (4)]) : (yyvsp[(1) - (4)]); ;} { (yyval) = (yyvsp[(4) - (4)]) ? (yyvsp[(4) - (4)]) : (yyvsp[(3) - (4)]) ? (yyvsp[(3) - (4)]) : (yyvsp[(2) - (4)]) ? (yyvsp[(2) - (4)]) : (yyvsp[(1) - (4)]); ;}
break; break;
case 22: case 22:
#line 173 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 174 "scripts/genksyms/parse.y"
{ decl_spec = NULL; ;} { decl_spec = NULL; ;}
break; break;
case 24: case 24:
#line 178 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 179 "scripts/genksyms/parse.y"
{ decl_spec = *(yyvsp[(1) - (1)]); ;} { decl_spec = *(yyvsp[(1) - (1)]); ;}
break; break;
case 25: case 25:
#line 179 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 180 "scripts/genksyms/parse.y"
{ decl_spec = *(yyvsp[(2) - (2)]); ;} { decl_spec = *(yyvsp[(2) - (2)]); ;}
break; break;
case 26: case 26:
#line 184 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 185 "scripts/genksyms/parse.y"
{ /* Version 2 checksumming ignores storage class, as that { /* Version 2 checksumming ignores storage class, as that
is really irrelevant to the linkage. */ is really irrelevant to the linkage. */
remove_node((yyvsp[(1) - (1)])); remove_node((yyvsp[(1) - (1)]));
...@@ -1787,32 +1798,44 @@ yyreduce: ...@@ -1787,32 +1798,44 @@ yyreduce:
break; break;
case 31: case 31:
#line 196 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 197 "scripts/genksyms/parse.y"
{ is_extern = 1; (yyval) = (yyvsp[(1) - (1)]); ;} { is_extern = 1; (yyval) = (yyvsp[(1) - (1)]); ;}
break; break;
case 32: case 32:
#line 197 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 198 "scripts/genksyms/parse.y"
{ is_extern = 0; (yyval) = (yyvsp[(1) - (1)]); ;} { is_extern = 0; (yyval) = (yyvsp[(1) - (1)]); ;}
break; break;
case 37: case 37:
#line 209 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 210 "scripts/genksyms/parse.y"
{ remove_node((yyvsp[(1) - (2)])); (*(yyvsp[(2) - (2)]))->tag = SYM_STRUCT; (yyval) = (yyvsp[(2) - (2)]); ;} { remove_node((yyvsp[(1) - (2)])); (*(yyvsp[(2) - (2)]))->tag = SYM_STRUCT; (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 38: case 38:
#line 211 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 212 "scripts/genksyms/parse.y"
{ remove_node((yyvsp[(1) - (2)])); (*(yyvsp[(2) - (2)]))->tag = SYM_UNION; (yyval) = (yyvsp[(2) - (2)]); ;} { remove_node((yyvsp[(1) - (2)])); (*(yyvsp[(2) - (2)]))->tag = SYM_UNION; (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 39: case 39:
#line 213 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 214 "scripts/genksyms/parse.y"
{ remove_node((yyvsp[(1) - (2)])); (*(yyvsp[(2) - (2)]))->tag = SYM_ENUM; (yyval) = (yyvsp[(2) - (2)]); ;} { remove_node((yyvsp[(1) - (2)])); (*(yyvsp[(2) - (2)]))->tag = SYM_ENUM; (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 40: case 40:
#line 217 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 218 "scripts/genksyms/parse.y"
{ struct string_list *s = *(yyvsp[(3) - (3)]), *i = *(yyvsp[(2) - (3)]), *r; { struct string_list *s = *(yyvsp[(3) - (3)]), *i = *(yyvsp[(2) - (3)]), *r;
r = copy_node(i); r->tag = SYM_STRUCT; r = copy_node(i); r->tag = SYM_STRUCT;
r->next = (*(yyvsp[(1) - (3)]))->next; *(yyvsp[(3) - (3)]) = r; (*(yyvsp[(1) - (3)]))->next = NULL; r->next = (*(yyvsp[(1) - (3)]))->next; *(yyvsp[(3) - (3)]) = r; (*(yyvsp[(1) - (3)]))->next = NULL;
...@@ -1822,7 +1845,9 @@ yyreduce: ...@@ -1822,7 +1845,9 @@ yyreduce:
break; break;
case 41: case 41:
#line 224 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 225 "scripts/genksyms/parse.y"
{ struct string_list *s = *(yyvsp[(3) - (3)]), *i = *(yyvsp[(2) - (3)]), *r; { struct string_list *s = *(yyvsp[(3) - (3)]), *i = *(yyvsp[(2) - (3)]), *r;
r = copy_node(i); r->tag = SYM_UNION; r = copy_node(i); r->tag = SYM_UNION;
r->next = (*(yyvsp[(1) - (3)]))->next; *(yyvsp[(3) - (3)]) = r; (*(yyvsp[(1) - (3)]))->next = NULL; r->next = (*(yyvsp[(1) - (3)]))->next; *(yyvsp[(3) - (3)]) = r; (*(yyvsp[(1) - (3)]))->next = NULL;
...@@ -1832,7 +1857,9 @@ yyreduce: ...@@ -1832,7 +1857,9 @@ yyreduce:
break; break;
case 42: case 42:
#line 231 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 232 "scripts/genksyms/parse.y"
{ struct string_list *s = *(yyvsp[(3) - (3)]), *i = *(yyvsp[(2) - (3)]), *r; { struct string_list *s = *(yyvsp[(3) - (3)]), *i = *(yyvsp[(2) - (3)]), *r;
r = copy_node(i); r->tag = SYM_ENUM; r = copy_node(i); r->tag = SYM_ENUM;
r->next = (*(yyvsp[(1) - (3)]))->next; *(yyvsp[(3) - (3)]) = r; (*(yyvsp[(1) - (3)]))->next = NULL; r->next = (*(yyvsp[(1) - (3)]))->next; *(yyvsp[(3) - (3)]) = r; (*(yyvsp[(1) - (3)]))->next = NULL;
...@@ -1842,42 +1869,58 @@ yyreduce: ...@@ -1842,42 +1869,58 @@ yyreduce:
break; break;
case 43: case 43:
#line 239 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} /* Line 1455 of yacc.c */
#line 242 "scripts/genksyms/parse.y"
{ add_symbol(NULL, SYM_ENUM, NULL, 0); (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 44: case 44:
#line 240 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 244 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 45: case 45:
#line 241 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 245 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 56: case 56:
#line 255 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 259 "scripts/genksyms/parse.y"
{ (*(yyvsp[(1) - (1)]))->tag = SYM_TYPEDEF; (yyval) = (yyvsp[(1) - (1)]); ;} { (*(yyvsp[(1) - (1)]))->tag = SYM_TYPEDEF; (yyval) = (yyvsp[(1) - (1)]); ;}
break; break;
case 57: case 57:
#line 260 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 264 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); ;}
break; break;
case 58: case 58:
#line 264 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 268 "scripts/genksyms/parse.y"
{ (yyval) = NULL; ;} { (yyval) = NULL; ;}
break; break;
case 61: case 61:
#line 270 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 274 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 65: case 65:
#line 276 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 280 "scripts/genksyms/parse.y"
{ /* restrict has no effect in prototypes so ignore it */ { /* restrict has no effect in prototypes so ignore it */
remove_node((yyvsp[(1) - (1)])); remove_node((yyvsp[(1) - (1)]));
(yyval) = (yyvsp[(1) - (1)]); (yyval) = (yyvsp[(1) - (1)]);
...@@ -1885,12 +1928,16 @@ yyreduce: ...@@ -1885,12 +1928,16 @@ yyreduce:
break; break;
case 66: case 66:
#line 283 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 287 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 68: case 68:
#line 289 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 293 "scripts/genksyms/parse.y"
{ if (current_name != NULL) { { if (current_name != NULL) {
error_with_pos("unexpected second declaration name"); error_with_pos("unexpected second declaration name");
YYERROR; YYERROR;
...@@ -1902,97 +1949,135 @@ yyreduce: ...@@ -1902,97 +1949,135 @@ yyreduce:
break; break;
case 69: case 69:
#line 298 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 302 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(4) - (4)]); ;} { (yyval) = (yyvsp[(4) - (4)]); ;}
break; break;
case 70: case 70:
#line 300 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 304 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(4) - (4)]); ;} { (yyval) = (yyvsp[(4) - (4)]); ;}
break; break;
case 71: case 71:
#line 302 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 306 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 72: case 72:
#line 304 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 308 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 73: case 73:
#line 306 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 310 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 74: case 74:
#line 312 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 316 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 78: case 78:
#line 320 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 324 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(4) - (4)]); ;} { (yyval) = (yyvsp[(4) - (4)]); ;}
break; break;
case 79: case 79:
#line 322 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 326 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(4) - (4)]); ;} { (yyval) = (yyvsp[(4) - (4)]); ;}
break; break;
case 80: case 80:
#line 324 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 328 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 81: case 81:
#line 326 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 330 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 82: case 82:
#line 328 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 332 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 83: case 83:
#line 332 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 336 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 85: case 85:
#line 334 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 338 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 86: case 86:
#line 338 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 342 "scripts/genksyms/parse.y"
{ (yyval) = NULL; ;} { (yyval) = NULL; ;}
break; break;
case 89: case 89:
#line 345 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 349 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 90: case 90:
#line 350 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 354 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); ;}
break; break;
case 91: case 91:
#line 355 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 359 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); ;}
break; break;
case 93: case 93:
#line 360 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 364 "scripts/genksyms/parse.y"
{ (yyval) = NULL; ;} { (yyval) = NULL; ;}
break; break;
case 94: case 94:
#line 362 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 366 "scripts/genksyms/parse.y"
{ /* For version 2 checksums, we don't want to remember { /* For version 2 checksums, we don't want to remember
private parameter names. */ private parameter names. */
remove_node((yyvsp[(1) - (1)])); remove_node((yyvsp[(1) - (1)]));
...@@ -2001,39 +2086,53 @@ yyreduce: ...@@ -2001,39 +2086,53 @@ yyreduce:
break; break;
case 95: case 95:
#line 370 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 374 "scripts/genksyms/parse.y"
{ remove_node((yyvsp[(1) - (1)])); { remove_node((yyvsp[(1) - (1)]));
(yyval) = (yyvsp[(1) - (1)]); (yyval) = (yyvsp[(1) - (1)]);
;} ;}
break; break;
case 96: case 96:
#line 374 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 378 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(4) - (4)]); ;} { (yyval) = (yyvsp[(4) - (4)]); ;}
break; break;
case 97: case 97:
#line 376 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 380 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(4) - (4)]); ;} { (yyval) = (yyvsp[(4) - (4)]); ;}
break; break;
case 98: case 98:
#line 378 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 382 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 99: case 99:
#line 380 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 384 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 100: case 100:
#line 382 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 386 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 101: case 101:
#line 387 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 391 "scripts/genksyms/parse.y"
{ struct string_list *decl = *(yyvsp[(2) - (3)]); { struct string_list *decl = *(yyvsp[(2) - (3)]);
*(yyvsp[(2) - (3)]) = NULL; *(yyvsp[(2) - (3)]) = NULL;
add_symbol(current_name, SYM_NORMAL, decl, is_extern); add_symbol(current_name, SYM_NORMAL, decl, is_extern);
...@@ -2042,93 +2141,163 @@ yyreduce: ...@@ -2042,93 +2141,163 @@ yyreduce:
break; break;
case 102: case 102:
#line 395 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 399 "scripts/genksyms/parse.y"
{ (yyval) = NULL; ;} { (yyval) = NULL; ;}
break; break;
case 104: case 104:
#line 402 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 406 "scripts/genksyms/parse.y"
{ remove_list((yyvsp[(2) - (2)]), &(*(yyvsp[(1) - (2)]))->next); (yyval) = (yyvsp[(2) - (2)]); ;} { remove_list((yyvsp[(2) - (2)]), &(*(yyvsp[(1) - (2)]))->next); (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 105: case 105:
#line 406 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 410 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 106: case 106:
#line 407 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 411 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 107: case 107:
#line 411 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 415 "scripts/genksyms/parse.y"
{ (yyval) = NULL; ;} { (yyval) = NULL; ;}
break; break;
case 110: case 110:
#line 417 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 421 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 111: case 111:
#line 422 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 426 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 112: case 112:
#line 424 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 428 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 113: case 113:
#line 428 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 432 "scripts/genksyms/parse.y"
{ (yyval) = NULL; ;} { (yyval) = NULL; ;}
break; break;
case 116: case 116:
#line 434 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 438 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;} { (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 117: case 117:
#line 438 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 442 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); ;}
break; break;
case 118: case 118:
#line 439 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 443 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 120: case 120:
#line 444 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 448 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} { (yyval) = (yyvsp[(2) - (2)]); ;}
break; break;
case 121: case 121:
#line 448 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 452 "scripts/genksyms/parse.y"
{ (yyval) = NULL; ;} { (yyval) = NULL; ;}
break; break;
case 123: case 123:
#line 453 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;} /* Line 1455 of yacc.c */
#line 457 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(3) - (3)]); ;}
break; break;
case 124: case 124:
#line 457 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 458 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(4) - (4)]); ;}
break;
case 127:
/* Line 1455 of yacc.c */
#line 467 "scripts/genksyms/parse.y"
{
const char *name = strdup((*(yyvsp[(1) - (1)]))->string);
add_symbol(name, SYM_ENUM_CONST, NULL, 0);
;}
break;
case 128:
/* Line 1455 of yacc.c */
#line 472 "scripts/genksyms/parse.y"
{
const char *name = strdup((*(yyvsp[(1) - (3)]))->string);
struct string_list *expr = copy_list_range(*(yyvsp[(3) - (3)]), *(yyvsp[(2) - (3)]));
add_symbol(name, SYM_ENUM_CONST, expr, 0);
;}
break;
case 129:
/* Line 1455 of yacc.c */
#line 479 "scripts/genksyms/parse.y"
{ (yyval) = (yyvsp[(2) - (2)]); ;}
break;
case 130:
/* Line 1455 of yacc.c */
#line 483 "scripts/genksyms/parse.y"
{ (yyval) = NULL; ;} { (yyval) = NULL; ;}
break; break;
case 126: case 132:
#line 463 "scripts/genksyms/parse.y"
/* Line 1455 of yacc.c */
#line 489 "scripts/genksyms/parse.y"
{ export_symbol((*(yyvsp[(3) - (5)]))->string); (yyval) = (yyvsp[(5) - (5)]); ;} { export_symbol((*(yyvsp[(3) - (5)]))->string); (yyval) = (yyvsp[(5) - (5)]); ;}
break; break;
/* Line 1267 of yacc.c. */
#line 2132 "scripts/genksyms/parse.c" /* Line 1455 of yacc.c */
#line 2301 "scripts/genksyms/parse.c"
default: break; default: break;
} }
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
...@@ -2139,7 +2308,6 @@ yyreduce: ...@@ -2139,7 +2308,6 @@ yyreduce:
*++yyvsp = yyval; *++yyvsp = yyval;
/* Now `shift' the result of the reduction. Determine what state /* Now `shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule that goes to, based on the state we popped back to and the rule
number reduced by. */ number reduced by. */
...@@ -2204,7 +2372,7 @@ yyerrlab: ...@@ -2204,7 +2372,7 @@ yyerrlab:
if (yyerrstatus == 3) if (yyerrstatus == 3)
{ {
/* If just tried and failed to reuse look-ahead token after an /* If just tried and failed to reuse lookahead token after an
error, discard it. */ error, discard it. */
if (yychar <= YYEOF) if (yychar <= YYEOF)
...@@ -2221,7 +2389,7 @@ yyerrlab: ...@@ -2221,7 +2389,7 @@ yyerrlab:
} }
} }
/* Else will try to reuse look-ahead token after shifting the error /* Else will try to reuse lookahead token after shifting the error
token. */ token. */
goto yyerrlab1; goto yyerrlab1;
...@@ -2278,9 +2446,6 @@ yyerrlab1: ...@@ -2278,9 +2446,6 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp); YY_STACK_PRINT (yyss, yyssp);
} }
if (yyn == YYFINAL)
YYACCEPT;
*++yyvsp = yylval; *++yyvsp = yylval;
...@@ -2305,7 +2470,7 @@ yyabortlab: ...@@ -2305,7 +2470,7 @@ yyabortlab:
yyresult = 1; yyresult = 1;
goto yyreturn; goto yyreturn;
#ifndef yyoverflow #if !defined(yyoverflow) || YYERROR_VERBOSE
/*-------------------------------------------------. /*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. | | yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/ `-------------------------------------------------*/
...@@ -2316,7 +2481,7 @@ yyexhaustedlab: ...@@ -2316,7 +2481,7 @@ yyexhaustedlab:
#endif #endif
yyreturn: yyreturn:
if (yychar != YYEOF && yychar != YYEMPTY) if (yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead", yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval); yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered /* Do not reclaim the symbols of the rule which action triggered
...@@ -2342,7 +2507,9 @@ yyreturn: ...@@ -2342,7 +2507,9 @@ yyreturn:
} }
#line 467 "scripts/genksyms/parse.y"
/* Line 1675 of yacc.c */
#line 493 "scripts/genksyms/parse.y"
static void static void
......
scripts/genksyms/parse.h_shipped
View file @ a88bab9a
/* A Bison parser, made by GNU Bison 2.3. */
/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton interface for Bison's Yacc-like parsers in C /* Skeleton interface for Bison's Yacc-like parsers in C
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc. Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option) the Free Software Foundation, either version 3 of the License, or
any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
...@@ -16,9 +17,7 @@ ...@@ -16,9 +17,7 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program. If not, see <http://www.gnu.org/licenses/>. */
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains /* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work part or all of the Bison parser skeleton and distribute that work
...@@ -33,6 +32,7 @@ ...@@ -33,6 +32,7 @@
This special exception was added by the Free Software Foundation in This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */ version 2.2 of Bison. */
/* Tokens. */ /* Tokens. */
#ifndef YYTOKENTYPE #ifndef YYTOKENTYPE
# define YYTOKENTYPE # define YYTOKENTYPE
...@@ -82,58 +82,16 @@ ...@@ -82,58 +82,16 @@
FILENAME = 298 FILENAME = 298
}; };
#endif #endif
/* Tokens. */
#define ASM_KEYW 258
#define ATTRIBUTE_KEYW 259
#define AUTO_KEYW 260
#define BOOL_KEYW 261
#define CHAR_KEYW 262
#define CONST_KEYW 263
#define DOUBLE_KEYW 264
#define ENUM_KEYW 265
#define EXTERN_KEYW 266
#define EXTENSION_KEYW 267
#define FLOAT_KEYW 268
#define INLINE_KEYW 269
#define INT_KEYW 270
#define LONG_KEYW 271
#define REGISTER_KEYW 272
#define RESTRICT_KEYW 273
#define SHORT_KEYW 274
#define SIGNED_KEYW 275
#define STATIC_KEYW 276
#define STRUCT_KEYW 277
#define TYPEDEF_KEYW 278
#define UNION_KEYW 279
#define UNSIGNED_KEYW 280
#define VOID_KEYW 281
#define VOLATILE_KEYW 282
#define TYPEOF_KEYW 283
#define EXPORT_SYMBOL_KEYW 284
#define ASM_PHRASE 285
#define ATTRIBUTE_PHRASE 286
#define BRACE_PHRASE 287
#define BRACKET_PHRASE 288
#define EXPRESSION_PHRASE 289
#define CHAR 290
#define DOTS 291
#define IDENT 292
#define INT 293
#define REAL 294
#define STRING 295
#define TYPE 296
#define OTHER 297
#define FILENAME 298
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE; typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif #endif
extern YYSTYPE yylval; extern YYSTYPE yylval;
scripts/genksyms/parse.y
View file @ a88bab9a
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
...@@ -227,16 +228,19 @@ type_specifier: ...@@ -227,16 +228,19 @@ type_specifier:
add_symbol(i->string, SYM_UNION, s, is_extern); add_symbol(i->string, SYM_UNION, s, is_extern);
$$ = $3; $$ = $3;
} }
| ENUM_KEYW IDENT BRACE_PHRASE | ENUM_KEYW IDENT enum_body
{ struct string_list *s = *$3, *i = *$2, *r; { struct string_list *s = *$3, *i = *$2, *r;
r = copy_node(i); r->tag = SYM_ENUM; r = copy_node(i); r->tag = SYM_ENUM;
r->next = (*$1)->next; *$3 = r; (*$1)->next = NULL; r->next = (*$1)->next; *$3 = r; (*$1)->next = NULL;
add_symbol(i->string, SYM_ENUM, s, is_extern); add_symbol(i->string, SYM_ENUM, s, is_extern);
$$ = $3; $$ = $3;
} }
/*
/* Anonymous s/u/e definitions. Nothing needs doing. */ * Anonymous enum definition. Tell add_symbol() to restart its counter.
| ENUM_KEYW BRACE_PHRASE { $$ = $2; } */
| ENUM_KEYW enum_body
{ add_symbol(NULL, SYM_ENUM, NULL, 0); $$ = $2; }
/* Anonymous s/u definitions. Nothing needs doing. */
| STRUCT_KEYW class_body { $$ = $2; } | STRUCT_KEYW class_body { $$ = $2; }
| UNION_KEYW class_body { $$ = $2; } | UNION_KEYW class_body { $$ = $2; }
; ;
...@@ -449,6 +453,28 @@ attribute_opt: ...@@ -449,6 +453,28 @@ attribute_opt:
| attribute_opt ATTRIBUTE_PHRASE | attribute_opt ATTRIBUTE_PHRASE
; ;
enum_body:
'{' enumerator_list '}' { $$ = $3; }
| '{' enumerator_list ',' '}' { $$ = $4; }
;
enumerator_list:
enumerator
| enumerator_list ',' enumerator
enumerator:
IDENT
{
const char *name = strdup((*$1)->string);
add_symbol(name, SYM_ENUM_CONST, NULL, 0);
}
| IDENT '=' EXPRESSION_PHRASE
{
const char *name = strdup((*$1)->string);
struct string_list *expr = copy_list_range(*$3, *$2);
add_symbol(name, SYM_ENUM_CONST, expr, 0);
}
asm_definition: asm_definition:
ASM_PHRASE ';' { $$ = $2; } ASM_PHRASE ';' { $$ = $2; }
; ;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7