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

Fixed error handling of return value of lambda in local

Browse source
This commit is contained in:
Brian Fiete 2020-12-29 17:07:26 -08:00
parent 74098aa9eb
commit 56c250f251
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
IDEHelper/Compiler/BfModule.cpp
View file

@ -2807,8 +2807,16 @@ BfError* BfModule::Fail(const StringImpl& error, BfAstNode* refNode, bool isPers
{ {
//auto unspecializedMethod = &mCurMethodInstance->mMethodInstanceGroup->mMethodSpecializationMap.begin()->second; //auto unspecializedMethod = &mCurMethodInstance->mMethodInstanceGroup->mMethodSpecializationMap.begin()->second;
auto unspecializedMethod = methodInstance->mMethodInstanceGroup->mDefault; auto unspecializedMethod = methodInstance->mMethodInstanceGroup->mDefault;
if (unspecializedMethod->mHasFailed) if (unspecializedMethod == methodInstance)
return false; // At least SOME error has already been reported {
// This is a local method inside a generic method
BF_ASSERT(methodInstance->mMethodDef->mIsLocalMethod);
}
else
{
if (unspecializedMethod->mHasFailed)
return false; // At least SOME error has already been reported
}
} }
if (isSpecializedMethod) if (isSpecializedMethod)
@ -20040,7 +20048,12 @@ BfModuleMethodInstance BfModule::GetLocalMethodInstance(BfLocalMethod* localMeth
VisitCodeBlock(blockBody); VisitCodeBlock(blockBody);
} }
else if (auto bodyExpr = BfNodeDynCast<BfExpression>(body)) else if (auto bodyExpr = BfNodeDynCast<BfExpression>(body))
CreateValueFromExpression(bodyExpr); {
BfType* expectType = NULL;
if (!methodInstance->mReturnType->IsVoid())
expectType = methodInstance->mReturnType;
CreateValueFromExpression(bodyExpr, expectType);
}
}; };
auto _SafeResolveTypeRef = [&](BfTypeReference* typeRef) auto _SafeResolveTypeRef = [&](BfTypeReference* typeRef)