summaryrefslogtreecommitdiffstats
path: root/src/doc.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-10-06 19:08:54 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-10-06 19:08:54 (GMT)
commiteb9911da9adbb91449d7fcad9bbc33a8152e1727 (patch)
treec1062a06b0267bdf027f00efb00f1fb2b70db5c5 /src/doc.l
parent5ed55684b0226c2371f1d39cd7f984da44c9ccb1 (diff)
downloadDoxygen-eb9911da9adbb91449d7fcad9bbc33a8152e1727.zip
Doxygen-eb9911da9adbb91449d7fcad9bbc33a8152e1727.tar.gz
Doxygen-eb9911da9adbb91449d7fcad9bbc33a8152e1727.tar.bz2
Release-1.2.18-20021006
Diffstat (limited to 'src/doc.l')
-rw-r--r--src/doc.l50
1 files changed, 32 insertions, 18 deletions
diff --git a/src/doc.l b/src/doc.l
index 2ce0a96..2fe980f 100644
--- a/src/doc.l
+++ b/src/doc.l
@@ -347,7 +347,7 @@ static void includeFile(OutputDocInterface &od,const char *fileName,bool quiet)
FileDef *fd;
if ((fd=findFileDef(Doxygen::exampleNameDict,fileName,ambig)))
{
- currentIncludeFile=fileToString(fd->absFilePath());
+ currentIncludeFile=fileToString(fd->absFilePath(),Config_getBool("FILTER_SOURCE_FILES"));
includeFileOffset=0;
includeFileLength=currentIncludeFile.length();
OutputDocInterface *codeFrag = od.clone();
@@ -384,7 +384,7 @@ static void verbIncludeFile(OutputDocInterface &od,const char *name)
if ((fd=findFileDef(Doxygen::exampleNameDict,name,ambig)))
{
od.startCodeFragment();
- od.codify(fileToString(fd->absFilePath())+"\n");
+ od.codify(fileToString(fd->absFilePath(),Config_getBool("FILTER_SOURCE_FILES"))+"\n");
od.endCodeFragment();
}
else if (ambig)
@@ -2959,7 +2959,7 @@ void parseDoc(OutputDocInterface &od,const char *fileName,int startLine,
if (Debug::isFlagSet(Debug::Validate))
{
- od.parseDoc(fileName,startLine,clName,md,docStr);
+ od.parseDoc(fileName,startLine,clName,md,docStr,FALSE);
}
else
{
@@ -3029,15 +3029,22 @@ void parseDoc(OutputDocInterface &od,const char *fileName,int startLine,
void parseText(OutputDocInterface &od,const QCString &txtString)
{
if (txtString.isEmpty()) return;
- inputString = txtString;
- outDoc = od.clone();
- inputPosition = 0;
- docYYrestart( docYYin );
- BEGIN( Text );
- docYYlex();
- od.append(outDoc);
- delete outDoc; outDoc=0;
- return;
+ if (Debug::isFlagSet(Debug::Validate))
+ {
+ od.parseText(txtString);
+ }
+ else
+ {
+ inputString = txtString;
+ outDoc = od.clone();
+ inputPosition = 0;
+ docYYrestart( docYYin );
+ BEGIN( Text );
+ docYYlex();
+ od.append(outDoc);
+ delete outDoc; outDoc=0;
+ return;
+ }
}
//----------------------------------------------------------------------------
@@ -3045,12 +3052,19 @@ void parseText(OutputDocInterface &od,const QCString &txtString)
void parseExample(OutputDocInterface &od,const QCString &docString,
const char *fileName)
{
- initParser();
- initParseCodeContext();
- exampleDoc=TRUE; // cross reference with member docs
- exampleName=fileName;
- strcpy(yyFileName,fileName);
- parseDocument(od,docString);
+ if (Debug::isFlagSet(Debug::Validate))
+ {
+ od.parseDoc(fileName,/*startLine*/1,/*clName*/0,/*md*/0,docString,TRUE);
+ }
+ else
+ {
+ initParser();
+ initParseCodeContext();
+ exampleDoc=TRUE; // cross reference with member docs
+ exampleName=fileName;
+ strcpy(yyFileName,fileName);
+ parseDocument(od,docString);
+ }
}
//----------------------------------------------------------------------------