darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-03-20 09:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking

Browse source
This commit is contained in:
Dale Weiler 2013-05-30 19:36:37 +00:00
commit b0a0769534
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ast.c
View file

@ -1685,8 +1685,13 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir)
}
else if (vec_size(self->curblock->entries) || self->curblock == irf->first)
{
/* error("missing return"); */
if (compile_warning(ast_ctx(self), WARN_MISSING_RETURN_VALUES,
if (self->return_value) {
cgen = self->return_value->expression.codegen;
if (!(*cgen)((ast_expression*)(self->return_value), self, false, &dummy))
return false;
return ir_block_create_return(self->curblock, ast_ctx(self), dummy);
}
else if (compile_warning(ast_ctx(self), WARN_MISSING_RETURN_VALUES,
"control reaches end of non-void function (`%s`) via %s",
self->name, self->curblock->label))
{

2
tests/rassign.qc
View file

@ -25,8 +25,6 @@ string f_string() {
float factorial(float n) {
if (n == 0) return = 1;
else return = n * factorial(n - 1);
return;
}
void main() {