Commit 3583a7c0 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Included missing Fortran patches

parent 8e698d4b
DOXYGEN Version 1.8.1.2-20120729 DOXYGEN Version 1.8.1.2-20120730
Please read the installation section of the manual Please read the installation section of the manual
(http://www.doxygen.org/install.html) for instructions. (http://www.doxygen.org/install.html) for instructions.
-------- --------
Dimitri van Heesch (29 July 2012) Dimitri van Heesch (30 July 2012)
DOXYGEN Version 1.8.1.2_20120729 DOXYGEN Version 1.8.1.2_20120730
Please read INSTALL for compilation instructions. Please read INSTALL for compilation instructions.
...@@ -26,4 +26,4 @@ forum. ...@@ -26,4 +26,4 @@ forum.
Enjoy, Enjoy,
Dimitri van Heesch (dimitri@stack.nl) (29 July 2012) Dimitri van Heesch (dimitri@stack.nl) (30 July 2012)
...@@ -20,7 +20,7 @@ doxygen_version_minor=8 ...@@ -20,7 +20,7 @@ doxygen_version_minor=8
doxygen_version_revision=1.2 doxygen_version_revision=1.2
#NOTE: Setting version_mmn to "NO" will omit mmn info from the package. #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
doxygen_version_mmn=20120729 doxygen_version_mmn=20120730
bin_dirs=`echo $PATH | sed -e "s/:/ /g"` bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
......
...@@ -770,8 +770,11 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA ...@@ -770,8 +770,11 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA
BEGIN(UseOnly); BEGIN(UseOnly);
} }
<UseOnly>{BS},{BS} { codifyLines(yytext); } <UseOnly>{BS},{BS} { codifyLines(yytext); }
<UseOnly>{BS}&{BS}"\n" { codifyLines(yytext); }
<UseOnly>{ID} { <UseOnly>{ID} {
codifyLines(yytext); g_insideBody=TRUE;
generateLink(*g_code, yytext);
g_insideBody=FALSE;
useEntry->onlyNames.append(yytext); useEntry->onlyNames.append(yytext);
} }
<Use,UseOnly>"\n" { <Use,UseOnly>"\n" {
...@@ -1015,6 +1018,13 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA ...@@ -1015,6 +1018,13 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA
<*>"\\\\" { str+=yytext; /* ignore \\ */} <*>"\\\\" { str+=yytext; /* ignore \\ */}
<*>"\\\""|\\\' { str+=yytext; /* ignore \" */} <*>"\\\""|\\\' { str+=yytext; /* ignore \" */}
<String>\n { // string with \n inside
str+=yytext;
startFontClass("stringliteral");
codifyLines(str);
endFontClass();
str = "";
}
<String>\"|\' { // string ends with next quote without previous backspace <String>\"|\' { // string ends with next quote without previous backspace
if(yytext[0]!=stringStartSymbol) REJECT; // single vs double quote if(yytext[0]!=stringStartSymbol) REJECT; // single vs double quote
str+=yytext; str+=yytext;
......
...@@ -1638,84 +1638,84 @@ static QCString applyModifiers(QCString typeName, SymbolModifiers& mdfs) ...@@ -1638,84 +1638,84 @@ static QCString applyModifiers(QCString typeName, SymbolModifiers& mdfs)
{ {
if (!mdfs.dimension.isNull()) if (!mdfs.dimension.isNull())
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += mdfs.dimension; typeName += mdfs.dimension;
} }
if (mdfs.direction!=SymbolModifiers::NONE_D) if (mdfs.direction!=SymbolModifiers::NONE_D)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += directionStrs[mdfs.direction]; typeName += directionStrs[mdfs.direction];
} }
if (mdfs.optional) if (mdfs.optional)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "optional"; typeName += "optional";
} }
if (mdfs.allocatable) if (mdfs.allocatable)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "allocatable"; typeName += "allocatable";
} }
if (mdfs.external) if (mdfs.external)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "external"; typeName += "external";
} }
if (mdfs.intrinsic) if (mdfs.intrinsic)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "intrinsic"; typeName += "intrinsic";
} }
if (mdfs.parameter) if (mdfs.parameter)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "parameter"; typeName += "parameter";
} }
if (mdfs.pointer) if (mdfs.pointer)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "pointer"; typeName += "pointer";
} }
if (mdfs.target) if (mdfs.target)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "target"; typeName += "target";
} }
if (mdfs.save) if (mdfs.save)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "save"; typeName += "save";
} }
if (mdfs.deferred) if (mdfs.deferred)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "deferred"; typeName += "deferred";
} }
if (mdfs.nonoverridable) if (mdfs.nonoverridable)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "non_overridable"; typeName += "non_overridable";
} }
if (mdfs.nopass) if (mdfs.nopass)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "nopass"; typeName += "nopass";
} }
if (mdfs.pass) if (mdfs.pass)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "pass"; typeName += "pass";
if (!mdfs.passVar.isEmpty()) if (!mdfs.passVar.isEmpty())
typeName += "(" + mdfs.passVar + ")"; typeName += "(" + mdfs.passVar + ")";
} }
if (mdfs.protection == SymbolModifiers::PUBLIC) if (mdfs.protection == SymbolModifiers::PUBLIC)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "public"; typeName += "public";
} }
else if (mdfs.protection == SymbolModifiers::PRIVATE) else if (mdfs.protection == SymbolModifiers::PRIVATE)
{ {
typeName += ", "; if (!typeName.isEmpty()) typeName += ", ";
typeName += "private"; typeName += "private";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment