qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-01 05:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix self-referenced enum declarations

Browse source 
eg:
typedef enum foo {
    bar = 1,
    baz = bar,
} foo;
This commit is contained in:
Bill Currie 2020-02-19 01:28:09 +09:00
parent ad175d054b
commit e658c0d5cd
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/source/qc-parse.y
View file

@ -553,6 +553,7 @@ optional_enum_list
enum_list enum_list
: '{' enum_init enumerator_list optional_comma '}' : '{' enum_init enumerator_list optional_comma '}'
{ {
current_symtab = current_symtab->parent;
$$ = finish_enum ($3); $$ = finish_enum ($3);
} }
; ;
@ -562,6 +563,7 @@ enum_init
{ {
$$ = find_enum ($<symbol>-1); $$ = find_enum ($<symbol>-1);
start_enum ($$); start_enum ($$);
current_symtab = $$->type->t.symtab;
} }
; ;

1
tools/qfcc/source/struct.c
View file

@ -201,6 +201,7 @@ add_enum (symbol_t *enm, symbol_t *name, expr_t *val)
if (enum_tab->symbols) if (enum_tab->symbols)
value = ((symbol_t *)(enum_tab->symtail))->s.value->v.integer_val + 1; value = ((symbol_t *)(enum_tab->symtail))->s.value->v.integer_val + 1;
if (val) { if (val) {
convert_name (val);
if (!is_constant (val)) if (!is_constant (val))
error (val, "non-constant initializer"); error (val, "non-constant initializer");
else if (!is_integer_val (val)) else if (!is_integer_val (val))