summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/fortrancode.l16
-rw-r--r--src/xmlgen.cpp2
2 files changed, 9 insertions, 9 deletions
diff --git a/src/fortrancode.l b/src/fortrancode.l
index 1f22700..141e762 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -774,6 +774,13 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
yy_push_state(YY_START);
BEGIN(Use);
}
+<Use>"ONLY" { // TODO: rename
+ startFontClass("keywordtype");
+ codifyLines(yytext);
+ endFontClass();
+ yy_push_state(YY_START);
+ BEGIN(UseOnly);
+ }
<Use>{ID} {
QCString tmp = yytext;
tmp = tmp.lower();
@@ -790,14 +797,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
useMembers->append(tmp, useEntry);
addUse(tmp);
}
-<Use>,{BS}"ONLY" { // TODO: rename
- startFontClass("keywordtype");
- codifyLines(yytext);
- endFontClass();
- yy_push_state(YY_START);
- BEGIN(UseOnly);
- }
-<UseOnly,Import>{BS},{BS} { codifyLines(yytext); }
+<Use,UseOnly,Import>{BS},{BS} { codifyLines(yytext); }
<UseOnly,Import>{BS}&{BS}"\n" { codifyLines(yytext);
g_contLineNr++;
YY_FTN_RESET}
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index 70e198a..1b03c3b 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -842,7 +842,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
{
ArgumentList *declAl = md->declArgumentList();
ArgumentList *defAl = md->argumentList();
- if (declAl && declAl->count()>0)
+ if (declAl && defAl && declAl->count()>0)
{
ArgumentListIterator declAli(*declAl);
ArgumentListIterator defAli(*defAl);