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

Properly fail enum case declarations outside enums

Browse source
This commit is contained in:
Brian Fiete 2021-02-25 05:55:36 -08:00
parent d1d3af1cc0
commit 234aaa772c
1 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -3592,6 +3592,8 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
BfType* resolvedFieldType = NULL; BfType* resolvedFieldType = NULL;
if (field->IsEnumCaseEntry()) if (field->IsEnumCaseEntry())
{
if (typeInstance->IsEnum())
{ {
fieldInstance->mDataIdx = -(enumCaseEntryIdx++) - 1; fieldInstance->mDataIdx = -(enumCaseEntryIdx++) - 1;
resolvedFieldType = typeInstance; resolvedFieldType = typeInstance;
@ -3612,6 +3614,12 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
fieldInstance->mIsEnumPayloadCase = true; fieldInstance->mIsEnumPayloadCase = true;
} }
} }
else
{
Fail("Enum cases can only be declared within enum types", field->GetRefNode(), true);
resolvedFieldType = typeInstance;
}
}
else if ((field->mTypeRef != NULL) && ((field->mTypeRef->IsExact<BfVarTypeReference>()) || (field->mTypeRef->IsExact<BfLetTypeReference>()) || (field->mTypeRef->IsExact<BfExprModTypeRef>()))) else if ((field->mTypeRef != NULL) && ((field->mTypeRef->IsExact<BfVarTypeReference>()) || (field->mTypeRef->IsExact<BfLetTypeReference>()) || (field->mTypeRef->IsExact<BfExprModTypeRef>())))
{ {
resolvedFieldType = GetPrimitiveType(BfTypeCode_Var); resolvedFieldType = GetPrimitiveType(BfTypeCode_Var);