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

Comptime method fixes

Browse source
This commit is contained in:
Brian Fiete 2021-11-28 09:42:22 -08:00
parent 0927656400
commit ed06ff4dce
5 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -4608,7 +4608,8 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
{ {
mModule->CheckStaticAccess(curCheckType); mModule->CheckStaticAccess(curCheckType);
auto retVal = mModule->ReferenceStaticField(fieldInstance); auto retVal = mModule->ReferenceStaticField(fieldInstance);
bool isStaticCtor = (mModule->mCurMethodInstance != NULL) && (mModule->mCurMethodInstance->mMethodDef->mMethodType == BfMethodType_Ctor) && bool isStaticCtor = (mModule->mCurMethodInstance != NULL) &&
(mModule->mCurMethodInstance->mMethodDef->IsCtorOrInit()) &&
(mModule->mCurMethodInstance->mMethodDef->mIsStatic); (mModule->mCurMethodInstance->mMethodDef->mIsStatic);
if ((field->mIsReadOnly) && (!isStaticCtor)) if ((field->mIsReadOnly) && (!isStaticCtor))
{ {
@ -4652,7 +4653,7 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
bool isTemporary = target.IsTempAddr(); bool isTemporary = target.IsTempAddr();
bool wantsLoadValue = false; bool wantsLoadValue = false;
bool wantsReadOnly = false; bool wantsReadOnly = false;
if ((field->mIsReadOnly) && (mModule->mCurMethodInstance != NULL) && ((mModule->mCurMethodInstance->mMethodDef->mMethodType != BfMethodType_Ctor) || (!target.IsThis()))) if ((field->mIsReadOnly) && (mModule->mCurMethodInstance != NULL) && ((!mModule->mCurMethodInstance->mMethodDef->IsCtorOrInit()) || (!target.IsThis())))
wantsReadOnly = true; wantsReadOnly = true;
bool isComposite = target.mType->IsComposite(); bool isComposite = target.mType->IsComposite();

28
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -2019,6 +2019,24 @@ BfCEParseContext BfModule::CEEmitParse(BfTypeInstance* typeInstance, const Strin
emitTypeDef->mSource = emitParser; emitTypeDef->mSource = emitParser;
emitParser->mRefCount++; emitParser->mRefCount++;
emitParser->SetSource(src.c_str(), src.mLength); emitParser->SetSource(src.c_str(), src.mLength);
// If we emit only from method attributes then we will already have method instances created
auto _FixMethod = [&](BfMethodInstance* methodInstance)
{
if (methodInstance == NULL)
return;
methodInstance->mMethodDef = emitTypeDef->mMethods[methodInstance->mMethodDef->mIdx];
};
for (auto& methodInstanceGroup : typeInstance->mMethodInstanceGroups)
{
_FixMethod(methodInstanceGroup.mDefault);
if (methodInstanceGroup.mMethodSpecializationMap != NULL)
{
for (auto& kv : *methodInstanceGroup.mMethodSpecializationMap)
_FixMethod(kv.mValue);
}
};
} }
else else
{ {
@ -2830,6 +2848,7 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
if (!typeDef->mInternalAccessSet.IsEmpty()) if (!typeDef->mInternalAccessSet.IsEmpty())
{ {
BfInternalAccessSet* internalAccessSet; BfInternalAccessSet* internalAccessSet;
BF_ASSERT(!typeDef->IsEmitted());
if (typeInstance->mInternalAccessMap.TryAdd(typeDef, NULL, &internalAccessSet)) if (typeInstance->mInternalAccessMap.TryAdd(typeDef, NULL, &internalAccessSet))
{ {
for (auto typeRef : typeDef->mInternalAccessSet) for (auto typeRef : typeDef->mInternalAccessSet)
@ -3973,6 +3992,7 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
mCompiler->mCEMachine->mCurContext->Fail(*mCompiler->mCEMachine->mCurContext->mCurFrame, error); mCompiler->mCEMachine->mCurContext->Fail(*mCompiler->mCEMachine->mCurContext->mCurFrame, error);
else if (mCompiler->mCEMachine->mCurContext != NULL) else if (mCompiler->mCEMachine->mCurContext != NULL)
mCompiler->mCEMachine->mCurContext->Fail(error); mCompiler->mCEMachine->mCurContext->Fail(error);
tryCE = false;
} }
} }
@ -8674,15 +8694,15 @@ BfTypeDef* BfModule::GetActiveTypeDef(BfTypeInstance* typeInstanceOverride, bool
if (typeInstance != NULL) if (typeInstance != NULL)
useTypeDef = typeInstance->mTypeDef->GetDefinition(); useTypeDef = typeInstance->mTypeDef->GetDefinition();
if ((mCurMethodState != NULL) && (mCurMethodState->mMixinState != NULL) && (useMixinDecl)) if ((mCurMethodState != NULL) && (mCurMethodState->mMixinState != NULL) && (useMixinDecl))
useTypeDef = mCurMethodState->mMixinState->mMixinMethodInstance->mMethodDef->mDeclaringType; useTypeDef = mCurMethodState->mMixinState->mMixinMethodInstance->mMethodDef->mDeclaringType->GetDefinition();
else if ((mCurMethodInstance != NULL) && (mCurMethodInstance->mMethodDef->mDeclaringType != NULL)) else if ((mCurMethodInstance != NULL) && (mCurMethodInstance->mMethodDef->mDeclaringType != NULL))
useTypeDef = mCurMethodInstance->mMethodDef->mDeclaringType; useTypeDef = mCurMethodInstance->mMethodDef->mDeclaringType->GetDefinition();
else if (mContext->mCurTypeState != NULL) else if (mContext->mCurTypeState != NULL)
{ {
if ((mContext->mCurTypeState->mCurFieldDef != NULL) && (mContext->mCurTypeState->mCurFieldDef->mDeclaringType != NULL)) if ((mContext->mCurTypeState->mCurFieldDef != NULL) && (mContext->mCurTypeState->mCurFieldDef->mDeclaringType != NULL))
useTypeDef = mContext->mCurTypeState->mCurFieldDef->mDeclaringType; useTypeDef = mContext->mCurTypeState->mCurFieldDef->mDeclaringType->GetDefinition();
else if (mContext->mCurTypeState->mCurTypeDef != NULL) else if (mContext->mCurTypeState->mCurTypeDef != NULL)
useTypeDef = mContext->mCurTypeState->mCurTypeDef; useTypeDef = mContext->mCurTypeState->mCurTypeDef->GetDefinition();
} }
return useTypeDef; return useTypeDef;
} }

5
IDEHelper/Compiler/BfSystem.cpp
View file

@ -526,6 +526,11 @@ bool BfMethodDef::IsDefaultCtor()
return ((mMethodType == BfMethodType_Ctor) || (mMethodType == BfMethodType_CtorNoBody)) && (mParams.IsEmpty()); return ((mMethodType == BfMethodType_Ctor) || (mMethodType == BfMethodType_CtorNoBody)) && (mParams.IsEmpty());
} }
bool BfMethodDef::IsCtorOrInit()
{
return (mMethodType >= BfMethodType_CtorCalcAppend) && (mMethodType <= BfMethodType_Init);
}
String BfMethodDef::ToString() String BfMethodDef::ToString()
{ {
String methodText; String methodText;

1
IDEHelper/Compiler/BfSystem.h
View file

@ -870,6 +870,7 @@ public:
bool HasBody(); bool HasBody();
bool IsEmptyPartial(); bool IsEmptyPartial();
bool IsDefaultCtor(); bool IsDefaultCtor();
bool IsCtorOrInit();
String ToString(); String ToString();
int GetExplicitParamCount(); int GetExplicitParamCount();
}; };

5
IDEHelper/DbgExprEvaluator.cpp
View file

@ -5276,7 +5276,10 @@ void DbgExprEvaluator::LookupSplatMember(BfAstNode* targetNode, BfAstNode* looku
if (!memberType->IsStruct()) if (!memberType->IsStruct())
Fail("Failed to lookup splat member", (lookupNode != NULL) ? lookupNode : targetNode); Fail("Failed to lookup splat member", (lookupNode != NULL) ? lookupNode : targetNode);
BF_ASSERT((target.mVariable != NULL) || (target.mType->GetByteCount() == 0)); if ((target.mVariable == NULL) && (target.mType->GetByteCount() != 0))
Fail("Splat variable not found", (lookupNode != NULL) ? lookupNode : targetNode);
//BF_ASSERT((target.mVariable != NULL) || (target.mType->GetByteCount() == 0));
mResult = target; mResult = target;
mResult.mType = memberType; mResult.mType = memberType;
} }