mirrors/tinycc
1
0
Fork 0
mirror of https://github.com/frida/tinycc synced 2024-11-28 02:29:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tidy decl_designator

Browse Source 
Removing the need for the notfirst local variable, and tidy loop structure
and error messaging a bit.
This commit is contained in:
Michael Matz 2017-04-15 20:07:26 +02:00
parent 9839b60177
commit 149678e888
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tccgen.c
View File

@ -5923,69 +5923,58 @@ static void decl_designator(CType *type, Section *sec, unsigned long c,
Sym **cur_field, int size_only) Sym **cur_field, int size_only)
{ {
Sym *s, *f; Sym *s, *f;
int notfirst, index, index_last, align, l, nb_elems, elem_size; int index, index_last, align, l, nb_elems, elem_size;
notfirst = 0;
elem_size = 0; elem_size = 0;
nb_elems = 1; nb_elems = 1;
if (gnu_ext && (l = is_label()) != 0) if (gnu_ext && (l = is_label()) != 0)
goto struct_field; goto struct_field;
while (tok == '[' || tok == '.') { /* NOTE: we only support ranges for last designator */
while (nb_elems == 1 && (tok == '[' || tok == '.')) {
if (tok == '[') { if (tok == '[') {
if (!(type->t & VT_ARRAY)) if (!(type->t & VT_ARRAY))
expect("array type"); expect("array type");
s = type->ref;
next(); next();
index = expr_const(); index = index_last = expr_const();
if (index < 0 || (s->c >= 0 && index >= s->c))
tcc_error("invalid index");
if (tok == TOK_DOTS && gnu_ext) { if (tok == TOK_DOTS && gnu_ext) {
next(); next();
index_last = expr_const(); index_last = expr_const();
if (index_last < 0 ||
(s->c >= 0 && index_last >= s->c) ||
index_last < index)
tcc_error("invalid index");
} else {
index_last = index;
} }
skip(']'); skip(']');
if (!notfirst) { s = type->ref;
if (index < 0 || (s->c >= 0 && index_last >= s->c) ||
index_last < index)
tcc_error("invalid index");
if (cur_field) {
(*cur_field)->c = index; (*cur_field)->c = index;
(*cur_field)->r = index_last; (*cur_field)->r = index_last;
} }
type = pointed_type(type); type = pointed_type(type);
elem_size = type_size(type, &align); elem_size = type_size(type, &align);
c += index * elem_size; c += index * elem_size;
/* NOTE: we only support ranges for last designator */
nb_elems = index_last - index + 1; nb_elems = index_last - index + 1;
if (nb_elems != 1) {
notfirst = 1;
break;
}
} else { } else {
next(); next();
l = tok; l = tok;
next();
struct_field: struct_field:
next();
if ((type->t & VT_BTYPE) != VT_STRUCT) if ((type->t & VT_BTYPE) != VT_STRUCT)
expect("struct/union type"); expect("struct/union type");
f = find_field(type, l); f = find_field(type, l);
if (!f) if (!f)
expect("field"); expect("field");
if (!notfirst) if (cur_field)
*cur_field = f; *cur_field = f;
type = &f->type; type = &f->type;
c += f->c; c += f->c;
} }
notfirst = 1; cur_field = NULL;
} }
if (notfirst) { if (!cur_field) {
if (tok == '=') { if (tok == '=') {
next(); next();
} else { } else if (!gnu_ext) {
if (!gnu_ext) expect("=");
expect("=");
} }
} else { } else {
if (type->t & VT_ARRAY) { if (type->t & VT_ARRAY) {