issue doxygen#11758 Const parameter in implementation can confuse function signature matching

Author: doxygen

src/doxygen.cpp

@@ -5675,6 +5675,9 @@ static const ClassDef *findClassDefinition(FileDef *fd,NamespaceDef *nd,
 {
   SymbolResolver resolver(fd);
   const ClassDef *tcd = resolver.resolveClass(nd,scopeName,true,true);
+  //printf("findClassDefinition(fd=%s,ns=%s,scopeName=%s)='%s'\n",
+  //    qPrint(fd?fd->name():""),qPrint(nd?nd->name():""),
+  //    qPrint(scopeName),qPrint(tcd?tcd->name():""));
   return tcd;
 }
 
@@ -6198,8 +6201,8 @@ static void addMemberFunction(const Entry *root,
       // don't be fooled by anonymous scopes
       tcd=cd;
     }
-    //printf("Looking for %s inside nd=%s result=%p (%s) cd=%p\n",
-    //    qPrint(scopeName),nd?qPrint(nd->name()):"<none>",tcd,tcd?qPrint(tcd->name()):"",cd);
+    //printf("Looking for %s inside nd=%s result=%s cd=%s\n",
+    //    qPrint(scopeName),nd?qPrint(nd->name()):"<none>",tcd?qPrint(tcd->name()):"",qPrint(cd->name()));
 
     if (cd && tcd==cd) // member's classes match
     {

src/symbolresolver.cpp

@@ -124,6 +124,7 @@ struct SymbolResolver::Private
     {
       m_fileScope = fileScope;
     }
+    const FileDef *fileScope() const { return m_fileScope; }
 
     QCString          resolvedType;
     const MemberDef  *typeDef = nullptr;
@@ -1204,7 +1205,8 @@ const Definition *SymbolResolver::Private::followPath(VisitedKeys &visitedKeys,
     // try to resolve the part if it is a typedef
     const MemberDef *memTypeDef=nullptr;
     QCString qualScopePart = substTypedef(visitedKeys,current,path.mid(is,l),&memTypeDef);
-    AUTO_TRACE_ADD("qualScopePart={}",qualScopePart);
+    AUTO_TRACE_ADD("qualScopePart={} memTypeDef={}",qualScopePart,memTypeDef?memTypeDef->name():"");
+    const Definition *next = nullptr;
     if (memTypeDef)
     {
       const ClassDef *type = newResolveTypedef(visitedKeys,m_fileScope,memTypeDef,nullptr,nullptr,nullptr);
@@ -1214,7 +1216,14 @@ const Definition *SymbolResolver::Private::followPath(VisitedKeys &visitedKeys,
         return type;
       }
     }
-    const Definition *next = current->findInnerCompound(qualScopePart);
+    else if (m_fileScope)
+    {
+      next = endOfPathIsUsedClass(m_fileScope->getUsedDefinitions(),qualScopePart);
+    }
+    if (next==nullptr)
+    {
+      next = current->findInnerCompound(qualScopePart);
+    }
     AUTO_TRACE_ADD("Looking for {} inside {} result={}",
         qualScopePart, current->name(), next?next->name():QCString());
     if (next==nullptr)
@@ -1622,7 +1631,9 @@ const ClassDef *SymbolResolver::resolveClass(const Definition *scope,
       scope?scope->name():QCString(), name, mayBeUnlinkable, mayBeHidden);
   p->reset();
 
-  auto lang = scope ? scope->getLanguage() : SrcLangExt::Cpp;
+  auto lang = scope ? scope->getLanguage() :
+          p->fileScope() ? p->fileScope()->getLanguage() :
+          SrcLangExt::Cpp;  // fallback to C++
 
   if (scope==nullptr ||
       (scope->definitionType()!=Definition::TypeClass &&

src/util.cpp

@@ -4847,28 +4847,6 @@ QCString stripExtension(const QCString &fName)
   return stripExtensionGeneral(fName, Doxygen::htmlFileExtension);
 }
 
-#if 0
-void replaceNamespaceAliases(QCString &scope,size_t i)
-{
-  printf("replaceNamespaceAliases(%s,%zu)\n",qPrint(scope),i);
-  while (i>0)
-  {
-    QCString ns = scope.left(i);
-    if (!ns.isEmpty())
-    {
-      auto it = Doxygen::namespaceAliasMap.find(ns.str());
-      if (it!=Doxygen::namespaceAliasMap.end())
-      {
-        scope=it->second+scope.right(scope.length()-i);
-        i=it->second.length();
-      }
-    }
-    if (i>0 && ns==scope.left(i)) break;
-  }
-  printf("result=%s\n",qPrint(scope));
-}
-#endif
-
 QCString stripPath(const QCString &s)
 {
   QCString result=s;

src/util.h

@@ -349,8 +349,6 @@ QCString stripExtensionGeneral(const QCString &fName, const QCString &ext);
 
 QCString stripExtension(const QCString &fName);
 
-//void replaceNamespaceAliases(QCString &scope,size_t i);
-
 int computeQualifiedIndex(const QCString &name);
 
 void addDirPrefix(QCString &fileName);