qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-20 18:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Get reused type names working for local variables

Browse source 
This allows the likes of "id id;" or

    typedef int foo; ... { double foo; }

So long as the redeclaration is in a sub-scope.
This commit is contained in:
Bill Currie 2022-02-07 10:40:26 +09:00
parent 748661eb77
commit 246518f487
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools/qfcc/source/qc-parse.y
View file

@ -265,11 +265,16 @@ static specifier_t
spec_merge (specifier_t spec, specifier_t new)
{
if (new.type) {
if (spec.type && !spec.multi_type) {
// deal with "type <type_name>"
if (!spec.type || new.sym) {
spec.sym = new.sym;
if (!spec.type) {
spec.type = new.type;
}
} else if (!spec.multi_type) {
error (0, "two or more data types in declaration specifiers");
spec.multi_type = 1;
}
spec.type = new.type;
}
if (new.is_typedef || new.storage) {
if ((spec.is_typedef || spec.storage) && !spec.multi_store) {
@ -677,15 +682,7 @@ type
: type_specifier
| type type_specifier
{
// deal with eg "int id"
$1.sym = $2.sym;
if (!$1.sym && !$1.type) {
$1 = spec_merge ($1, $2);
} else if (!$1.sym) {
error (0, "two or more data types in declaration specifiers");
}
$$ = $1;
$$ = spec_merge ($1, $2);
}
;
@ -1410,7 +1407,7 @@ local_def
local_expr = 0;
(void) ($<spec>2);
}
| specifiers ';'
| specifiers opt_initializer ';'
{
check_specifiers ($1);
$$ = 0;