Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00
Code Activity

var-return support for const eval methods

Browse source
This commit is contained in:
Brian Fiete 2020-12-30 13:24:13 -08:00
parent 585e2575e8
commit 706fe9e04b
15 changed files with 292 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

22
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -3787,9 +3787,9 @@ void BfModule::Visit(BfThrowStatement* throwStmt)
Fail("Exceptions are not supported", throwStmt->mThrowToken);
if (mCurMethodInstance->mReturnType->IsVoid())
EmitReturn(BfIRValue());
EmitReturn(BfTypedValue());
else
EmitReturn(GetDefaultValue(mCurMethodInstance->mReturnType));
EmitReturn(GetDefaultTypedValue(mCurMethodInstance->mReturnType));
}
void BfModule::Visit(BfDeleteStatement* deleteStmt)
@ -4927,7 +4927,7 @@ void BfModule::Visit(BfReturnStatement* returnStmt)
MarkScopeLeft(&mCurMethodState->mHeadScope);
if (retType->IsVoid())
{
EmitReturn(BfIRValue());
EmitReturn(BfTypedValue());
return;
}
@ -4937,11 +4937,13 @@ void BfModule::Visit(BfReturnStatement* returnStmt)
return;
}
EmitReturn(GetDefaultValue(retType));
EmitReturn(GetDefaultTypedValue(retType));
return;
}
BfType* expectingReturnType = retType;
if ((expectingReturnType != NULL) && (expectingReturnType->IsVar()))
expectingReturnType = NULL;
BfType* origType;
BfExprEvaluator exprEvaluator(this);
@ -4964,21 +4966,21 @@ void BfModule::Visit(BfReturnStatement* returnStmt)
}
else
{
EmitReturn(BfIRValue());
EmitReturn(BfTypedValue());
return;
}
}
if (retValue.mType->IsVar())
{
EmitReturn(BfIRValue());
EmitReturn(BfTypedValue());
}
else if (retValue.mType->IsVoid())
{
if (retType->IsVoid())
{
Warn(0, "Returning void value", returnStmt->mReturnToken);
EmitReturn(BfIRValue());
EmitReturn(BfTypedValue());
}
}
else
@ -4987,7 +4989,7 @@ void BfModule::Visit(BfReturnStatement* returnStmt)
{
expectingReturnType = NULL;
Fail("Attempting to return value from void method", returnStmt->mExpression);
EmitReturn(BfIRValue());
EmitReturn(BfTypedValue());
return;
}
@ -4997,9 +4999,9 @@ void BfModule::Visit(BfReturnStatement* returnStmt)
}
if (!alreadyWritten)
EmitReturn(LoadOrAggregateValue(retValue).mValue);
EmitReturn(LoadOrAggregateValue(retValue));
else
EmitReturn(BfIRValue());
EmitReturn(BfTypedValue());
}
}