qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 00:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Untwist param's knickers.

Browse source
This commit is contained in:
Bill Currie 2011-01-25 20:21:41 +09:00
parent 6ce3c5a59a
commit 4966120e3b
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -175,6 +175,7 @@ int yylex (void);
%type <expr> identifier_list %type <expr> identifier_list
%type <symbol> selector reserved_word %type <symbol> selector reserved_word
%type <symtab> param_scope
%type <param> optparmlist unaryselector keyworddecl keywordselector %type <param> optparmlist unaryselector keyworddecl keywordselector
%type <method> methodproto methoddecl %type <method> methodproto methoddecl
%type <expr> obj_expr obj_messageexpr obj_string receiver %type <expr> obj_expr obj_messageexpr obj_string receiver
@ -458,19 +459,41 @@ enum
; ;
function_decl function_decl
: '(' param_list ')' { $$ = $2; } : param_scope '(' param_list ')'
| '(' param_list ',' ELLIPSIS ')'
{ {
$$ = param_append_identifiers ($2, 0, 0); $$ = $3;
current_symtab = $1;
} }
| '(' ELLIPSIS ')' { $$ = new_param (0, 0, 0); } | param_scope '(' param_list ',' ELLIPSIS ')'
| '(' TYPE ')'
{ {
if ($2 != &type_void) $$ = param_append_identifiers ($3, 0, 0);
current_symtab = $1;
}
| param_scope '(' ELLIPSIS ')'
{
$$ = new_param (0, 0, 0);
current_symtab = $1;
}
| param_scope '(' TYPE ')'
{
if ($3 != &type_void)
PARSE_ERROR; PARSE_ERROR;
$$ = 0; $$ = 0;
current_symtab = $1;
}
| param_scope '(' ')'
{
$$ = 0;
current_symtab = $1;
}
;
param_scope
: /* empty */
{
$$ = current_symtab;
current_symtab = new_symtab (current_symtab, stab_local);
} }
| '(' ')' { $$ = 0; }
; ;
param_list param_list
@ -481,6 +504,7 @@ param_list
param param
: type identifier : type identifier
{ {
$2 = check_redefined ($2);
$$ = param_append_identifiers ($<param>0, $2, $1); $$ = param_append_identifiers ($<param>0, $2, $1);
} }
; ;