gered/picoc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Problems with "return" fixed.

Browse source 
Issue #50


git-svn-id: http://picoc.googlecode.com/svn/trunk@365 21eae674-98b7-11dd-bd71-f92a316d2d60
This commit is contained in:
zik.saleeba 2009-10-31 17:08:21 +00:00
parent 2493d1ff01
commit c920ea1771
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
parse.c
View file

@ -502,14 +502,19 @@ enum ParseResult ParseStatement(struct ParseState *Parser)
case TokenReturn: case TokenReturn:
if (Parser->Mode == RunModeRun) if (Parser->Mode == RunModeRun)
{ {
if (!ExpressionParse(Parser, &CValue) && TopStackFrame->ReturnValue->Typ->Base != TypeVoid)
ProgramFail(Parser, "value required in return");
if (TopStackFrame->ReturnValue->Typ->Base != TypeVoid) if (TopStackFrame->ReturnValue->Typ->Base != TypeVoid)
{ {
if (!ExpressionParse(Parser, &CValue))
ProgramFail(Parser, "value required in return");
ExpressionAssign(Parser, TopStackFrame->ReturnValue, CValue, TRUE, NULL, 0, FALSE); ExpressionAssign(Parser, TopStackFrame->ReturnValue, CValue, TRUE, NULL, 0, FALSE);
VariableStackPop(Parser, CValue); VariableStackPop(Parser, CValue);
} }
else
{
if (ExpressionParse(Parser, &CValue))
ProgramFail(Parser, "value in return from a void function");
}
Parser->Mode = RunModeReturn; Parser->Mode = RunModeReturn;
} }