Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-13 05:44:11 +02:00
Code Activity

Added support for explicit generic type

Browse source
This commit is contained in:
Brian Fiete 2020-11-01 04:37:40 -08:00
parent d15057ca6b
commit 4bc0b82c8b
1 changed files with 56 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

69
IDEHelper/Compiler/BfCompiler.cpp
View file

@ -7856,9 +7856,16 @@ String BfCompiler::GetTypeDefList()
struct TypeDefMatchHelper struct TypeDefMatchHelper
{ {
public:
struct SearchEntry
{
String mStr;
int mGenericCount;
};
public: public:
StringImpl& mResult; StringImpl& mResult;
Array<String> mSearch; Array<SearchEntry> mSearch;
uint32 mFoundFlags; uint32 mFoundFlags;
int32 mFoundCount; int32 mFoundCount;
bool mHasDotSearch; bool mHasDotSearch;
@ -8013,11 +8020,28 @@ public:
uint32 matchFlags = 0; uint32 matchFlags = 0;
for (int i = 0; i < mSearch.mSize; i++) for (int i = 0; i < mSearch.mSize; i++)
{ {
if (((mFoundFlags & (1 << i)) == 0) && (str.IndexOf(mSearch[i], true) != -1)) auto& search = mSearch[i];
if (((mFoundFlags & (1 << i)) == 0) && (str.IndexOf(search.mStr, true) != -1))
{ {
mFoundCount++; bool genericMatches = true;
matchFlags |= (1 << i); if (search.mGenericCount > 0)
mFoundFlags |= (1 << i); {
genericMatches = false;
int countIdx = (int)str.LastIndexOf('`');
if (countIdx > 0)
{
int genericCount = atoi(str.mPtr + countIdx + 1);
genericMatches = ((genericCount == search.mGenericCount) || (search.mGenericCount == 1)) &&
(countIdx == (int)search.mStr.length());
}
}
if (genericMatches)
{
mFoundCount++;
matchFlags |= (1 << i);
mFoundFlags |= (1 << i);
}
} }
} }
return matchFlags; return matchFlags;
@ -8077,10 +8101,30 @@ String BfCompiler::GetTypeDefMatches(const StringImpl& searchStr)
if (spacePos == -1) if (spacePos == -1)
str = searchStr.Substring(searchIdx); str = searchStr.Substring(searchIdx);
else else
str = searchStr.Substring(searchIdx, spacePos - searchIdx); str = searchStr.Substring(searchIdx, (int)(spacePos - searchIdx));
str.Trim(); str.Trim();
if (!str.IsEmpty())
matchHelper.mSearch.Add(str); TypeDefMatchHelper::SearchEntry searchEntry;
for (int i = 0; i < (int)str.length(); i++)
{
char c = str[i];
if (c == '<')
{
searchEntry.mGenericCount = 1;
searchEntry.mStr = str.Substring(0, i);
}
else if (searchEntry.mGenericCount > 0)
{
if (c == ',')
searchEntry.mGenericCount++;
}
}
if (searchEntry.mStr.IsEmpty())
searchEntry.mStr = str;
if (!searchEntry.mStr.IsEmpty())
matchHelper.mSearch.Add(searchEntry);
if (str.Contains('.')) if (str.Contains('.'))
matchHelper.mHasDotSearch = true; matchHelper.mHasDotSearch = true;
if (spacePos == -1) if (spacePos == -1)
@ -8126,7 +8170,7 @@ String BfCompiler::GetTypeDefMatches(const StringImpl& searchStr)
if (matchHelper.mHasDotSearch) if (matchHelper.mHasDotSearch)
{ {
matchHelper.mCurTypeName.Clear(); matchHelper.mCurTypeName.Clear();
typeDef->mFullName.ToString(matchHelper.mCurTypeName); typeDef->mFullNameEx.ToString(matchHelper.mCurTypeName);
matchHelper.ClearResults(); matchHelper.ClearResults();
matchHelper.CheckMatch(matchHelper.mCurTypeName); matchHelper.CheckMatch(matchHelper.mCurTypeName);
@ -8134,8 +8178,7 @@ String BfCompiler::GetTypeDefMatches(const StringImpl& searchStr)
} }
int matchIdx = -1; int matchIdx = -1;
//BfAtomComposite foundComposite;
if (!fullyMatchesName) if (!fullyMatchesName)
{ {
for (auto fieldDef : typeDef->mFields) for (auto fieldDef : typeDef->mFields)
@ -8190,9 +8233,9 @@ String BfCompiler::GetTypeDefMatches(const StringImpl& searchStr)
} }
uint32 matchFlags = 0; uint32 matchFlags = 0;
for (int atomIdx = typeDef->mFullName.mSize - 1; atomIdx >= 0; atomIdx--) for (int atomIdx = typeDef->mFullNameEx.mSize - 1; atomIdx >= 0; atomIdx--)
{ {
auto atom = typeDef->mFullName.mParts[atomIdx]; auto atom = typeDef->mFullNameEx.mParts[atomIdx];
int* matchesPtr = NULL; int* matchesPtr = NULL;
if (atomMatchMap.TryAdd(atom, NULL, &matchesPtr)) if (atomMatchMap.TryAdd(atom, NULL, &matchesPtr))
{ {