diff --git a/tools/qfcc/source/pr_def.c b/tools/qfcc/source/pr_def.c index 267403148..afdf004d4 100644 --- a/tools/qfcc/source/pr_def.c +++ b/tools/qfcc/source/pr_def.c @@ -134,10 +134,12 @@ PR_NewDef (type_t *type, const char *name, def_t *scope) def = calloc (1, sizeof (def_t)); +#if 1 if (name) { pr.def_tail->next = def; pr.def_tail = def; } +#endif if (scope) { def->scope_next = scope->scope_next; diff --git a/tools/qfcc/source/pr_lex.c b/tools/qfcc/source/pr_lex.c index d0a60e980..e2004da19 100644 --- a/tools/qfcc/source/pr_lex.c +++ b/tools/qfcc/source/pr_lex.c @@ -782,15 +782,7 @@ PR_FindType (type_t *type) def_t *def; type_t *check; int i; -extern int lineno; - printf("%-5d ", lineno); - PR_PrintType (type); - puts(""); - for (check = pr.types; check; check = check->next) { - PR_PrintType (check); - puts(""); - } - puts(""); + for (check = pr.types; check; check = check->next) { if (check->type != type->type || check->aux_type != type->aux_type diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y index 667fae76a..2e8cb4358 100644 --- a/tools/qfcc/source/qc-parse.y +++ b/tools/qfcc/source/qc-parse.y @@ -126,9 +126,11 @@ def_item def_t scope; scope.scope_next=$4; PR_FlushScope (&scope); + + $$ = $7; } - | '(' ')' { current_type = parse_params (0); } def_name opt_definition {} - | '(' ELIPSIS ')' { current_type = parse_params ((def_t*)1); } def_name opt_definition {} + | '(' ')' { current_type = parse_params (0); } def_name opt_definition { $$ = $4; } + | '(' ELIPSIS ')' { current_type = parse_params ((def_t*)1); } def_name opt_definition { $$ = $5; } ; def_name