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

File-scoped namespaces

Browse source
This commit is contained in:
Brian Fiete 2022-04-17 08:40:25 -07:00
parent 2d808ec649
commit f3f2f4c6ec
8 changed files with 76 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

50
IDEHelper/Compiler/BfDefBuilder.cpp
View file

@ -68,6 +68,7 @@ BfDefBuilder::BfDefBuilder(BfSystem* bfSystem)
mFullHashCtx = NULL;
mSignatureHashCtx = NULL;
mNamespaceBlockDepth = 0;
}
BfDefBuilder::~BfDefBuilder()
@ -2493,11 +2494,43 @@ void BfDefBuilder::Visit(BfUsingModDirective* usingDirective)
mStaticSearch.Add(usingDirective->mTypeRef);
}
void BfDefBuilder::SetNamespaceState(const NamespaceState& namespaceState)
{
while ((int)mNamespaceSearch.size() > namespaceState.mNamespaceSearchCount)
{
BfAtomComposite& atomComposite = mNamespaceSearch[0];
mSystem->ReleaseAtomComposite(atomComposite);
mNamespaceSearch.RemoveAt(0);
}
mNamespace = namespaceState.mNamespace;
}
void BfDefBuilder::Visit(BfNamespaceDeclaration* namespaceDeclaration)
{
BfAtomComposite prevNamespace = mNamespace;
int prevNamespaceSearchCount = (int)mNamespaceSearch.size();
auto blockNode = BfNodeDynCast<BfBlock>(namespaceDeclaration->mBody);
bool isFileLevel = (blockNode == NULL) && (namespaceDeclaration->mBody != NULL);
if (mNamespaceBlockDepth < mFileLevelNamespaceState.mSize)
{
auto& prevNamespaceState = mFileLevelNamespaceState[mNamespaceBlockDepth];
if (prevNamespaceState.mNamespaceSearchCount != -1)
{
SetNamespaceState(prevNamespaceState);
prevNamespaceState.mNamespaceSearchCount = -1;
}
}
NamespaceState namespaceState;
namespaceState.mNamespace = mNamespace;
namespaceState.mNamespaceSearchCount = (int)mNamespaceSearch.size();
if (isFileLevel)
{
while (mNamespaceBlockDepth >= mFileLevelNamespaceState.mSize)
mFileLevelNamespaceState.Add(NamespaceState());
mFileLevelNamespaceState[mNamespaceBlockDepth] = namespaceState;
}
if (namespaceDeclaration->mNameNode == NULL)
return;
@ -2531,14 +2564,15 @@ void BfDefBuilder::Visit(BfNamespaceDeclaration* namespaceDeclaration)
mSystem->ReleaseAtom(namespaceAtom);
}
VisitChild(namespaceDeclaration->mBlock);
while ((int)mNamespaceSearch.size() > prevNamespaceSearchCount)
if (blockNode != NULL)
{
BfAtomComposite& atomComposite = mNamespaceSearch[0];
mSystem->ReleaseAtomComposite(atomComposite);
mNamespaceSearch.RemoveAt(0);
mNamespaceBlockDepth++;
VisitChild(blockNode);
mNamespaceBlockDepth--;
}
mNamespace = prevNamespace;
if (!isFileLevel)
SetNamespaceState(namespaceState);
}
void BfDefBuilder::Visit(BfBlock* block)