1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 20:42:21 +02:00

Made open emit markers even more persistent

This commit is contained in:
Brian Fiete 2022-05-27 07:24:33 -07:00
parent 5763ac7d83
commit e3b3089623
4 changed files with 36 additions and 10 deletions

View file

@ -4843,7 +4843,7 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
typeInstance->mCeTypeInfo->mTypeIFaceMap = typeInstance->mCeTypeInfo->mNext->mTypeIFaceMap;
typeInstance->mCeTypeInfo->mHash = typeInstance->mCeTypeInfo->mNext->mHash;
}
delete typeInstance->mCeTypeInfo->mNext;
typeInstance->mCeTypeInfo->mNext = NULL;
}
@ -4857,10 +4857,9 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
typeInstance->mCeTypeInfo->mTypeIFaceMap.Clear();
typeInstance->mCeTypeInfo->mHash = Val128();
}
if ((typeInstance->mCeTypeInfo->mFailed) &&
(prevHadEmissions) &&
(typeInstance->mCeTypeInfo->mEmitSourceMap.IsEmpty()))
if (((typeInstance->mCeTypeInfo->mFailed) || (typeInstance->mTypeDef->HasParsingFailed())) &&
(prevHadEmissions))
{
// Just add a marker to retain the previous open emits
typeInstance->mCeTypeInfo->mEmitSourceMap[-1] = BfCeTypeEmitSource();

View file

@ -1030,6 +1030,22 @@ bool BfTypeDef::HasCustomAttributes()
return false;
}
bool BfTypeDef::HasParsingFailed()
{
auto parser = mTypeDeclaration->GetParser();
if ((parser != NULL) && (parser->mParsingFailed))
return true;
for (auto partial : mPartials)
{
parser = partial->mTypeDeclaration->GetParser();
if ((parser != NULL) && (parser->mParsingFailed))
return true;
}
return false;
}
//////////////////////////////////////////////////////////////////////////
BfProject::BfProject()

View file

@ -1219,6 +1219,7 @@ public:
BfFieldDef* GetFieldByName(const StringImpl& name);
bool HasAutoProperty(BfPropertyDeclaration* propertyDeclaration);
bool ContainsPartial(BfTypeDef* partialTypeDef);
bool HasParsingFailed();
String GetAutoPropertyName(BfPropertyDeclaration* propertyDeclaration);
BfAstNode* GetRefNode();