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

Make parse_btype only accept one basic type

Browse source 
This makes int char c; and struct {} int c; generate an error. Thanks
Mobi Phil for reporting.
This commit is contained in:
Thomas Preud'homme 2014-03-24 23:28:56 +08:00
parent ec1c83081d
commit b68499e971
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tccgen.c
View file

@ -2988,19 +2988,25 @@ static void struct_decl(CType *type, int u, int tdef)
} }
} }
/* return 1 if basic type is a type size (short, long, long long) */
int is_btype_size (int bt)
{
return bt == VT_SHORT || bt == VT_LONG || bt == VT_LLONG;
}
/* return 0 if no type declaration. otherwise, return the basic type /* return 0 if no type declaration. otherwise, return the basic type
and skip it. and skip it.
*/ */
static int parse_btype(CType *type, AttributeDef *ad) static int parse_btype(CType *type, AttributeDef *ad)
{ {
int t, u, type_found, typespec_found, typedef_found; int t, u, bt_size, complete, type_found, typespec_found;
Sym *s; Sym *s;
CType type1; CType type1;
memset(ad, 0, sizeof(AttributeDef)); memset(ad, 0, sizeof(AttributeDef));
complete = 0;
type_found = 0; type_found = 0;
typespec_found = 0; typespec_found = 0;
typedef_found = 0;
t = 0; t = 0;
while(1) { while(1) {
switch(tok) { switch(tok) {
@ -3015,9 +3021,12 @@ static int parse_btype(CType *type, AttributeDef *ad)
basic_type: basic_type:
next(); next();
basic_type1: basic_type1:
if ((t & VT_BTYPE) != 0) if (complete)
tcc_error("too many basic types"); tcc_error("too many basic types");
t |= u; t |= u;
bt_size = is_btype_size (u & VT_BTYPE);
if (u == VT_INT || (!bt_size && !(t & VT_TYPEDEF)))
complete = 1;
typespec_found = 1; typespec_found = 1;
break; break;
case TOK_VOID: case TOK_VOID:
@ -3027,9 +3036,8 @@ static int parse_btype(CType *type, AttributeDef *ad)
u = VT_SHORT; u = VT_SHORT;
goto basic_type; goto basic_type;
case TOK_INT: case TOK_INT:
next(); u = VT_INT;
typespec_found = 1; goto basic_type;
break;
case TOK_LONG: case TOK_LONG:
next(); next();
if ((t & VT_BTYPE) == VT_DOUBLE) { if ((t & VT_BTYPE) == VT_DOUBLE) {
@ -3149,12 +3157,11 @@ static int parse_btype(CType *type, AttributeDef *ad)
type1.t &= ~(VT_STORAGE&~VT_TYPEDEF); type1.t &= ~(VT_STORAGE&~VT_TYPEDEF);
goto basic_type2; goto basic_type2;
default: default:
if (typespec_found || typedef_found) if (typespec_found)
goto the_end; 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;
typedef_found = 1;
t |= (s->type.t & ~VT_TYPEDEF); t |= (s->type.t & ~VT_TYPEDEF);
type->ref = s->type.ref; type->ref = s->type.ref;
if (s->r) { if (s->r) {