summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2014-07-30 11:34:17 (GMT)
committeralbert-github <albert.tests@gmail.com>2014-07-30 11:34:17 (GMT)
commitaac81f8bfe8298aa0839bb2d7c70ea75149cdffb (patch)
treefdab24657e1f1e70029b50cccdb1c397806012c9 /src
parentc9d816aaf20c24c624407ba1c2eb4e00eff0c02f (diff)
downloadDoxygen-aac81f8bfe8298aa0839bb2d7c70ea75149cdffb.zip
Doxygen-aac81f8bfe8298aa0839bb2d7c70ea75149cdffb.tar.gz
Doxygen-aac81f8bfe8298aa0839bb2d7c70ea75149cdffb.tar.bz2
Bug 733856 - segfault in QGListIterator while parsing fortran code
Problem with variables with the name type versus type definitions. type followed by = is recognized as not being a type definition instead of the use of a variable.
Diffstat (limited to 'src')
-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} {}