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

TypeDef MemberSet fixes

Browse source
This commit is contained in:
Brian Fiete 2021-12-28 13:10:52 -05:00
parent cfaeb875f8
commit 069e327850
3 changed files with 28 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -2115,8 +2115,6 @@ void BfModule::UpdateCEEmit(CeEmitContext* ceEmitContext, BfTypeInstance* typeIn
defBuilder.DoVisitChild(typeDeclaration->mDefineNode); defBuilder.DoVisitChild(typeDeclaration->mDefineNode);
defBuilder.FinishTypeDef(typeInstance->mTypeDef->mTypeCode == BfTypeCode_Enum); defBuilder.FinishTypeDef(typeInstance->mTypeDef->mTypeCode == BfTypeCode_Enum);
typeInstance->mTypeDef->ClearOldMemberSets();
FinishCEParseContext(refNode, typeInstance, &ceParseContext); FinishCEParseContext(refNode, typeInstance, &ceParseContext);
if (typeInstance->mTypeDef->mEmitParent != NULL) if (typeInstance->mTypeDef->mEmitParent != NULL)

38
IDEHelper/Compiler/BfSystem.cpp
View file

@ -712,11 +712,9 @@ void BfTypeDef::FreeMembers()
void BfTypeDef::PopulateMemberSets() void BfTypeDef::PopulateMemberSets()
{ {
if ((!mMethodSet.IsEmpty()) || (!mFieldSet.IsEmpty()) || (!mPropertySet.IsEmpty())) while (mMethodSet.mSourceSize < mMethods.mSize)
return;
for (auto methodDef : mMethods)
{ {
auto methodDef = mMethods[mMethodSet.mSourceSize++];
BF_ASSERT(methodDef->mNextWithSameName == NULL); BF_ASSERT(methodDef->mNextWithSameName == NULL);
BfMemberSetEntry* entry; BfMemberSetEntry* entry;
@ -724,11 +722,12 @@ void BfTypeDef::PopulateMemberSets()
{ {
methodDef->mNextWithSameName = (BfMethodDef*)entry->mMemberDef; methodDef->mNextWithSameName = (BfMethodDef*)entry->mMemberDef;
entry->mMemberDef = methodDef; entry->mMemberDef = methodDef;
} }
} }
for (auto fieldDef : mFields) while (mFieldSet.mSourceSize < mFields.mSize)
{ {
auto fieldDef = mFields[mFieldSet.mSourceSize++];
BF_ASSERT(fieldDef->mNextWithSameName == NULL); BF_ASSERT(fieldDef->mNextWithSameName == NULL);
BfMemberSetEntry* entry; BfMemberSetEntry* entry;
@ -739,8 +738,9 @@ void BfTypeDef::PopulateMemberSets()
} }
} }
for (auto propDef : mProperties) while (mPropertySet.mSourceSize < mProperties.mSize)
{ {
auto propDef = mProperties[mPropertySet.mSourceSize++];
BF_ASSERT(propDef->mNextWithSameName == NULL); BF_ASSERT(propDef->mNextWithSameName == NULL);
BfMemberSetEntry* entry; BfMemberSetEntry* entry;
@ -767,30 +767,6 @@ void BfTypeDef::ClearMemberSets()
mPropertySet.Clear(); mPropertySet.Clear();
} }
void BfTypeDef::ClearOldMemberSets()
{
if ((mMethodSet.mCount > 0) && (mMethods.mSize > mMethodSet.mCount))
{
for (auto entry : mMethodSet)
((BfMethodDef*)entry.mMemberDef)->mNextWithSameName = NULL;
mMethodSet.Clear();
}
if ((mFieldSet.mCount > 0) && (mFields.mSize > mFieldSet.mCount))
{
for (auto entry : mFieldSet)
((BfFieldDef*)entry.mMemberDef)->mNextWithSameName = NULL;
mFieldSet.Clear();
}
if ((mPropertySet.mCount > 0) && (mProperties.mSize > mPropertySet.mCount))
{
for (auto entry : mPropertySet)
((BfPropertyDef*)entry.mMemberDef)->mNextWithSameName = NULL;
mPropertySet.Clear();
}
}
BfTypeDef::~BfTypeDef() BfTypeDef::~BfTypeDef()
{ {
BfLogSysM("BfTypeDef::~BfTypeDef %p\n", this); BfLogSysM("BfTypeDef::~BfTypeDef %p\n", this);

25
IDEHelper/Compiler/BfSystem.h
View file

@ -935,6 +935,24 @@ struct BfMemberSetEntry
} }
}; };
class BfTypeDefMemberSet : public HashSet<BfMemberSetEntry>
{
public:
int mSourceSize;
public:
BfTypeDefMemberSet()
{
mSourceSize = 0;
}
void Clear()
{
HashSet<BfMemberSetEntry>::Clear();
mSourceSize = 0;
}
};
// For partial classes, the first entry in the map will contain the combined data // For partial classes, the first entry in the map will contain the combined data
class BfTypeDef class BfTypeDef
{ {
@ -980,9 +998,9 @@ public:
Array<BfFieldDef*> mFields; Array<BfFieldDef*> mFields;
Array<BfPropertyDef*> mProperties; Array<BfPropertyDef*> mProperties;
Array<BfMethodDef*> mMethods; Array<BfMethodDef*> mMethods;
HashSet<BfMemberSetEntry> mMethodSet; BfTypeDefMemberSet mMethodSet;
HashSet<BfMemberSetEntry> mFieldSet; BfTypeDefMemberSet mFieldSet;
HashSet<BfMemberSetEntry> mPropertySet; BfTypeDefMemberSet mPropertySet;
Array<BfOperatorDef*> mOperators; Array<BfOperatorDef*> mOperators;
Array<BfGenericParamDef*> mGenericParamDefs; Array<BfGenericParamDef*> mGenericParamDefs;
Array<BfExternalConstraintDef> mExternalConstraints; Array<BfExternalConstraintDef> mExternalConstraints;
@ -1072,7 +1090,6 @@ public:
void FreeMembers(); void FreeMembers();
void PopulateMemberSets(); void PopulateMemberSets();
void ClearMemberSets(); void ClearMemberSets();
void ClearOldMemberSets();
void RemoveGenericParamDef(BfGenericParamDef* genericParamDef); void RemoveGenericParamDef(BfGenericParamDef* genericParamDef);
int GetSelfGenericParamCount(); int GetSelfGenericParamCount();
String ToString(); String ToString();