Commit 7d9d4320 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Bug 734727 - GENERATE_TAGFILE no longer includes any @*section links

parent 14f88af1

src/commentscan.l

+4 −4
Original line number Original line Diff line number Diff line
@@ -665,11 +665,11 @@ static void addSection() 
  {

  {

    if (si->lineNr != -1)

    if (si->lineNr != -1)

    {

    {

      warn(yyFileName,yyLineNr,"multiple use of section label '%s', (first occurrence: %s, line %d)",g_sectionLabel.data(),si->fileName.data(),si->lineNr);

      warn(yyFileName,yyLineNr,"multiple use of section label '%s' while adding section, (first occurrence: %s, line %d)",g_sectionLabel.data(),si->fileName.data(),si->lineNr);

    }

    }

    else

    else

    {

    {

      warn(yyFileName,yyLineNr,"multiple use of section label '%s', (first occurrence: %s)",g_sectionLabel.data(),si->fileName.data());

      warn(yyFileName,yyLineNr,"multiple use of section label '%s' while adding section, (first occurrence: %s)",g_sectionLabel.data(),si->fileName.data());

    }

    }

  }

  }

  else

  else
@@ -1745,11 +1745,11 @@ RCSTAG "$"{ID}":"[^\n$]+"$" 
                                          {

                                          {

                                            if (si->lineNr != -1)

                                            if (si->lineNr != -1)

                                            {

                                            {

                                              warn(yyFileName,yyLineNr,"multiple use of section label '%s', (first occurrence: %s, line %d)",yytext,si->fileName.data(),si->lineNr);

                                              warn(yyFileName,yyLineNr,"multiple use of section label '%s' while adding anchor, (first occurrence: %s, line %d)",yytext,si->fileName.data(),si->lineNr);

                                            }

                                            }

                                            else

                                            else

                                            {

                                            {

                                              warn(yyFileName,yyLineNr,"multiple use of section label '%s', (first occurrence: %s)",yytext,si->fileName.data());

                                              warn(yyFileName,yyLineNr,"multiple use of section label '%s' while adding anchor, (first occurrence: %s)",yytext,si->fileName.data());

                                            }

                                            }

                                          }

                                          }

                                          else

                                          else

src/definition.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -515,7 +515,7 @@ void Definition::writeDocAnchorsToTagFile() 
{

{

  if (!Config_getString("GENERATE_TAGFILE").isEmpty() && m_impl->sectionDict)

  if (!Config_getString("GENERATE_TAGFILE").isEmpty() && m_impl->sectionDict)

  {

  {

    //printf("%s: writeDocAnchorsToTagFile(%d)\n",name().data(),m_sectionDict->count());

    //printf("%s: writeDocAnchorsToTagFile(%d)\n",name().data(),m_impl->sectionDict->count());

    SDict<SectionInfo>::Iterator sdi(*m_impl->sectionDict);

    SDict<SectionInfo>::Iterator sdi(*m_impl->sectionDict);

    SectionInfo *si;

    SectionInfo *si;

    for (;(si=sdi.current());++sdi)

    for (;(si=sdi.current());++sdi)

src/doxygen.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -8653,11 +8653,11 @@ static void findMainPage(EntryNav *rootNav) 
      {

      {

        if (si->lineNr != -1)

        if (si->lineNr != -1)

        {

        {

          warn(root->fileName,root->startLine,"multiple use of section label '%s', (first occurrence: %s, line %d)",Doxygen::mainPage->name().data(),si->fileName.data(),si->lineNr);

          warn(root->fileName,root->startLine,"multiple use of section label '%s' for main page, (first occurrence: %s, line %d)",Doxygen::mainPage->name().data(),si->fileName.data(),si->lineNr);

        }

        }

        else

        else

        {

        {

          warn(root->fileName,root->startLine,"multiple use of section label '%s', (first occurrence: %s)",Doxygen::mainPage->name().data(),si->fileName.data());

          warn(root->fileName,root->startLine,"multiple use of section label '%s' for main page, (first occurrence: %s)",Doxygen::mainPage->name().data(),si->fileName.data());

        }

        }

      }

      }

      else

      else

src/tagreader.cpp

+13 −11
Original line number Original line Diff line number Diff line
@@ -1430,6 +1430,8 @@ void TagFileParser::buildLists(Entry *root) 
  QListIterator<TagPageInfo> pgit(m_tagFilePages);

  QListIterator<TagPageInfo> pgit(m_tagFilePages);

  TagPageInfo *tpi;

  TagPageInfo *tpi;

  for (pgit.toFirst();(tpi=pgit.current());++pgit)

  for (pgit.toFirst();(tpi=pgit.current());++pgit)

  {

    if (tpi->filename!="index") // skip mainpage, there can be only one (see bug734727)

    {

    {

      Entry *pe    = new Entry;

      Entry *pe    = new Entry;

      pe->section  = Entry::PAGEDOC_SEC;

      pe->section  = Entry::PAGEDOC_SEC;
@@ -1440,10 +1442,10 @@ void TagFileParser::buildLists(Entry *root) 
      ti->tagName  = m_tagName;

      ti->tagName  = m_tagName;

      ti->fileName = tpi->filename;

      ti->fileName = tpi->filename;

      pe->tagInfo  = ti;

      pe->tagInfo  = ti;



      root->addSubEntry(pe);

      root->addSubEntry(pe);

    }

    }

  }

  }

}





void TagFileParser::addIncludes()

void TagFileParser::addIncludes()

{

{