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

Added field and instantiation restrictions to extended opaques

Browse source
This commit is contained in:
Brian Fiete 2025-02-15 13:21:47 -08:00
parent 5000a8a824
commit 765906dd70
3 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
IDEHelper/Compiler/BfCompiler.cpp
View file

@ -3488,6 +3488,7 @@ void BfCompiler::UpdateRevisedTypes()
compositeTypeDef->mTypeCode = rootTypeDef->mTypeCode;
compositeTypeDef->mFullName = rootTypeDef->mFullName;
compositeTypeDef->mFullNameEx = rootTypeDef->mFullNameEx;
compositeTypeDef->mIsOpaque = rootTypeDef->mIsOpaque;
compositeTypeDef->mIsFunction = rootTypeDef->mIsFunction;
compositeTypeDef->mIsDelegate = rootTypeDef->mIsDelegate;
compositeTypeDef->mIsCombinedPartial = true;

23
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -5595,6 +5595,21 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
if ((!fieldDef->mIsConst) && (!fieldDef->mIsStatic))
{
BfAstNode* nameRefNode = NULL;
if (auto fieldDecl = fieldDef->GetFieldDeclaration())
nameRefNode = fieldDecl->mNameNode;
else if (auto paramDecl = fieldDef->GetParamDeclaration())
nameRefNode = paramDecl->mNameNode;
if (nameRefNode == NULL)
nameRefNode = fieldDef->mTypeRef;
if ((!resolvedFieldType->IsValuelessType()) && (typeDef->mIsOpaque))
{
Fail(StrFormat("Opaque type '%s' attempted to declare non-static field '%s'", TypeToString(typeInstance).c_str(), fieldDef->mName.c_str()), nameRefNode, true);
resolvedFieldType = GetPrimitiveType(BfTypeCode_None);
fieldInstance->mResolvedType = resolvedFieldType;
}
PopulateType(resolvedFieldType, resolvedFieldType->IsValueType() ? BfPopulateType_Data : BfPopulateType_Declaration);
if (resolvedFieldType->WantsGCMarking())
typeInstance->mWantsGCMarking = true;
@ -5613,14 +5628,6 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
Fail("Cannot declare instance member as 'extern'", fieldDef->GetFieldDeclaration()->mExternSpecifier, true);
}
BfAstNode* nameRefNode = NULL;
if (auto fieldDecl = fieldDef->GetFieldDeclaration())
nameRefNode = fieldDecl->mNameNode;
else if (auto paramDecl = fieldDef->GetParamDeclaration())
nameRefNode = paramDecl->mNameNode;
if (nameRefNode == NULL)
nameRefNode = fieldDef->mTypeRef;
if (!allowInstanceFields)
{
if (typeInstance->IsEnum())

1
IDEHelper/Compiler/BfSystem.cpp
View file

@ -3207,6 +3207,7 @@ void BfSystem::AddToCompositePartial(BfPassInstance* passInstance, BfTypeDef* co
typeDef->mSystem = partialTypeDef->mSystem;
typeDef->mTypeCode = partialTypeDef->mTypeCode;
typeDef->mShow = partialTypeDef->mShow;
typeDef->mIsOpaque = partialTypeDef->mIsOpaque;
typeDef->mIsFunction = partialTypeDef->mIsFunction;
typeDef->mIsDelegate = partialTypeDef->mIsDelegate;
typeDef->mNestDepth = partialTypeDef->mNestDepth;