jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added tests for HTML tags, bugs in HTML tags fixed

Browse source
This commit is contained in:
Marko Klopcic 2013-01-18 21:21:12 +01:00
commit 13d2dad679
6 changed files with 233 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/DoxygenTranslator/src/DoxygenParser.cpp
View file

@ -178,6 +178,21 @@ void DoxygenParser::skipWhitespaceTokens()
}
std::string DoxygenParser::getNextToken() {
if (m_tokenListIt == m_tokenList.end()) {
return "";
}
if (m_tokenListIt->m_tokenType == PLAINSTRING) {
return (m_tokenListIt++)->m_tokenString;
}
return "";
}
std::string DoxygenParser::getNextWord() {
/* if (m_tokenListIt == m_tokenList.end()) {
@ -582,7 +597,7 @@ int DoxygenParser::addCommandHtml(const std::string &theCommand,
if (noisy)
cout << "Parsing " << theCommand << endl;
std::string htmlTagArgs = getNextWord();
std::string htmlTagArgs = getNextToken();
doxyList.push_back(DoxygenEntity(theCommand, htmlTagArgs));
return 1;
}
@ -1201,7 +1216,7 @@ size_t DoxygenParser::processNormalComment(size_t pos, const std::string &line)
pos++;
}
size_t endHtmlPos = line.find_first_of("\t\n >", pos);
size_t endHtmlPos = line.find_first_of("\t >", pos);
// prepend '<' to distinguish HTML tags from doxygen commands
string cmd = line.substr(pos, endHtmlPos - pos);
@ -1223,6 +1238,7 @@ size_t DoxygenParser::processNormalComment(size_t pos, const std::string &line)
// add args of HTML command, like link URL, image URL, ...
m_tokenList.push_back(Token(PLAINSTRING,
line.substr(pos, endHtmlPos - pos)));
pos = endHtmlPos;
} else {
if (isEndHtmlTag) {
// it is a simple tag, so push empty string