summaryrefslogtreecommitdiffstats
path: root/src/doc.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-08-04 20:55:47 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-08-04 20:55:47 (GMT)
commit2e2f09d60ce079a1fe283e47bcf023de01f051c5 (patch)
tree8e54169bc0b7214246ec4c1dfe3f58228ef12928 /src/doc.l
parentadac91e9a353095c3bae4b580d27b7cfd8617493 (diff)
downloadDoxygen-2e2f09d60ce079a1fe283e47bcf023de01f051c5.zip
Doxygen-2e2f09d60ce079a1fe283e47bcf023de01f051c5.tar.gz
Doxygen-2e2f09d60ce079a1fe283e47bcf023de01f051c5.tar.bz2
Release-1.2.17-20020804
Diffstat (limited to 'src/doc.l')
-rw-r--r--src/doc.l57
1 files changed, 45 insertions, 12 deletions
diff --git a/src/doc.l b/src/doc.l
index 33886db..e7eeb6d 100644
--- a/src/doc.l
+++ b/src/doc.l
@@ -30,6 +30,10 @@
#include <qstack.h>
#include <qregexp.h>
+// new experimental parser
+#include "docparser.h"
+#include "debug.h"
+
#include "doc.h"
#include "code.h"
#include "message.h"
@@ -103,6 +107,8 @@ static QCString curDotFileCaption;
static QCString internalRefFile;
static QCString internalRefAnchor;
static QCString caption;
+static QCString refItemText;
+static QCString addIndexWord;
static QStack<char> currentListIndent; // indent stack of all list items
static bool insideItemList = FALSE;
@@ -1438,6 +1444,7 @@ LINKMASK [a-z_A-Z0-9:#.,~&*/\[\]<>()\-\+]+({B}*("const"|"volatile"))?
);
}
<DocScan>{CMD}"addindex"{B}+ {
+ addIndexWord.resize(0);
BEGIN(DocIndexWord);
}
<DocScan>"\\form#"[0-9]+ {
@@ -1449,9 +1456,17 @@ LINKMASK [a-z_A-Z0-9:#.,~&*/\[\]<>()\-\+]+({B}*("const"|"volatile"))?
outDoc->writeFormula(formName,formula->getFormulaText());
}
}
-<DocIndexWord>[^\n]+ {
+<DocIndexWord>"\\&" { addIndexWord+='&'; }
+<DocIndexWord>"\\>" { addIndexWord+='>'; }
+<DocIndexWord>"\\<" { addIndexWord+='<'; }
+<DocIndexWord>"\\@" { addIndexWord+='@'; }
+<DocIndexWord>"\\$" { addIndexWord+='$'; }
+<DocIndexWord>"\\#" { addIndexWord+='#'; }
+<DocIndexWord>"\\\\" { addIndexWord+='\\'; }
+<DocIndexWord>. { addIndexWord+=*yytext; }
+<DocIndexWord>\n {
//printf("Adding %s to index\n",yytext);
- outDoc->addIndexItem(yytext,0);
+ outDoc->addIndexItem(addIndexWord,0);
BEGIN(DocScan);
}
<DocScan>{CMD}("arg"|"li")/{BN} {
@@ -1768,7 +1783,7 @@ LINKMASK [a-z_A-Z0-9:#.,~&*/\[\]<>()\-\+]+({B}*("const"|"volatile"))?
if (inBlock()) endBlock();
inReturnBlock=TRUE;
currentListIndent.push("P");
- outDoc->startSimpleSect(BaseOutputDocInterface::Return,0,0,theTranslator->trReturns()+" :");
+ outDoc->startSimpleSect(BaseOutputDocInterface::Return,0,0,theTranslator->trReturns()+":");
outDoc->writeDescItem();
}
}
@@ -1881,7 +1896,7 @@ LINKMASK [a-z_A-Z0-9:#.,~&*/\[\]<>()\-\+]+({B}*("const"|"volatile"))?
outDoc->startDescTableData();
BEGIN(DocScan);
}
-<DocScan>{CMD}"section "{ID}"\n" {
+<DocScan>{CMD}"section "{ID}" " {
QCString secName=&yytext[9]; // skip "\section "
secName=secName.left(secName.length()-1); // remove \n
//printf("SectionName %s found\n",secName.data());
@@ -1889,18 +1904,16 @@ LINKMASK [a-z_A-Z0-9:#.,~&*/\[\]<>()\-\+]+({B}*("const"|"volatile"))?
if ((sec=Doxygen::sectionDict[secName]))
{
//printf("Title %s\n",sec->title.data());
- outDoc->startSection(sec->label,sec->title,
- sec->type==SectionInfo::Subsection);
+ outDoc->startSection(sec->label,sec->title,sec->type);
scanString(sec->title);
- outDoc->endSection(sec->label,
- sec->type==SectionInfo::Subsection);
+ outDoc->endSection(sec->label,sec->type);
}
else
{
warn(yyFileName,yyLineNr,"Warning: reference to unknown section %s in the documentation of this entity!",yytext);
}
}
-<DocScan>{CMD}"anchor "{ID}"\n" {
+<DocScan>{CMD}"anchor "{ID}" " {
QCString secName=&yytext[8];
secName=secName.left(secName.length()-1);
SectionInfo *sec;
@@ -1934,6 +1947,12 @@ LINKMASK [a-z_A-Z0-9:#.,~&*/\[\]<>()\-\+]+({B}*("const"|"volatile"))?
<DocScan>{CMD}"ref"/{BN} {
BEGIN(DocRefName);
}
+<DocScan>{CMD}"secreflist"/{BN} {
+ outDoc->startSectionRefList();
+ }
+<DocScan>{CMD}"endsecreflist"/{BN} {
+ outDoc->endSectionRefList();
+ }
<DocScan>{CMD}"refitem"/{BN} {
BEGIN(DocRefItem);
}
@@ -2036,14 +2055,22 @@ LINKMASK [a-z_A-Z0-9:#.,~&*/\[\]<>()\-\+]+({B}*("const"|"volatile"))?
}
<DocRefItem>{ID} {
sectionRef=yytext;
+ refItemText.resize(0);
BEGIN(DocRefItemName);
}
-<DocRefItemName>.*/"\n" {
+<DocRefItemName>"\\&" { refItemText+='&'; }
+<DocRefItemName>"\\>" { refItemText+='>'; }
+<DocRefItemName>"\\<" { refItemText+='<'; }
+<DocRefItemName>"\\@" { refItemText+='@'; }
+<DocRefItemName>"\\$" { refItemText+='$'; }
+<DocRefItemName>"\\#" { refItemText+='#'; }
+<DocRefItemName>"\\\\" { refItemText+='\\'; }
+<DocRefItemName>. { refItemText+=*yytext; }
+<DocRefItemName>\n {
SectionInfo *sec;
- QCString text=yytext;
if ((sec=Doxygen::sectionDict[sectionRef]))
{
- outDoc->writeSectionRefItem(sec->fileName,sec->label,text.stripWhiteSpace());
+ outDoc->writeSectionRefItem(sec->fileName,sec->label,refItemText.stripWhiteSpace());
}
else
{
@@ -2917,6 +2944,12 @@ void resolveCopyDocCommands(const char *scope,QCString &docString)
void parseDoc(OutputDocInterface &od,const char *fileName,int startLine,
const char *clName,MemberDef *md,const QCString &docStr)
{
+
+ if (Debug::isFlagSet(Debug::Validate))
+ {
+ validatingParseDoc(fileName,startLine,docStr);
+ }
+
strcpy(yyFileName,fileName);
yyLineNr = startLine;