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

Fixed renaming of globals

Browse source
This commit is contained in:
Brian Fiete 2020-02-08 10:41:45 -08:00
parent 234b3064ff
commit 6e485e5766
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
IDEHelper/Compiler/BfCompiler.cpp
View file

@ -6750,7 +6750,9 @@ void BfCompiler::GenerateAutocompleteInfo()
auto _EncodeTypeDef = [] (BfTypeDef* typeDef) auto _EncodeTypeDef = [] (BfTypeDef* typeDef)
{ {
String typeName = typeDef->mProject->mName + ":" + typeDef->mFullName.ToString(); StringT<128> typeName = typeDef->mProject->mName;
typeName += ":";
typeName += typeDef->mFullName.ToString();
if (!typeDef->mGenericParamDefs.IsEmpty()) if (!typeDef->mGenericParamDefs.IsEmpty())
typeName += StrFormat("`%d", (int)typeDef->mGenericParamDefs.size()); typeName += StrFormat("`%d", (int)typeDef->mGenericParamDefs.size());
return typeName; return typeName;

29
IDEHelper/Compiler/BfSystem.cpp
View file

@ -1912,6 +1912,9 @@ void BfSystem::ProcessAtomGraveyard()
bool BfSystem::ParseAtomComposite(const StringView& name, BfAtomComposite& composite, bool addRefs) bool BfSystem::ParseAtomComposite(const StringView& name, BfAtomComposite& composite, bool addRefs)
{ {
if (name.mLength == 0)
return true;
bool isValid = true; bool isValid = true;
SizedArray<BfAtom*, 6> parts; SizedArray<BfAtom*, 6> parts;
@ -2418,7 +2421,31 @@ BfTypeDef* BfSystem::FindTypeDefEx(const StringImpl& fullTypeName)
typeName.RemoveToEnd(tildePos); typeName.RemoveToEnd(tildePos);
} }
return FindTypeDef(typeName, numGenericArgs, project); BfAtomComposite qualifiedFindName;
BfAtom* tempData[16];
qualifiedFindName.mAllocSize = 16;
qualifiedFindName.mParts = tempData;
BfTypeDef* result = NULL;
if (ParseAtomComposite(typeName, qualifiedFindName))
{
auto itr = mTypeDefs.TryGet(qualifiedFindName);
while (itr)
{
BfTypeDef* typeDef = *itr;
if ((typeDef->mFullName == qualifiedFindName) && (CheckTypeDefReference(typeDef, project)) &&
(!typeDef->mIsPartial))
{
if (typeDef->mGenericParamDefs.size() != numGenericArgs)
continue;
return typeDef;
}
itr.MoveToNextHashMatch();
}
}
if (qualifiedFindName.mParts == tempData)
qualifiedFindName.mParts = NULL;
return result;
} }
void BfSystem::FindFixitNamespaces(const StringImpl& typeName, int numGenericArgs, BfProject* project, std::set<String>& fixitNamespaces) void BfSystem::FindFixitNamespaces(const StringImpl& typeName, int numGenericArgs, BfProject* project, std::set<String>& fixitNamespaces)