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

[qfcc] Skip scope creation for function bodies

Browse source 
Since begin_function creates the parameter and locals scopes, there's no
need for another scope for the function body. This fixes the detection
of shadowed parameters for Ruamoko and QuakeC.
This commit is contained in:
Bill Currie 2024-10-07 09:55:21 +09:00
parent 3c7bd275f3
commit dc878dbb4c
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -216,7 +216,7 @@ int yylex (YYSTYPE *yylval, YYLTYPE *yylloc);
%type <expr> method_optional_state_expr optional_state_expr %type <expr> method_optional_state_expr optional_state_expr
%type <expr> texpr vector_expr %type <expr> texpr vector_expr
%type <expr> statement %type <expr> statement
%type <mut_expr> statements compound_statement %type <mut_expr> statements compound_statement compound_statement_ns
%type <expr> else bool_label break_label continue_label %type <expr> else bool_label break_label continue_label
%type <expr> unary_expr ident_expr cast_expr %type <expr> unary_expr ident_expr cast_expr
%type <mut_expr> arg_list %type <mut_expr> arg_list
@ -852,7 +852,7 @@ qc_code_func
current_storage = sc_local; current_storage = sc_local;
$1 = sym; $1 = sym;
} }
compound_statement compound_statement_ns
{ {
build_code_function ($1, $3, $6); build_code_function ($1, $3, $6);
current_symtab = $<funcstate>5.symtab; current_symtab = $<funcstate>5.symtab;
@ -1164,7 +1164,7 @@ function_body
current_symtab = current_func->locals; current_symtab = current_func->locals;
current_storage = sc_local; current_storage = sc_local;
} }
compound_statement compound_statement_ns
{ {
build_code_function ($<symbol>2, $1, $5); build_code_function ($<symbol>2, $1, $5);
current_symtab = $<funcstate>4.symtab; current_symtab = $<funcstate>4.symtab;
@ -1787,6 +1787,10 @@ compound_statement
: '{' push_scope flush_dag statements '}' pop_scope flush_dag { $$ = $4; } : '{' push_scope flush_dag statements '}' pop_scope flush_dag { $$ = $4; }
; ;
compound_statement_ns
: '{' flush_dag statements '}' flush_dag { $$ = $3; }
;
statements statements
: /*empty*/ : /*empty*/
{ {
@ -2536,7 +2540,7 @@ methoddef
current_symtab = current_func->locals; current_symtab = current_func->locals;
current_storage = sc_local; current_storage = sc_local;
} }
compound_statement compound_statement_ns
{ {
build_code_function ($<symbol>4, $3, $7); build_code_function ($<symbol>4, $3, $7);
current_symtab = $<funcstate>6.symtab; current_symtab = $<funcstate>6.symtab;