summaryrefslogtreecommitdiffstats
path: root/src/commentscan.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2007-07-27 08:53:22 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2007-07-27 08:53:22 (GMT)
commit9343f07a41e764a904f2d8bef3dd6ac967b63989 (patch)
tree096d7be65663d2b1088aed9714e8047edf65961d /src/commentscan.l
parent0424762097d2a6393d3eed4e2e0a7f32041cfa50 (diff)
downloadDoxygen-9343f07a41e764a904f2d8bef3dd6ac967b63989.zip
Doxygen-9343f07a41e764a904f2d8bef3dd6ac967b63989.tar.gz
Doxygen-9343f07a41e764a904f2d8bef3dd6ac967b63989.tar.bz2
Release-1.5.3
Diffstat (limited to 'src/commentscan.l')
-rw-r--r--src/commentscan.l11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index 9a7f698..1b55244 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -272,7 +272,7 @@ class DocCmdMapper
{
if (m_map.find(p->cmdName)!=0)
{
- printf("Error: command %s already added\n",p->cmdName);
+ printf("Error: DocCmdMapper: command %s already added\n",p->cmdName);
exit(1);
}
Cmd *cmd = new Cmd;
@@ -687,7 +687,14 @@ static inline void setOutput(OutputContext ctx)
current->briefLine = yyLineNr;
}
}
- pOutputString = &current->brief;
+ if (current->brief.isEmpty())
+ {
+ pOutputString = &current->brief;
+ }
+ else
+ {
+ pOutputString = &current->doc;
+ }
break;
case OutputXRef:
pOutputString = &outputXRef;