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] Defer return expressions

Browse source
This commit is contained in:
Bill Currie 2024-10-08 11:46:52 +09:00
parent c3f11ba754
commit 9cd480640d
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/qfcc/source/expr_process.c
View file

@ -210,6 +210,21 @@ proc_branch (const expr_t *expr)
} }
} }
static const expr_t *
proc_return (const expr_t *expr)
{
scoped_src_loc (expr);
auto ret_val = expr->retrn.ret_val;
if (ret_val) {
ret_val = expr_process (ret_val);
}
if (expr->retrn.at_return) {
return at_return_expr (current_func, ret_val);
} else {
return return_expr (current_func, ret_val);
}
}
static const expr_t * static const expr_t *
proc_decl (const expr_t *expr) proc_decl (const expr_t *expr)
{ {
@ -263,6 +278,7 @@ expr_process (const expr_t *expr)
[ex_compound] = proc_compound, [ex_compound] = proc_compound,
[ex_assign] = proc_assign, [ex_assign] = proc_assign,
[ex_branch] = proc_branch, [ex_branch] = proc_branch,
[ex_return] = proc_return,
[ex_decl] = proc_decl, [ex_decl] = proc_decl,
}; };

4
tools/qfcc/source/glsl-parse.y
View file

@ -1275,8 +1275,8 @@ jump_statement
error (nullptr, "continue outside of loop or switch"); error (nullptr, "continue outside of loop or switch");
} }
} }
| RETURN ';' { $$ = return_expr (current_func, nullptr); } | RETURN ';' { $$ = new_return_expr (nullptr); }
| RETURN expression ';' { $$ = return_expr (current_func, $2); } | RETURN expression ';' { $$ = new_return_expr ($2); }
| DISCARD ';' { $$ = nullptr; } //XXX | DISCARD ';' { $$ = nullptr; } //XXX
; ;