qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typedefs and class names once and for all. 

I suspect Holub did them that way as a teaching exercise :P
This commit is contained in:
Bill Currie 2011-02-08 08:20:32 +09:00
parent 7e2173f268
commit 35d53d0d77
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tools/qfcc/source/qc-parse.y
View File

@ -154,7 +154,7 @@ int yylex (void);
%type <spec> optional_specifiers specifiers local_specifiers %type <spec> optional_specifiers specifiers local_specifiers
%type <spec> storage_class %type <spec> storage_class
%type <spec> type_specifier type_specifier_or_storage_class %type <spec> type_specifier type_specifier_or_storage_class
%type <spec> type_name_or_class_name type %type <spec> type
%type <param> function_params var_list param_declaration %type <param> function_params var_list param_declaration
%type <symbol> var_decl function_decl %type <symbol> var_decl function_decl
@ -388,30 +388,13 @@ storage_class
; ;
optional_specifiers optional_specifiers
: storage_class type_name_or_class_name : specifiers
{
$$ = make_spec ($2.type, current_storage, 0, 0);
$$ = spec_merge ($1, $$);
}
| type_name_or_class_name
| specifiers
| /* empty */ | /* empty */
{ {
$$ = make_spec (0, current_storage, 0, 0); $$ = make_spec (0, current_storage, 0, 0);
} }
; ;
type_name_or_class_name
: TYPE_NAME
{
$$ = make_spec ($1->type, current_storage, 0, 0);
}
| CLASS_NAME
{
$$ = make_spec ($1->type, current_storage, 0, 0);
}
;
specifiers specifiers
: type_specifier_or_storage_class : type_specifier_or_storage_class
| specifiers type_specifier_or_storage_class | specifiers type_specifier_or_storage_class
@ -437,6 +420,14 @@ type_specifier
} }
| enum_specifier | enum_specifier
| struct_specifier | struct_specifier
| TYPE_NAME
{
$$ = make_spec ($1->type, current_storage, 0, 0);
}
| CLASS_NAME
{
$$ = make_spec ($1->type, current_storage, 0, 0);
}
// NOTE: fields don't parse the way they should // NOTE: fields don't parse the way they should
| '.' type_specifier | '.' type_specifier
{ {
@ -541,7 +532,6 @@ struct_defs
struct_def struct_def
: type struct_decl_list : type struct_decl_list
| type_name_or_class_name struct_decl_list
| type | type
; ;
@ -644,11 +634,6 @@ param_declaration
$2->type = find_type (append_type ($2->type, $1.type)); $2->type = find_type (append_type ($2->type, $1.type));
$$ = new_param (0, $2->type, $2->name); $$ = new_param (0, $2->type, $2->name);
} }
| type_name_or_class_name var_decl
{
$2->type = find_type (append_type ($2->type, $1.type));
$$ = new_param (0, $2->type, $2->name);
}
| abstract_decl { $$ = new_param (0, $1->type, 0); } | abstract_decl { $$ = new_param (0, $1->type, 0); }
| ELLIPSIS { $$ = new_param (0, 0, 0); } | ELLIPSIS { $$ = new_param (0, 0, 0); }
; ;
@ -659,11 +644,6 @@ abstract_decl
$$ = $2; $$ = $2;
$$->type = find_type (append_type ($$->type, $1.type)); $$->type = find_type (append_type ($$->type, $1.type));
} }
| type_name_or_class_name abs_decl
{
$$ = $2;
$$->type = find_type (append_type ($$->type, $1.type));
}
; ;
//FIXME type construction is inside-out //FIXME type construction is inside-out
@ -1415,7 +1395,6 @@ ivar_decls
ivar_decl ivar_decl
: type ivars : type ivars
| type_name_or_class_name ivars {}
; ;
ivars ivars