summaryrefslogtreecommitdiffstats
path: root/src/docparser.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-09-03 20:22:39 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-09-03 20:22:39 (GMT)
commit808b6174027ae53083aab386a7bc0eecc72c7a0d (patch)
treed9f1c877d48778b3d0a5f112d62c6d6f3ad54372 /src/docparser.cpp
parentdf2763693ccbacb3c62b9e9956494d6742fcbd9d (diff)
parentfff03ab9adcbdf480929c6a10975cab469eaf17c (diff)
downloadDoxygen-808b6174027ae53083aab386a7bc0eecc72c7a0d.zip
Doxygen-808b6174027ae53083aab386a7bc0eecc72c7a0d.tar.gz
Doxygen-808b6174027ae53083aab386a7bc0eecc72c7a0d.tar.bz2
Merge pull request #217 from albert-github/feature/bug_735745
Bug 735745 - Spurious ASSERT message
Diffstat (limited to 'src/docparser.cpp')
-rw-r--r--src/docparser.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 144dd24..b21c15c 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -4671,12 +4671,15 @@ int DocParamList::parse(const QCString &cmdName)
DBG(("DocParamList::parse() start\n"));
g_nodeStack.push(this);
DocPara *par=0;
+ QCString saveCmdName = cmdName;
int tok=doctokenizerYYlex();
if (tok!=TK_WHITESPACE)
{
warn_doc_error(g_fileName,doctokenizerYYlineno,"expected whitespace after %s command",
qPrint(cmdName));
+ retval=0;
+ goto endparamlist;
}
doctokenizerYYsetStateParam();
tok=doctokenizerYYlex();
@@ -4716,7 +4719,13 @@ int DocParamList::parse(const QCString &cmdName)
retval=0;
goto endparamlist;
}
- ASSERT(tok==TK_WHITESPACE);
+ if (tok!=TK_WHITESPACE) /* premature end of comment block */
+ {
+ warn_doc_error(g_fileName,doctokenizerYYlineno,"unexpected token in comment block while parsing the "
+ "argument of command %s",qPrint(saveCmdName));
+ retval=0;
+ goto endparamlist;
+ }
par = new DocPara(this);
m_paragraphs.append(par);