qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement automatic array sizing from initializer

Browse source
This commit is contained in:
Bill Currie 2019-06-09 23:11:38 +09:00
parent 00f12263ca
commit 28a2b96800
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/qfcc/source/def.c
View file

@ -483,6 +483,16 @@ init_field_def (def_t *def, expr_t *init, storage_class_t storage)
}
}
static int
num_elements (expr_t *e)
{
int count = 0;
for (e = e->e.block.head; e; e = e->next) {
count++;
}
return count;
}
void
initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
storage_class_t storage)
@ -520,6 +530,11 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
sym->s.def = 0;
}
if (!sym->s.def) {
if (is_array (sym->type) && !type_size (sym->type)
&& init->type == ex_block && !init->e.block.result) {
sym->type = array_type (sym->type->t.array.type,
num_elements (init));
}
sym->s.def = new_def (sym->name, sym->type, space, storage);
reloc_attach_relocs (relocs, &sym->s.def->relocs);
}

4
tools/qfcc/test/structarray.r
View file

@ -7,7 +7,7 @@ typedef struct {
int ofs[];
} valstruct_t;
int foo[5] = {1, 2, 3, 4, 5};
int foo[] = {1, 2, 3, 4, 5};
valstruct_t *vs;
int dst;
@ -19,5 +19,5 @@ main ()
dst = vs.ofs[i];
}
printf("dst = %d\n", dst);
return dst != 4;
return sizeof(foo) != 5 || dst != 4;
}