Commit 045cc725 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Merge branch 'master' of github.com:doxygen/doxygen

parents 223e7de6 ac28c931
...@@ -747,6 +747,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I ...@@ -747,6 +747,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
%x UseOnly %x UseOnly
%x Import %x Import
%x Declaration %x Declaration
%x DeclarationBinding
%x DeclContLine %x DeclContLine
%x Parameterlist %x Parameterlist
%x String %x String
...@@ -974,6 +975,14 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I ...@@ -974,6 +975,14 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
generateLink(*g_code, yytext); generateLink(*g_code, yytext);
} }
} }
<Declaration>{BS}("=>"|"="){BS} { // Procedure binding
BEGIN(DeclarationBinding);
g_code->codify(yytext);
}
<DeclarationBinding>{ID} { // Type bound procedure link
generateLink(*g_code, yytext);
yy_pop_state();
}
<Declaration>[(] { // start of array specification <Declaration>[(] { // start of array specification
bracketCount++; bracketCount++;
g_code->codify(yytext); g_code->codify(yytext);
...@@ -984,7 +993,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I ...@@ -984,7 +993,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
g_code->codify(yytext); g_code->codify(yytext);
} }
<Declaration>"&" { // continuation line <Declaration,DeclarationBinding>"&" { // continuation line
g_code->codify(yytext); g_code->codify(yytext);
yy_push_state(YY_START); yy_push_state(YY_START);
BEGIN(DeclContLine); BEGIN(DeclContLine);
...@@ -995,7 +1004,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I ...@@ -995,7 +1004,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
yy_pop_state(); yy_pop_state();
YY_FTN_RESET YY_FTN_RESET
} }
<Declaration>"\n" { // end declaration line <Declaration,DeclarationBinding>"\n" { // end declaration line
if (g_endComment) if (g_endComment)
{ {
g_endComment=FALSE; g_endComment=FALSE;
...@@ -1039,7 +1048,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I ...@@ -1039,7 +1048,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
} }
/*-------- comments ---------------------------------------------------*/ /*-------- comments ---------------------------------------------------*/
<Start>\n?{BS}"!>"|"!<" { // start comment line or comment block <Start,Declaration,DeclarationBinding>\n?{BS}"!>"|"!<" { // start comment line or comment block
if (yytext[0] == '\n') if (yytext[0] == '\n')
{ {
yy_old_start = 0; yy_old_start = 0;
...@@ -1052,7 +1061,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I ...@@ -1052,7 +1061,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
BEGIN(DocBlock); BEGIN(DocBlock);
docBlock=yytext; docBlock=yytext;
} }
<Declaration>{BS}"!<" { // start comment line or comment block <Declaration,DeclarationBinding>{BS}"!<" { // start comment line or comment block
yy_push_state(YY_START); yy_push_state(YY_START);
BEGIN(DocBlock); BEGIN(DocBlock);
docBlock=yytext; docBlock=yytext;
......
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