Skip to content

Commit 580cd6a

Browse files
committed
Fixed problem handling recursive aliases
1 parent a1f16f3 commit 580cd6a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/aliases.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,13 +451,13 @@ static QCString expandAliasRec(StringUnorderedSet &aliasesProcessed,const QCStri
451451
//printf("Alias %s not found\n",qPrint(cmd));
452452
}
453453
//printf("Found command s='%s' cmd='%s' numArgs=%d args='%s'\n", qPrint(s),qPrint(cmd),selectedNumArgs,qPrint(args));
454-
if ((allowRecursion || aliasesProcessed.find(cmd.str())==aliasesProcessed.end()) &&
454+
std::string qualifiedName = cmd.str()+":"+std::to_string(selectedNumArgs);
455+
if ((allowRecursion || aliasesProcessed.find(qualifiedName)==aliasesProcessed.end()) &&
455456
it!=g_aliasInfoMap.end() && selectedNumArgs!=-1 &&
456457
it->second.find(selectedNumArgs)!=it->second.end()) // expand the alias
457458
{
458459
const auto &aliasInfo = it->second.find(selectedNumArgs)->second;
459460
//printf("is an alias with separator='%s' hasArgs=%d!\n",qPrint(aliasInfo.separator),hasArgs);
460-
std::string qualifiedName = cmd.str()+":"+std::to_string(selectedNumArgs);
461461
if (!allowRecursion) aliasesProcessed.insert(qualifiedName);
462462
std::string val = aliasInfo.value;
463463
if (hasArgs)

0 commit comments

Comments
 (0)