diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2010-11-18 21:50:39 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2010-11-18 21:50:39 (GMT) |
commit | 0014470c309dccbc2ac72c527391039900b8cf3d (patch) | |
tree | a6d2454b4e6d53003fa829bb7134fe373461ed97 /src/scanner.l | |
parent | 01f41c40b8505c8f197ef1e5bf7e3a3bc777dc0e (diff) | |
download | Doxygen-0014470c309dccbc2ac72c527391039900b8cf3d.zip Doxygen-0014470c309dccbc2ac72c527391039900b8cf3d.tar.gz Doxygen-0014470c309dccbc2ac72c527391039900b8cf3d.tar.bz2 |
Release-1.7.2-20101118
Diffstat (limited to 'src/scanner.l')
-rw-r--r-- | src/scanner.l | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/scanner.l b/src/scanner.l index be8f716..2fdf0f2 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -2099,7 +2099,12 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) yyLineNr = atoi(&yytext[1]); //printf("setting line number to %d\n",yyLineNr); lastPreLineCtrlContext = YY_START; - current->program+=yytext; + if (YY_START==ReadBody || + YY_START==ReadNSBody || + YY_START==ReadBodyIntf) + { + current->program+=yytext; + } BEGIN( PreLineCtrl ); } <PreLineCtrl>"\""[^\n\"]*"\"" { @@ -5553,6 +5558,15 @@ static void handleCommentBlock(const QCString &doc,bool brief) if (docBlockInBody && hideInBodyDocs) return; //printf("parseCommentBlock [%s] brief=%d\n",doc.data(),brief); int lineNr = brief ? current->briefLine : current->docLine; // line of block start + + // fill in inbodyFile && inbodyLine the first time, see bug 633891 + Entry *docEntry = docBlockInBody && previous ? previous : current; + if (docBlockInBody && docEntry && docEntry->inbodyLine==-1) + { + docEntry->inbodyFile = yyFileName; + docEntry->inbodyLine = lineNr; + } + while (parseCommentBlock( g_thisParser, docBlockInBody && previous ? previous : current, |