issue doxygen#11614 Multiple occurrences of the same macro definition in a file result are assigned the same ID

Author: doxygen

src/doxygen.cpp

@@ -8831,6 +8831,15 @@ static void buildDefineList()
         MemberName *mn=Doxygen::functionNameLinkedMap->add(def.name);
         if (def.fileDef)
         {
+          const MemberList *defMl = def.fileDef->getMemberList(MemberListType::DocDefineMembers());
+          if (defMl)
+          {
+            const MemberDef *defMd = defMl->findRev(def.name);
+            if (defMd) // definition already stored
+            {
+              mmd->setRedefineCount(defMd->redefineCount()+1);
+            }
+          }
           def.fileDef->insertMember(md.get());
         }
         AUTO_TRACE_ADD("adding macro {} with definition {}",def.name,def.definition);

src/memberdef.cpp

@@ -354,6 +354,8 @@ class MemberDefImpl : public DefinitionMixin<MemberDefMutable>
     StringVector getQualifiers() const override;
     ClassDefMutable *getClassDefMutable() override;
     void setModuleDef(ModuleDef *mod) override;
+    int redefineCount() const override;
+    void setRedefineCount(int) override;
 
   private:
     void _computeLinkableInProject();
@@ -511,6 +513,7 @@ class MemberDefImpl : public DefinitionMixin<MemberDefMutable>
     int m_declLine = -1;
     int m_declColumn = -1;
     int m_numberOfFlowKW = 0;
+    int m_redefineCount = 0;
 };
 
 std::unique_ptr<MemberDef> createMemberDef(const QCString &defFileName,int defLine,int defColumn,
@@ -932,6 +935,8 @@ class MemberDefAliasImpl : public DefinitionAliasMixin<MemberDef>
     { return getMdAlias()->requiresClause(); }
     bool visibleInIndex() const override
     { return getMdAlias()->visibleInIndex(); }
+    int redefineCount() const override
+    { return getMdAlias()->redefineCount(); }
 
     void warnIfUndocumented() const override {}
     void warnIfUndocumentedParams() const override {}
@@ -4366,6 +4371,13 @@ void MemberDefImpl::setAnchor()
   {
     memAnchor+=" "+m_requiresClause;
   }
+  if (m_redefineCount>0)
+  {
+    char buf[20];
+    qsnprintf(buf,20,":%d",m_redefineCount);
+    buf[19]='\0';
+    memAnchor.append(buf);
+  }
 
   // convert to md5 hash
   uint8_t md5_sig[16];
@@ -6391,6 +6403,16 @@ CodeSymbolType MemberDefImpl::codeSymbolType() const
   return CodeSymbolType::Default;
 }
 
+int MemberDefImpl::redefineCount() const
+{
+  return m_redefineCount;
+}
+
+void MemberDefImpl::setRedefineCount(int count)
+{
+  m_redefineCount=count;
+}
+
 //-------------------------------------------------------------------------------
 // Helpers
 
@@ -6498,3 +6520,4 @@ MemberDefMutable *toMemberDefMutable(Definition *d)
   }
 }
 
+

src/memberdef.h

@@ -292,6 +292,7 @@ class MemberDef : public Definition
     virtual void warnIfUndocumented() const = 0;
     virtual void warnIfUndocumentedParams() const = 0;
     virtual bool visibleInIndex() const = 0;
+    virtual int redefineCount() const = 0;
 
     // TODO: this is not a getter, should be passed at construction
     virtual void setMemberGroup(MemberGroup *grp) = 0;
@@ -409,6 +410,9 @@ class MemberDefMutable : public DefinitionMutable, public MemberDef
 
     virtual void setModuleDef(ModuleDef *mod) = 0;
 
+    // macro redefinition
+    virtual void setRedefineCount(int count) = 0;
+
     //-----------------------------------------------------------------------------------
     // --- actions ----
     //-----------------------------------------------------------------------------------

src/memberlist.h

@@ -90,16 +90,32 @@ class MemberVector
     {
       return std::find(m_members.begin(),m_members.end(),md)!=m_members.end();
     }
-    MemberDef *find(const QCString &name)
+    const MemberDef *find(const QCString &name) const
     {
       auto it = std::find_if(m_members.begin(),m_members.end(),[name=name](auto &el) { return el->name()==name; });
       if (it != m_members.end())
       {
         return *it;
       }
-
       return nullptr;
     }
+    MemberDef *find(const QCString &name)
+    {
+      return const_cast<MemberDef *>(static_cast<const MemberVector *>(this)->find(name));
+    }
+    const MemberDef *findRev(const QCString &name) const
+    {
+      auto it = std::find_if(m_members.rbegin(),m_members.rend(),[name=name](auto &el) { return el->name()==name; });
+      if (it != m_members.rend())
+      {
+        return *it;
+      }
+      return nullptr;
+    }
+    MemberDef *findRev(const QCString &name)
+    {
+      return const_cast<MemberDef *>(static_cast<const MemberVector *>(this)->findRev(name));
+    }
   protected:
     Vec m_members;
 };