diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-01-04 18:04:42 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-01-04 18:04:42 (GMT) |
| commit | 2ed3d33a92dbcdf0a0149c5f06909926e44cdebd (patch) | |
| tree | be3788c007ca3787c2cad6794c39243b85c124c7 /src | |
| parent | 8cfac90d6c8632436db1a6b650a05a8dfcfab5d0 (diff) | |
| download | Doxygen-2ed3d33a92dbcdf0a0149c5f06909926e44cdebd.zip Doxygen-2ed3d33a92dbcdf0a0149c5f06909926e44cdebd.tar.gz Doxygen-2ed3d33a92dbcdf0a0149c5f06909926e44cdebd.tar.bz2 | |
Fixed issues with @parblock and added regression test case
Diffstat (limited to 'src')
| -rw-r--r-- | src/commentscan.l | 5 | ||||
| -rw-r--r-- | src/docparser.cpp | 4 | ||||
| -rw-r--r-- | src/doctokenizer.l | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index 0d08e5c..2170dc2 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -2403,6 +2403,11 @@ static bool handleParBlock(const QCString &) warn(yyFileName,yyLineNr, "found \\parblock command while already in a parblock!"); } + if (!g_spaceBeforeCmd.isEmpty()) + { + addOutput(g_spaceBeforeCmd); + g_spaceBeforeCmd.resize(0); + } addOutput("@parblock "); g_insideParBlock = TRUE; return FALSE; diff --git a/src/docparser.cpp b/src/docparser.cpp index e1e750f..7e34ad0 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -4945,6 +4945,10 @@ int DocParamSect::parse(const QCString &cmdName,bool xmlContext, Direction d) { retval = pl->parse(cmdName); } + if (retval==RetVal_EndParBlock) + { + retval = RetVal_OK; + } DBG(("DocParamSect::parse() end retval=%d\n",retval)); DocNode *n=g_nodeStack.pop(); diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 5ba1a72..6d521d9 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -1024,7 +1024,7 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{LNKWORD2} g_token->name = types+"#"+params.mid(i); return TK_WORD; } -<St_Param>[^ \t\n,]+ { +<St_Param>[^ \t\n,@\\]+ { g_token->name = yytext; if (g_token->name.at(yyleng-1)==':') { |