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

Union changes

Browse source
This commit is contained in:
Brian Fiete 2020-07-18 06:51:00 -07:00
parent 86a41649ec
commit af77825b9d
2 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

40
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -423,6 +423,46 @@ void BfFieldInstance::SetResolvedType(BfType* type)
mResolvedType = type;
}
void BfFieldInstance::GetDataRange(int& dataIdx, int& dataCount)
{
int minMergedDataIdx = mMergedDataIdx;
int maxMergedDataIdx = minMergedDataIdx + 1;
if (mResolvedType->IsStruct())
maxMergedDataIdx = minMergedDataIdx + mResolvedType->ToTypeInstance()->mMergedFieldDataCount;
if (mOwner->mIsUnion)
{
for (auto& checkFieldInstance : mOwner->mFieldInstances)
{
if (&checkFieldInstance == this)
continue;
if (checkFieldInstance.mDataIdx == mDataIdx)
{
int checkMinMergedDataIdx = checkFieldInstance.mMergedDataIdx;
int checkMaxMergedDataIdx = checkMinMergedDataIdx + 1;
if (checkFieldInstance.GetResolvedType()->IsStruct())
checkMaxMergedDataIdx = checkMinMergedDataIdx + checkFieldInstance.mResolvedType->ToTypeInstance()->mMergedFieldDataCount;
minMergedDataIdx = BF_MIN(minMergedDataIdx, checkMinMergedDataIdx);
maxMergedDataIdx = BF_MAX(maxMergedDataIdx, checkMaxMergedDataIdx);
}
}
}
int fieldIdx = dataIdx - 1;
if (fieldIdx == -1)
{
dataIdx = minMergedDataIdx + 1;
}
else
{
fieldIdx += minMergedDataIdx;
dataIdx = fieldIdx + 1;
}
dataCount = maxMergedDataIdx - minMergedDataIdx;
}
//////////////////////////////////////////////////////////////////////////
int64 BfDeferredMethodCallData::GenerateMethodId(BfModule* module, int64 methodId)

1
IDEHelper/Compiler/BfResolvedTypeUtils.h
View file

@ -1292,6 +1292,7 @@ public:
BfType* GetResolvedType();
void SetResolvedType(BfType* type);
void GetDataRange(int& dataIdx, int& dataCount);
};
enum BfMethodRefKind