summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-08-02 12:27:13 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-08-02 12:27:13 (GMT)
commit9435bf0b7e5d381bf42eb92bc163ca1bf71c8f15 (patch)
tree2a23d659ff218d915183dacbfccee7c37dadfb48
parenteabb59cb4f33644be43315f539f21abc6c78348e (diff)
parentaac81f8bfe8298aa0839bb2d7c70ea75149cdffb (diff)
downloadDoxygen-9435bf0b7e5d381bf42eb92bc163ca1bf71c8f15.zip
Doxygen-9435bf0b7e5d381bf42eb92bc163ca1bf71c8f15.tar.gz
Doxygen-9435bf0b7e5d381bf42eb92bc163ca1bf71c8f15.tar.bz2
Merge pull request #203 from albert-github/feature/bug_733856
Bug 733856 - segfault in QGListIterator while parsing fortran code
-rw-r--r--src/fortrancode.l2
-rw-r--r--src/fortranscanner.l1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/fortrancode.l b/src/fortrancode.l
index e6cfdde..03baeed 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -1128,6 +1128,8 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
}
YY_FTN_RESET
}
+<*>^{BS}"type"{BS}"=" { g_code->codify(yytext); }
+
<*>. {
g_code->codify(yytext);
}
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index 449b05d..1f52110 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -739,6 +739,7 @@ private {
{ID} {
}
^{BS}"type"{BS_}"is"/{BS_} { }
+^{BS}"type"{BS}"=" { }
}
<AttributeList>{
{COMMA} {}