forks
/
DCD
mirror of https://github.com/dlang-community/DCD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use crumb to get return type of a templated function

This commit is contained in:
ryuukk 2022-10-13 19:38:18 +02:00 committed by WebFreak001
parent 5c529f300d
commit 365e8d6762
No known key found for this signature in database
GPG Key ID: AEFC88D11109D1AA
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dsymbol/src/dsymbol/conversion/second.d
View File

@ -432,15 +432,29 @@ void resolveTypeFromInitializer(DSymbol* symbol, TypeLookup* lookup,
size_t i = 0; size_t i = 0;
auto crumbs = lookup.breadcrumbs[]; auto crumbs = lookup.breadcrumbs[];
auto bl = lookup.breadcrumbs.length;
bool isArray = lookup.breadcrumbs.back == ARRAY_LITERAL_SYMBOL_NAME || lookup.breadcrumbs.back == ARRAY_SYMBOL_NAME;
foreach (crumb; crumbs) foreach (crumb; crumbs)
{ {
if (i == 0) // if the function has a crumb, then it could be a templated function or a cast, we can use that to guess the its Type
if (i == 0 || (!isArray && (i > 0 && bl > 1)))
{ {
currentSymbol = moduleScope.getFirstSymbolByNameAndCursor( currentSymbol = moduleScope.getFirstSymbolByNameAndCursor(
symbolNameToTypeName(crumb), symbol.location); symbolNameToTypeName(crumb), symbol.location);
// check if the type was already known
if (i == bl-2 && currentSymbol !is null && currentSymbol.type !is null)
{
if (moduleScope.hasSymbolRecursive(currentSymbol.type))
break;
}
if (currentSymbol is null) if (currentSymbol is null)
return; continue;
else if (currentSymbol.type is null)
break; // this is a fully resolved type (casting)!
else if (currentSymbol.type.name == "void")
return; // it's void, no need to continue
} }
else else
if (crumb == ARRAY_LITERAL_SYMBOL_NAME) if (crumb == ARRAY_LITERAL_SYMBOL_NAME)
@ -506,9 +520,9 @@ void resolveTypeFromInitializer(DSymbol* symbol, TypeLookup* lookup,
currentSymbol = currentSymbol.getFirstPartNamed(crumb); currentSymbol = currentSymbol.getFirstPartNamed(crumb);
} }
++i; ++i;
if (currentSymbol is null)
return;
} }
if (currentSymbol is null)
return;
typeSwap(currentSymbol); typeSwap(currentSymbol);
symbol.type = currentSymbol; symbol.type = currentSymbol;
symbol.ownType = false; symbol.ownType = false;