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

Fix for 'using static' namespace search inside namespace declarations

Browse source
This commit is contained in:
Brian Fiete 2022-01-07 08:58:19 -05:00
parent 723f17f139
commit f0bafae177
8 changed files with 53 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -8967,9 +8967,31 @@ BfTypeDef* BfModule::FindTypeDef(const BfAtomComposite& findName, int numGeneric
if ((mCompiler->mResolvePassData != NULL) && (mCompiler->mResolvePassData->mParser != NULL))
project = mCompiler->mResolvePassData->mParser->mProject;
BP_ZONE("System.FindTypeDef_2");
BP_ZONE("System.FindTypeDef_2");
Array<BfAtomComposite> namespaceSearch;
if (mContext->mCurNamespaceNodes != NULL)
{
String checkNamespace;
for (auto namespaceNode : *mContext->mCurNamespaceNodes)
{
if (namespaceNode->mNameNode != NULL)
{
if (!checkNamespace.IsEmpty())
checkNamespace += ".";
namespaceNode->mNameNode->ToString(checkNamespace);
}
}
if (!checkNamespace.IsEmpty())
{
BfAtomComposite atomComposite;
if (mSystem->ParseAtomComposite(checkNamespace, atomComposite))
namespaceSearch.Add(atomComposite);
}
}
BfTypeDef* ambiguousTypeDef = NULL;
BfTypeDef *result = mSystem->FindTypeDef(findName, numGenericArgs, project, Array<BfAtomComposite>(), &ambiguousTypeDef);
BfTypeDef *result = mSystem->FindTypeDef(findName, numGenericArgs, project, namespaceSearch, &ambiguousTypeDef);
if ((ambiguousTypeDef != NULL) && (error != NULL))
{
error->mErrorKind = BfTypeLookupError::BfErrorKind_Ambiguous;