diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-03-28 12:24:49 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-03-28 12:24:49 (GMT) |
| commit | d5ea6889fb9fac1317b25412e01bf7d976de43f4 (patch) | |
| tree | 569e69da0c4c4b4dc1757529424c3fa2d5c14a9b /src | |
| parent | 1b071a1ac3bf0f5be8026a6f4ff61c05995b48b3 (diff) | |
| parent | 2e406f88cd4698e119944707d69a8984aa8d0108 (diff) | |
| download | Doxygen-d5ea6889fb9fac1317b25412e01bf7d976de43f4.zip Doxygen-d5ea6889fb9fac1317b25412e01bf7d976de43f4.tar.gz Doxygen-d5ea6889fb9fac1317b25412e01bf7d976de43f4.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
| -rw-r--r-- | src/fortranscanner.l | 3 | ||||
| -rw-r--r-- | src/pre.l | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/fortranscanner.l b/src/fortranscanner.l index df4941d..852c4d9 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -1496,7 +1496,6 @@ void truncatePrepass(yyscan_t yyscanner,int index) } // simplified way to know if this is fixed form -// duplicate in fortrancode.l bool recognizeFixedForm(const char* contents, FortranFormat format) { int column=0; @@ -1532,7 +1531,7 @@ bool recognizeFixedForm(const char* contents, FortranFormat format) break; default: if (skipLine) break; - if (column==7) return TRUE; + if (column>=7) return TRUE; return FALSE; } } @@ -381,6 +381,7 @@ struct preYY_state bool skip; QStack<CondCtx> condStack; bool insideCS; // C# has simpler preprocessor + bool insideFtn; bool isSource; yy_size_t fenceSize = 0; @@ -500,7 +501,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) name=name.left(name.find('(')).stripWhiteSpace(); Define *def=0; - if (skipFuncMacros && + if (skipFuncMacros && !yyextra->insideFtn && name!="Q_PROPERTY" && !( (yyextra->includeStack.isEmpty() || yyextra->curlyCount>0) && @@ -1716,6 +1717,7 @@ static void setFileName(yyscan_t yyscanner,const char *name) // name,state->yyFileName.data(),state->yyFileDef); if (state->yyFileDef && state->yyFileDef->isReference()) state->yyFileDef=0; state->insideCS = getLanguageFromFileName(state->yyFileName)==SrcLangExt_CSharp; + state->insideFtn = getLanguageFromFileName(state->yyFileName)==SrcLangExt_Fortran; state->isSource = guessSection(state->yyFileName); } |