summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2017-09-02 14:51:51 (GMT)
committerGitHub <noreply@github.com>2017-09-02 14:51:51 (GMT)
commitc62e364c8172eb33afb93f8f2d272859c27fa689 (patch)
treea6bce5f8553254b20bbce66eb70f8bbb31b9e988 /src
parent723b04b755197c494dd5e790524416fd136938d4 (diff)
parent2f5e22a4be9d237a150d04659bf6abec1349fbd9 (diff)
downloadDoxygen-c62e364c8172eb33afb93f8f2d272859c27fa689.zip
Doxygen-c62e364c8172eb33afb93f8f2d272859c27fa689.tar.gz
Doxygen-c62e364c8172eb33afb93f8f2d272859c27fa689.tar.bz2
Merge pull request #589 from albert-github/feature/bug_786409
Bug 786409 - parsing error in Fortran file with preprocessing
Diffstat (limited to 'src')
-rw-r--r--src/pre.l11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/pre.l b/src/pre.l
index 40842f4..bf1ec9b 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1984,6 +1984,11 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
g_defArgsStr+=*yytext;
BEGIN(ReadString);
}
+<FindDefineArgs>' {
+ if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_Fortran) REJECT;
+ g_defArgsStr+=*yytext;
+ BEGIN(ReadString);
+ }
<FindDefineArgs>\n {
g_defArgsStr+=' ';
g_yyLineNr++;
@@ -2014,6 +2019,12 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
g_defArgsStr+=*yytext;
BEGIN(FindDefineArgs);
}
+<ReadString>"'" {
+ if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_Fortran) REJECT;
+ g_defArgsStr+=*yytext;
+ BEGIN(FindDefineArgs);
+ }
+
<ReadString>"//"|"/*" {
g_defArgsStr+=yytext;
}