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

Fixed comptime emission for enums

Browse source
This commit is contained in:
Brian Fiete 2021-11-24 13:27:39 -08:00
parent c52ef256a5
commit ed80a8d88b
3 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
IDEHelper/Compiler/BfDefBuilder.cpp
View file

@ -1926,6 +1926,7 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
BfMethodDef* staticMarkMethod = NULL;
BfMethodDef* dynamicCastMethod = NULL;
BfMethodDef* toStringMethod = NULL;
BfMethodDef* getUnderlyingMethod = NULL;
bool needsEqualsMethod = ((mCurTypeDef->mTypeCode == BfTypeCode_Struct) || (mCurTypeDef->mTypeCode == BfTypeCode_Enum)) && (!mCurTypeDef->mIsStatic);
BfMethodDef* equalsOpMethod = NULL;
BfMethodDef* equalsMethod = NULL;
@ -2061,9 +2062,14 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
if (method->mName == BF_METHODNAME_DYNAMICCAST)
_SetMethod(dynamicCastMethod, method);
if (method->mName == BF_METHODNAME_TO_STRING)
_SetMethod(toStringMethod, method);
_SetMethod(toStringMethod, method);
}
}
else if (method->mMethodType == BfMethodType_PropertyGetter)
{
if (method->mName == BF_METHODNAME_ENUM_GETUNDERLYING)
_SetMethod(getUnderlyingMethod, method);
}
else if ((method->mMethodType == BfMethodType_Operator) &&
(method->mIsStatic) &&
(method->mParams.size() == 2))
@ -2247,7 +2253,7 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
if (toStringMethod != NULL)
wantsToString = false;
if ((mCurTypeDef->mTypeCode == BfTypeCode_Enum) && (!isPayloadEnum))
if ((mCurTypeDef->mTypeCode == BfTypeCode_Enum) && (!isPayloadEnum) && (getUnderlyingMethod == NULL))
{
auto methodDef = new BfMethodDef();
mCurTypeDef->mMethods.push_back(methodDef);