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

Fixed globals project selection for typedef

Browse source
This commit is contained in:
Brian Fiete 2020-07-16 16:02:54 -07:00
parent 328f489324
commit 7f31b29607
2 changed files with 46 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
IDEHelper/Compiler/BfModule.cpp
View file

@ -3233,7 +3233,7 @@ void BfModule::PopulateGlobalContainersList(const BfGlobalLookup& globalLookup)
if ((typeDef->mFullName == findStr) && (typeDef->mIsCombinedPartial) && (typeDef->IsGlobalsContainer()))
{
if (typeDef->mProject->ContainsReference(typeDef->mProject))
{
{
BfGlobalContainerEntry globalEntry;
globalEntry.mTypeDef = typeDef;
globalEntry.mTypeInst = NULL;
@ -4574,7 +4574,7 @@ BfIRValue BfModule::CreateTypeDataRef(BfType* type)
else
{
typeDataName += "sBfTypeData.";
BfMangler::Mangle(typeDataName, mCompiler->GetMangleKind(), type, this);
BfMangler::Mangle(typeDataName, mCompiler->GetMangleKind(), type, this);
}
BfLogSysM("Creating TypeData %s\n", typeDataName.c_str());
@ -4684,7 +4684,7 @@ BfIRValue BfModule::CreateTypeData(BfType* type, Dictionary<int, int>& usedStrin
typeDataName += "sBfTypeData.";
BfMangler::Mangle(typeDataName, mCompiler->GetMangleKind(), type, mContext->mScratchModule);
}
int typeCode = BfTypeCode_None;
if (typeInstance != NULL)
@ -11955,8 +11955,7 @@ BfModuleMethodInstance BfModule::GetMethodInstance(BfTypeInstance* typeInst, BfM
{
if (methodInstance->mMethodProcessRequest != NULL)
{
// Disconnect method process request
BF_ASSERT(methodInstance->mMethodProcessRequest->mFromModule == mContext->mUnreifiedModule);
// Disconnect method process request
methodInstance->mMethodProcessRequest->mMethodInstance = NULL;
methodInstance->mMethodProcessRequest = NULL;
}