diff options
Diffstat (limited to 'src/tagreader.cpp')
| -rw-r--r-- | src/tagreader.cpp | 148 |
1 files changed, 73 insertions, 75 deletions
diff --git a/src/tagreader.cpp b/src/tagreader.cpp index 3640f0e..275d66a 100644 --- a/src/tagreader.cpp +++ b/src/tagreader.cpp @@ -1,13 +1,13 @@ /****************************************************************************** * - * + * * * * Copyright (C) 1997-2015 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its - * documentation under the terms of the GNU General Public License is hereby - * granted. No representations are made about the suitability of this software + * documentation under the terms of the GNU General Public License is hereby + * granted. No representations are made about the suitability of this software * for any purpose. It is provided "as is" without express or implied warranty. * See the GNU General Public License for more details. * @@ -50,7 +50,7 @@ class TagAnchorInfo public: TagAnchorInfo(const QCString &f, const QCString &l, - const QCString &t=QCString()) + const QCString &t=QCString()) : label(l), fileName(f), title(t) {} QCString label; QCString fileName; @@ -60,7 +60,7 @@ class TagAnchorInfo /** List of TagAnchorInfo objects. */ class TagAnchorInfoList : public QList<TagAnchorInfo> { - public: + public: TagAnchorInfoList() : QList<TagAnchorInfo>() { setAutoDelete(TRUE); } virtual ~TagAnchorInfoList() {} }; @@ -79,7 +79,7 @@ class TagEnumValueInfo class TagMemberInfo { public: - TagMemberInfo() : prot(Public), virt(Normal), isStatic(FALSE) + TagMemberInfo() : prot(Public), virt(Normal), isStatic(FALSE) { enumValues.setAutoDelete(TRUE); } QCString type; QCString name; @@ -91,7 +91,7 @@ class TagMemberInfo TagAnchorInfoList docAnchors; Protection prot; Specifier virt; - bool isStatic; + bool isStatic; QList<TagEnumValueInfo> enumValues; }; @@ -207,10 +207,10 @@ class TagDirInfo TagAnchorInfoList docAnchors; }; -/** Tag file parser. +/** Tag file parser. * * Reads an XML-structured tagfile and builds up the structure in - * memory. The method buildLists() is used to transfer/translate + * memory. The method buildLists() is used to transfer/translate * the structures to the doxygen engine. */ class TagFileParser : public QXmlDefaultHandler @@ -229,7 +229,7 @@ class TagFileParser : public QXmlDefaultHandler }; class StartElementHandler { - typedef void (TagFileParser::*Handler)(const QXmlAttributes &attrib); + typedef void (TagFileParser::*Handler)(const QXmlAttributes &attrib); public: StartElementHandler(TagFileParser *parent, Handler h) : m_parent(parent), m_handler(h) {} void operator()(const QXmlAttributes &attrib) { (m_parent->*m_handler)(attrib); } @@ -240,7 +240,7 @@ class TagFileParser : public QXmlDefaultHandler class EndElementHandler { - typedef void (TagFileParser::*Handler)(); + typedef void (TagFileParser::*Handler)(); public: EndElementHandler(TagFileParser *parent, Handler h) : m_parent(parent), m_handler(h) {} void operator()() { (m_parent->*m_handler)(); } @@ -282,7 +282,7 @@ class TagFileParser : public QXmlDefaultHandler void warn(const char *fmt) { - ::warn(m_inputFileName,m_locator->lineNumber(),fmt); + ::warn(m_inputFileName,m_locator->lineNumber(),"%s", fmt); } void warn(const char *fmt,const char *s) { @@ -391,7 +391,7 @@ class TagFileParser : public QXmlDefaultHandler } if (isObjC=="yes" && m_curClass) { - m_curClass->isObjC = TRUE; + m_curClass->isObjC = TRUE; } } @@ -399,20 +399,20 @@ class TagFileParser : public QXmlDefaultHandler { switch (m_state) { - case InClass: m_tagFileClasses.append(m_curClass); - m_curClass=0; break; - case InFile: m_tagFileFiles.append(m_curFile); - m_curFile=0; break; - case InNamespace: m_tagFileNamespaces.append(m_curNamespace); - m_curNamespace=0; break; - case InGroup: m_tagFileGroups.append(m_curGroup); - m_curGroup=0; break; - case InPage: m_tagFilePages.append(m_curPage); - m_curPage=0; break; + case InClass: m_tagFileClasses.append(m_curClass); + m_curClass=0; break; + case InFile: m_tagFileFiles.append(m_curFile); + m_curFile=0; break; + case InNamespace: m_tagFileNamespaces.append(m_curNamespace); + m_curNamespace=0; break; + case InGroup: m_tagFileGroups.append(m_curGroup); + m_curGroup=0; break; + case InPage: m_tagFilePages.append(m_curPage); + m_curPage=0; break; case InDir: m_tagFileDirs.append(m_curDir); m_curDir=0; break; - case InPackage: m_tagFilePackages.append(m_curPackage); - m_curPackage=0; break; + case InPackage: m_tagFilePackages.append(m_curPackage); + m_curPackage=0; break; default: warn("tag 'compound' was not expected!"); } @@ -460,7 +460,7 @@ class TagFileParser : public QXmlDefaultHandler case InNamespace: m_curNamespace->members.append(m_curMember); break; case InGroup: m_curGroup->members.append(m_curMember); break; case InPackage: m_curPackage->members.append(m_curMember); break; - default: warn("Unexpected tag 'member' found"); break; + default: warn("Unexpected tag 'member' found"); break; } } @@ -484,7 +484,7 @@ class TagFileParser : public QXmlDefaultHandler void endEnumValue() { - m_curEnumValue->name = m_curString.stripWhiteSpace(); + m_curEnumValue->name = m_curString.stripWhiteSpace(); m_state = *m_stateStack.top(); m_stateStack.remove(); if (m_state==InMember) @@ -536,7 +536,7 @@ class TagFileParser : public QXmlDefaultHandler case InNamespace: m_curNamespace->classList.append(m_curString); break; case InGroup: m_curGroup->classList.append(m_curString); break; case InPackage: m_curPackage->classList.append(m_curString); break; - default: warn("Unexpected tag 'class' found"); break; + default: warn("Unexpected tag 'class' found"); break; } } @@ -547,7 +547,7 @@ class TagFileParser : public QXmlDefaultHandler case InNamespace: m_curNamespace->classList.append(m_curString); break; case InFile: m_curFile->namespaceList.append(m_curString); break; case InGroup: m_curGroup->namespaceList.append(m_curString); break; - default: warn("Unexpected tag 'namespace' found"); break; + default: warn("Unexpected tag 'namespace' found"); break; } } @@ -557,7 +557,7 @@ class TagFileParser : public QXmlDefaultHandler { case InGroup: m_curGroup->fileList.append(m_curString); break; case InDir: m_curDir->fileList.append(m_curString); break; - default: warn("Unexpected tag 'file' found"); break; + default: warn("Unexpected tag 'file' found"); break; } } @@ -566,7 +566,7 @@ class TagFileParser : public QXmlDefaultHandler switch(m_state) { case InGroup: m_curGroup->fileList.append(m_curString); break; - default: warn("Unexpected tag 'page' found"); break; + default: warn("Unexpected tag 'page' found"); break; } } @@ -575,7 +575,7 @@ class TagFileParser : public QXmlDefaultHandler switch(m_state) { case InDir: m_curDir->subdirList.append(m_curString); break; - default: warn("Unexpected tag 'dir' found"); break; + default: warn("Unexpected tag 'dir' found"); break; } } @@ -595,7 +595,7 @@ class TagFileParser : public QXmlDefaultHandler { if (m_state==InMember) { - m_curMember->type = m_curString; + m_curMember->type = m_curString; } else { @@ -615,7 +615,7 @@ class TagFileParser : public QXmlDefaultHandler case InDir: m_curDir->name = m_curString; break; case InMember: m_curMember->name = m_curString; break; case InPackage: m_curPackage->name = m_curString; break; - default: warn("Unexpected tag 'name' found"); break; + default: warn("Unexpected tag 'name' found"); break; } } @@ -687,7 +687,7 @@ class TagFileParser : public QXmlDefaultHandler { if (m_state==InClass && m_curClass) { - if (m_curClass->templateArguments==0) + if (m_curClass->templateArguments==0) { m_curClass->templateArguments = new QList<QCString>; m_curClass->templateArguments->setAutoDelete(TRUE); @@ -711,7 +711,7 @@ class TagFileParser : public QXmlDefaultHandler case InPage: m_curPage->filename = m_curString; break; case InPackage: m_curPackage->filename = m_curString; break; case InDir: m_curDir->filename = m_curString; break; - default: warn("Unexpected tag 'filename' found"); break; + default: warn("Unexpected tag 'filename' found"); break; } } @@ -721,19 +721,19 @@ class TagFileParser : public QXmlDefaultHandler { case InFile: m_curFile->path = m_curString; break; case InDir: m_curDir->path = m_curString; break; - default: warn("Unexpected tag 'path' found"); break; + default: warn("Unexpected tag 'path' found"); break; } } - + void endAnchor() { if (m_state==InMember) { - m_curMember->anchor = m_curString; + m_curMember->anchor = m_curString; } else if (m_state==InClass) { - m_curClass->anchor = m_curString; + m_curClass->anchor = m_curString; } else { @@ -745,7 +745,7 @@ class TagFileParser : public QXmlDefaultHandler { if (m_state==InMember) { - m_curMember->clangId = m_curString; + m_curMember->clangId = m_curString; } else if (m_state==InClass) { @@ -762,24 +762,24 @@ class TagFileParser : public QXmlDefaultHandler } - + void endAnchorFile() { if (m_state==InMember) { - m_curMember->anchorFile = m_curString; + m_curMember->anchorFile = m_curString; } else { warn("Unexpected tag 'anchorfile' found"); } } - + void endArglist() { if (m_state==InMember) { - m_curMember->arglist = m_curString; + m_curMember->arglist = m_curString; } else { @@ -792,7 +792,7 @@ class TagFileParser : public QXmlDefaultHandler { case InGroup: m_curGroup->title = m_curString; break; case InPage: m_curPage->title = m_curString; break; - default: warn("Unexpected tag 'title' found"); break; + default: warn("Unexpected tag 'title' found"); break; } } @@ -888,7 +888,7 @@ class TagFileParser : public QXmlDefaultHandler return TRUE; } - bool startElement( const QString&, const QString&, + bool startElement( const QString&, const QString&, const QString&name, const QXmlAttributes& attrib ) { //printf("startElement '%s'\n",name.data()); @@ -897,7 +897,7 @@ class TagFileParser : public QXmlDefaultHandler { (*handler)(attrib); } - else + else { warn("Unknown tag '%s' found!",name.data()); } @@ -912,14 +912,14 @@ class TagFileParser : public QXmlDefaultHandler { (*handler)(); } - else + else { warn("Unknown tag '%s' found!",name.data()); } return TRUE; } - bool characters ( const QString & ch ) + bool characters ( const QString & ch ) { m_curString+=ch.utf8(); return TRUE; @@ -928,7 +928,7 @@ class TagFileParser : public QXmlDefaultHandler void dump(); void buildLists(const std::shared_ptr<Entry> &root); void addIncludes(); - + private: void buildMemberList(const std::shared_ptr<Entry> &ce,QList<TagMemberInfo> &members); void addDocAnchors(const std::shared_ptr<Entry> &e,const TagAnchorInfoList &l); @@ -961,7 +961,7 @@ class TagFileParser : public QXmlDefaultHandler QCString m_inputFileName; }; -/** Error handler for the XML tag file parser. +/** Error handler for the XML tag file parser. * * Basically dumps all fatal error to stderr using err(). */ @@ -1026,8 +1026,8 @@ void TagFileParser::dump() msg("namespace '%s'\n",nd->name.data()); msg(" filename '%s'\n",nd->filename.data()); QCStringList::Iterator it; - for ( it = nd->classList.begin(); - it != nd->classList.end(); ++it ) + for ( it = nd->classList.begin(); + it != nd->classList.end(); ++it ) { msg( " class: %s \n", (*it).data() ); } @@ -1051,13 +1051,13 @@ void TagFileParser::dump() msg("file '%s'\n",fd->name.data()); msg(" filename '%s'\n",fd->filename.data()); QCStringList::Iterator it; - for ( it = fd->namespaceList.begin(); - it != fd->namespaceList.end(); ++it ) + for ( it = fd->namespaceList.begin(); + it != fd->namespaceList.end(); ++it ) { msg( " namespace: %s \n", (*it).data() ); } - for ( it = fd->classList.begin(); - it != fd->classList.end(); ++it ) + for ( it = fd->classList.begin(); + it != fd->classList.end(); ++it ) { msg( " class: %s \n", (*it).data() ); } @@ -1089,28 +1089,28 @@ void TagFileParser::dump() msg("group '%s'\n",gd->name.data()); msg(" filename '%s'\n",gd->filename.data()); QCStringList::Iterator it; - for ( it = gd->namespaceList.begin(); - it != gd->namespaceList.end(); ++it ) + for ( it = gd->namespaceList.begin(); + it != gd->namespaceList.end(); ++it ) { msg( " namespace: %s \n", (*it).data() ); } - for ( it = gd->classList.begin(); - it != gd->classList.end(); ++it ) + for ( it = gd->classList.begin(); + it != gd->classList.end(); ++it ) { msg( " class: %s \n", (*it).data() ); } - for ( it = gd->fileList.begin(); - it != gd->fileList.end(); ++it ) + for ( it = gd->fileList.begin(); + it != gd->fileList.end(); ++it ) { msg( " file: %s \n", (*it).data() ); } - for ( it = gd->subgroupList.begin(); - it != gd->subgroupList.end(); ++it ) + for ( it = gd->subgroupList.begin(); + it != gd->subgroupList.end(); ++it ) { msg( " subgroup: %s \n", (*it).data() ); } - for ( it = gd->pageList.begin(); - it != gd->pageList.end(); ++it ) + for ( it = gd->pageList.begin(); + it != gd->pageList.end(); ++it ) { msg( " page: %s \n", (*it).data() ); } @@ -1143,13 +1143,13 @@ void TagFileParser::dump() msg("dir '%s'\n",dd->name.data()); msg(" path '%s'\n",dd->path.data()); QCStringList::Iterator it; - for ( it = dd->fileList.begin(); - it != dd->fileList.end(); ++it ) + for ( it = dd->fileList.begin(); + it != dd->fileList.end(); ++it ) { msg( " file: %s \n", (*it).data() ); } - for ( it = dd->subdirList.begin(); - it != dd->subdirList.end(); ++it ) + for ( it = dd->subdirList.begin(); + it != dd->subdirList.end(); ++it ) { msg( " subdir: %s \n", (*it).data() ); } @@ -1310,7 +1310,7 @@ static QCString stripPath(const QCString &s) } /*! Injects the info gathered by the XML parser into the Entry tree. - * This tree contains the information extracted from the input in a + * This tree contains the information extracted from the input in a * "unrelated" form. */ void TagFileParser::buildLists(const std::shared_ptr<Entry> &root) @@ -1561,5 +1561,3 @@ void parseTagFile(const std::shared_ptr<Entry> &root,const char *fullName) handler.addIncludes(); //handler.dump(); } - - |