zdoom/acc
0
0
Fork 0
mirror of https://github.com/ZDoom/acc.git synced 2025-02-11 22:37:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/acc

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-21 17:09:32 +01:00
commit d5442ef4e6
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
parse.c
View file

@ -2103,6 +2103,10 @@ static void ProcessScriptFunc(symbolNode_t *sym, boolean discardReturn)
int argCount;
MS_Message(MSG_DEBUG, "---- ProcessScriptFunc ----\n");
if(sym->info.scriptFunc.predefined == YES && discardReturn == NO)
{
sym->info.scriptFunc.hasReturnValue = YES;
}
argCount = sym->info.scriptFunc.argCount;
TK_NextTokenMustBe(TK_LPAREN, ERR_MISSING_LPAREN);
i = 0;
@ -3694,7 +3698,8 @@ static void ExprFactor(void)
ProcessInternFunc(sym);
break;
case SY_SCRIPTFUNC:
if(sym->info.scriptFunc.hasReturnValue == NO)
if(sym->info.scriptFunc.predefined == NO
&& sym->info.scriptFunc.hasReturnValue == NO)
{
ERR_Error(ERR_EXPR_FUNC_NO_RET_VAL, YES);
}