OSO/TinyCC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tccgen: scopes levels for local symbols (update 1)

Browse Source 
Catch top level redeclarations too.

Also fix mistakes in tcctest.c and the tcc sources (win32)
showing up now.
This commit is contained in:
grischka
2016-05-05 20:04:00 +02:00
parent fe845cf53d
commit d48662d496
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tccgen.c
View File

@ -239,11 +239,10 @@ ST_FUNC Sym *sym_push(int v, CType *type, int r, int c)
ps = &ts->sym_identifier;
s->prev_tok = *ps;
*ps = s;
if (local_scope) {
s->scope = local_scope;
if (s->prev_tok && s->prev_tok->scope == s->scope)
tcc_error("redeclaration of '%s'", get_tok_str(v & ~SYM_STRUCT, NULL));
}
s->scope = local_scope;
if (s->prev_tok && s->prev_tok->scope == s->scope)
tcc_error("redeclaration of '%s'",
get_tok_str(v & ~SYM_STRUCT, NULL));
}
return s;
}
@ -2929,6 +2928,8 @@ static void struct_decl(CType *type, AttributeDef *ad, int u)
expect("struct/union/enum name");
s = struct_find(v);
if (s && s->type.t == a) {
if (0 == local_scope)
goto do_decl; /* compatibility with past behavior */
if (tok != '{' && tok != ';')
goto do_decl; /* variable declaration: 'struct s x;' */
if (s->scope == local_scope && (s->c == -1 || tok != '{'))