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 field var-resolving when calling methods

Browse source
This commit is contained in:
Brian Fiete 2020-04-07 08:31:17 -07:00
parent e12c03d46e
commit 13d7b0c1c5
5 changed files with 72 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -1745,6 +1745,29 @@ bool BfMethodMatcher::CheckType(BfTypeInstance* typeInstance, BfTypedValue targe
auto checkMethod = nextMethodDef;
nextMethodDef = nextMethodDef->mNextWithSameName;
if (mModule->mContext->mResolvingVarField)
{
bool isResolvingVarField = false;
auto checkTypeState = mModule->mContext->mCurTypeState;
while (checkTypeState != NULL)
{
if ((checkTypeState->mResolveKind == BfTypeState::ResolveKind_ResolvingVarType) &&
(checkTypeState->mTypeInstance == typeInstance))
isResolvingVarField = true;
checkTypeState = checkTypeState->mPrevState;
}
if (isResolvingVarField)
{
// Don't even consider - we can't do method calls on ourselves when we are resolving var fields, because
// we are not allowed to generate methods when our field types are unknown. We may fix this in the future,
// but currently it breaks out expected order of operations. One issue is that our call signatures change
// depending on whether we are valueless or splattable, which depend on underlying type information
break;
}
}
if ((checkExtensionBase) && (curTypeInst == mModule->mCurTypeInstance))
{
// Accept either a method in the same project but that's the root definition, OR a method that's in a dependent project
@ -5084,7 +5107,7 @@ BfTypedValue BfExprEvaluator::CreateCall(BfAstNode* targetSrc, const BfTypedValu
moduleMethodInstance.mFunc = mModule->mBfIRBuilder->CreateIntToPtr(target.mValue, funcPtrType);
}
else
{
{
mModule->CheckStaticAccess(methodInstance->mMethodInstanceGroup->mOwner);
if (target)