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

fixed typdefed type parsing (Mauro Persano)

Browse source
This commit is contained in:
bellard 2003-07-20 18:44:29 +00:00
parent 7b940fcb1b
commit c5959b77b4
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tcc.c
View file

@ -6204,12 +6204,13 @@ static void struct_decl(CType *type, int u)
*/ */
static int parse_btype(CType *type, AttributeDef *ad) static int parse_btype(CType *type, AttributeDef *ad)
{ {
int t, u, type_found; int t, u, type_found, typespec_found;
Sym *s; Sym *s;
CType type1; CType type1;
memset(ad, 0, sizeof(AttributeDef)); memset(ad, 0, sizeof(AttributeDef));
type_found = 0; type_found = 0;
typespec_found = 0;
t = 0; t = 0;
while(1) { while(1) {
switch(tok) { switch(tok) {
@ -6227,6 +6228,7 @@ static int parse_btype(CType *type, AttributeDef *ad)
if ((t & VT_BTYPE) != 0) if ((t & VT_BTYPE) != 0)
error("too many basic types"); error("too many basic types");
t |= u; t |= u;
typespec_found = 1;
break; break;
case TOK_VOID: case TOK_VOID:
u = VT_VOID; u = VT_VOID;
@ -6236,6 +6238,7 @@ static int parse_btype(CType *type, AttributeDef *ad)
goto basic_type; goto basic_type;
case TOK_INT: case TOK_INT:
next(); next();
typespec_found = 1;
break; break;
case TOK_LONG: case TOK_LONG:
next(); next();
@ -6287,10 +6290,11 @@ static int parse_btype(CType *type, AttributeDef *ad)
t |= VT_VOLATILE; t |= VT_VOLATILE;
next(); next();
break; break;
case TOK_REGISTER:
case TOK_SIGNED1: case TOK_SIGNED1:
case TOK_SIGNED2: case TOK_SIGNED2:
case TOK_SIGNED3: case TOK_SIGNED3:
typespec_found = 1;
case TOK_REGISTER:
case TOK_AUTO: case TOK_AUTO:
case TOK_RESTRICT1: case TOK_RESTRICT1:
case TOK_RESTRICT2: case TOK_RESTRICT2:
@ -6300,6 +6304,7 @@ static int parse_btype(CType *type, AttributeDef *ad)
case TOK_UNSIGNED: case TOK_UNSIGNED:
t |= VT_UNSIGNED; t |= VT_UNSIGNED;
next(); next();
typespec_found = 1;
break; break;
/* storage */ /* storage */
@ -6335,6 +6340,8 @@ static int parse_btype(CType *type, AttributeDef *ad)
parse_expr_type(&type1); parse_expr_type(&type1);
goto basic_type2; goto basic_type2;
default: default:
if (typespec_found)
goto the_end;
s = sym_find(tok); s = sym_find(tok);
if (!s || !(s->type.t & VT_TYPEDEF)) if (!s || !(s->type.t & VT_TYPEDEF))
goto the_end; goto the_end;