diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-03-15 15:50:07 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-03-15 15:50:07 (GMT) |
| commit | 941eea998d6b9608b8fc586069ef90e805d771f5 (patch) | |
| tree | 84b206b6d9fdcb807f7b4dade976c68035b34ed9 /src/fortranscanner.l | |
| parent | c1e25238950492e7f8a5c996e3d3ad41b9b023b0 (diff) | |
| download | Doxygen-941eea998d6b9608b8fc586069ef90e805d771f5.zip Doxygen-941eea998d6b9608b8fc586069ef90e805d771f5.tar.gz Doxygen-941eea998d6b9608b8fc586069ef90e805d771f5.tar.bz2 | |
Some restructuring and some compiler warning fixes
Diffstat (limited to 'src/fortranscanner.l')
| -rw-r--r-- | src/fortranscanner.l | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fortranscanner.l b/src/fortranscanner.l index e083b2d..f6616ad 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -1313,13 +1313,13 @@ void truncatePrepass(int index) // simplified way to know if this is fixed form // duplicate in fortrancode.l -static bool recognizeFixedForm(const char* contents, FortranKind codeType) +static bool recognizeFixedForm(const char* contents, FortranFormat format) { int column=0; bool skipLine=FALSE; - if (codeType == FORTRAN_FIXED) return TRUE; - if (codeType == FORTRAN_FREE) return FALSE; + if (format == FortranFormat_Fixed) return TRUE; + if (format == FortranFormat_Free) return FALSE; for(int i=0;;i++) { column++; @@ -2246,7 +2246,7 @@ level--; #endif -static void parseMain(const char *fileName,const char *fileBuf,Entry *rt, FortranKind codeType) +static void parseMain(const char *fileName,const char *fileBuf,Entry *rt, FortranFormat format) { char *tmpBuf = NULL; initParser(); @@ -2266,7 +2266,7 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt, Fortra inputFile.setName(fileName); if (inputFile.open(IO_ReadOnly)) { - isFixedForm = recognizeFixedForm(fileBuf,codeType); + isFixedForm = recognizeFixedForm(fileBuf,format); if (isFixedForm) { @@ -2345,7 +2345,7 @@ void FortranLanguageScanner::parseInput(const char *fileName, printlex(yy_flex_debug, TRUE, __FILE__, fileName); - ::parseMain(fileName,fileBuf,root,this->codeType); + ::parseMain(fileName,fileBuf,root,m_format); printlex(yy_flex_debug, FALSE, __FILE__, fileName); } @@ -2368,7 +2368,7 @@ void FortranLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf, { ::parseFortranCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName, fileDef,startLine,endLine,inlineFragment,memberDef, - showLineNumbers,searchCtx,collectXRefs,this->codeType); + showLineNumbers,searchCtx,collectXRefs,m_format); } bool FortranLanguageScanner::needsPreprocessing(const QCString &extension) |