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

fix a param scoping error

Browse source
This commit is contained in:
Bill Currie 2002-01-17 16:59:00 +00:00
parent 31a98f0f80
commit 08c1d57c53
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,7 @@ static const char rcsid[] =
#include "struct.h" #include "struct.h"
#include "switch.h" #include "switch.h"
#include "type.h"
#define YYDEBUG 1 #define YYDEBUG 1
#define YYERROR_VERBOSE 1 #define YYERROR_VERBOSE 1
@ -70,7 +71,6 @@ void free_local_inits (hashtab_t *def_list);
typedef struct { typedef struct {
type_t *type; type_t *type;
def_t *scope; def_t *scope;
def_t *pscope;
} scope_t; } scope_t;
%} %}
@ -131,7 +131,6 @@ typedef struct {
type_t *current_type; type_t *current_type;
def_t *current_def; def_t *current_def;
def_t param_scope;
function_t *current_func; function_t *current_func;
expr_t *local_expr; expr_t *local_expr;
expr_t *break_label; expr_t *break_label;
@ -197,17 +196,15 @@ func_parms
{ {
$<scope>$.scope = pr_scope; $<scope>$.scope = pr_scope;
$<scope>$.type = current_type; $<scope>$.type = current_type;
$<scope>$.pscope = param_scope.scope_next;
param_scope.scope_next = 0; pr_scope = PR_NewDef (0, 0, 0);
param_scope.alloc = &param_scope.locals; pr_scope->alloc = &pr_scope->locals;
*param_scope.alloc = 0; *pr_scope->alloc = 0;
pr_scope = &param_scope;
} }
param_list param_list
{ {
PR_FlushScope (&param_scope, 1); PR_FlushScope (pr_scope, 1);
current_type = $<scope>2.type; current_type = $<scope>2.type;
param_scope.scope_next = $<scope>2.pscope;
pr_scope = $<scope>2.scope; pr_scope = $<scope>2.scope;
} }
')' ')'
@ -797,6 +794,7 @@ parse_params (def_t *parms)
parms = parms->next; parms = parms->next;
} while (parms); } while (parms);
} }
//print_type (&new); puts("");
return PR_FindType (&new); return PR_FindType (&new);
} }