Skip to content

Commit c62e364

Browse files
author
Dimitri van Heesch
authored
Merge pull request doxygen#589 from albert-github/feature/bug_786409
Bug 786409 - parsing error in Fortran file with preprocessing
2 parents 723b04b + 2f5e22a commit c62e364

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

src/pre.l

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,6 +1984,11 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
19841984
g_defArgsStr+=*yytext;
19851985
BEGIN(ReadString);
19861986
}
1987+
<FindDefineArgs>' {
1988+
if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_Fortran) REJECT;
1989+
g_defArgsStr+=*yytext;
1990+
BEGIN(ReadString);
1991+
}
19871992
<FindDefineArgs>\n {
19881993
g_defArgsStr+=' ';
19891994
g_yyLineNr++;
@@ -2014,6 +2019,12 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
20142019
g_defArgsStr+=*yytext;
20152020
BEGIN(FindDefineArgs);
20162021
}
2022+
<ReadString>"'" {
2023+
if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_Fortran) REJECT;
2024+
g_defArgsStr+=*yytext;
2025+
BEGIN(FindDefineArgs);
2026+
}
2027+
20172028
<ReadString>"//"|"/*" {
20182029
g_defArgsStr+=yytext;
20192030
}

0 commit comments

Comments
 (0)