d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed structure init without {} - fixed function declaration parse

Browse source
This commit is contained in:
bellard 2002-11-23 23:56:12 +00:00
parent ab9973c843
commit 0841db04c5
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tcc.c
View file

@ -5317,7 +5317,7 @@ void type_to_str(char *buf, int buf_size,
else else
tstr = "enum "; tstr = "enum ";
pstrcat(buf, buf_size, tstr); pstrcat(buf, buf_size, tstr);
v = type->ref->v; v = type->ref->v & ~SYM_STRUCT;
if (v >= SYM_FIRST_ANOM) if (v >= SYM_FIRST_ANOM)
pstrcat(buf, buf_size, "<anonymous>"); pstrcat(buf, buf_size, "<anonymous>");
else else
@ -7428,9 +7428,17 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
/* patch type size if needed */ /* patch type size if needed */
if (n < 0) if (n < 0)
s->c = array_length; s->c = array_length;
} else if ((type->t & VT_BTYPE) == VT_STRUCT && tok == '{') { } else if ((type->t & VT_BTYPE) == VT_STRUCT &&
(sec || !first || tok == '{')) {
/* NOTE: the previous test is a specific case for automatic
struct/union init */
/* XXX: union needs only one init */ /* XXX: union needs only one init */
next(); /* XXX: handle bit fields */
no_oblock = 1;
if (first || tok == '{') {
skip('{');
no_oblock = 0;
}
s = type->ref; s = type->ref;
f = s->next; f = s->next;
array_length = 0; array_length = 0;
@ -7438,6 +7446,7 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
n = s->c; n = s->c;
while (tok != '}') { while (tok != '}') {
decl_designator(type, sec, c, NULL, &f, size_only); decl_designator(type, sec, c, NULL, &f, size_only);
/* XXX: bitfields ? */
/* fill with zero between fields */ /* fill with zero between fields */
index = f->c; index = f->c;
if (!size_only && array_length < index) { if (!size_only && array_length < index) {
@ -7447,6 +7456,8 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
index = index + type_size(&f->type, &align1); index = index + type_size(&f->type, &align1);
if (index > array_length) if (index > array_length)
array_length = index; array_length = index;
if (no_oblock && f->next == NULL)
break;
if (tok == '}') if (tok == '}')
break; break;
skip(','); skip(',');
@ -7457,6 +7468,7 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
init_putz(type, sec, c + array_length, init_putz(type, sec, c + array_length,
n - array_length); n - array_length);
} }
if (!no_oblock)
skip('}'); skip('}');
} else if (tok == '{') { } else if (tok == '{') {
next(); next();
@ -7746,7 +7758,7 @@ static void func_decl_list(Sym *func_sym)
CType btype, type; CType btype, type;
/* parse each declaration */ /* parse each declaration */
while (tok != '{' && tok != ';' && tok != TOK_EOF) { while (tok != '{' && tok != ';' && tok != ',' && tok != TOK_EOF) {
if (!parse_btype(&btype, &ad)) if (!parse_btype(&btype, &ad))
expect("declaration list"); expect("declaration list");
if (((btype.t & VT_BTYPE) == VT_ENUM || if (((btype.t & VT_BTYPE) == VT_ENUM ||