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

Fixed const eval issues with generics

Browse source
This commit is contained in:
Brian Fiete 2021-01-05 05:55:41 -08:00
parent abd883212f
commit 301f9eb1c1
3 changed files with 63 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -5078,12 +5078,10 @@ BfTypedValue BfExprEvaluator::CreateCall(BfAstNode* targetSrc, BfMethodInstance*
if (mModule->mCompiler->mCEMachine != NULL)
{
if ((mModule->mIsConstModule) && (!methodInstance->mReturnType->IsVar()))
{
mModule->mCompiler->mCEMachine->QueueMethod(methodInstance, func);
}
else if ((mBfEvalExprFlags & BfEvalExprFlags_ConstEval) != 0)
{
bool doConstReturn = false;
if ((mBfEvalExprFlags & BfEvalExprFlags_ConstEval) != 0)
{
if (mFunctionBindResult != NULL)
{
forceBind = true;
@ -5091,6 +5089,10 @@ BfTypedValue BfExprEvaluator::CreateCall(BfAstNode* targetSrc, BfMethodInstance*
else if ((mBfEvalExprFlags & BfEvalExprFlags_InCascade) != 0)
{
mModule->Fail("Const evaluation not allowed with cascade operator", targetSrc);
}
else if (methodInstance->mIsUnspecialized)
{
doConstReturn = true;
}
else
{
@ -5101,7 +5103,34 @@ BfTypedValue BfExprEvaluator::CreateCall(BfAstNode* targetSrc, BfMethodInstance*
BF_ASSERT(!constRet.mType->IsVar());
return constRet;
}
}
}
else if (mModule->mIsConstModule)
{
if (methodInstance->mIsUnspecialized)
{
doConstReturn = true;
}
else
{
mModule->mCompiler->mCEMachine->QueueMethod(methodInstance, func);
}
}
if (doConstReturn)
{
if ((returnType->IsVar()) && (mExpectingType != NULL))
returnType = mExpectingType;
if (returnType->IsRef())
{
return _GetDefaultReturnValue();
}
else
{
return mModule->GetDefaultTypedValue(returnType, true, BfDefaultValueKind_Undef);
}
return _GetDefaultReturnValue();
}
}