diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-03-27 21:34:51 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 21:34:51 (GMT) |
| commit | 2e406f88cd4698e119944707d69a8984aa8d0108 (patch) | |
| tree | db28dbc3d5b8f5f133545426af580c6b1b017f7f /src | |
| parent | 39bdf31966fccdb8ab0bffb929c6d0a9a5894cb1 (diff) | |
| parent | 98302da8f020c339960617761a8e5a4dd602f5ca (diff) | |
| download | Doxygen-2e406f88cd4698e119944707d69a8984aa8d0108.zip Doxygen-2e406f88cd4698e119944707d69a8984aa8d0108.tar.gz Doxygen-2e406f88cd4698e119944707d69a8984aa8d0108.tar.bz2 | |
Merge pull request #7632 from albert-github/feature/bug_ftn_preproc
Fortran function definitions at begin of a line
Diffstat (limited to 'src')
| -rw-r--r-- | src/pre.l | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -380,6 +380,7 @@ struct preYY_state bool skip; QStack<CondCtx> condStack; bool insideCS; // C# has simpler preprocessor + bool insideFtn; bool isSource; yy_size_t fenceSize = 0; @@ -499,7 +500,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) && @@ -1715,6 +1716,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); } |