Commit b6fa0a73 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

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

parents f1a692b0 ad976b28

src/fortrancode.l

+32 −9
Original line number Diff line number Diff line
@@ -688,15 +688,16 @@ NUM_TYPE (complex|integer|logical|real) 
LOG_OPER  (\.and\.|\.eq\.|\.eqv\.|\.ge\.|\.gt\.|\.le\.|\.lt\.|\.ne\.|\.neqv\.|\.or\.|\.not\.)

KIND      {ARGS}

CHAR      (CHARACTER{ARGS}?|CHARACTER{BS}"*"({BS}[0-9]+|{ARGS}))

TYPE_SPEC (({NUM_TYPE}({BS}"*"{BS}[0-9]+)?)|({NUM_TYPE}{KIND})|DOUBLE{BS}COMPLEX|DOUBLE{BS}PRECISION|{CHAR})

TYPE_SPEC (({NUM_TYPE}({BS}"*"{BS}[0-9]+)?)|({NUM_TYPE}{KIND})|DOUBLE{BS}COMPLEX|DOUBLE{BS}PRECISION|{CHAR}|PROCEDURE)

TYPE_PREFIX ((TYPE|CLASS|PROCEDURE){BS}"(")



INTENT_SPEC intent{BS}"("{BS}(in|out|in{BS}out){BS}")"

ATTR_SPEC (IMPLICIT|ALLOCATABLE|DIMENSION{ARGS}|EXTERNAL|{INTENT_SPEC}|INTRINSIC|OPTIONAL|PARAMETER|POINTER|PROTECTED|PRIVATE|PUBLIC|SAVE|TARGET|RECURSIVE|PURE|IMPURE|ELEMENTAL)

ATTR_SPEC (IMPLICIT|ALLOCATABLE|DIMENSION{ARGS}|EXTERNAL|{INTENT_SPEC}|INTRINSIC|OPTIONAL|PARAMETER|POINTER|PROTECTED|PRIVATE|PUBLIC|SAVE|TARGET|RECURSIVE|PURE|IMPURE|ELEMENTAL|VALUE|NOPASS|DEFERRED)

ACCESS_SPEC (PROTECTED|PRIVATE|PUBLIC)

/* Assume that attribute statements are almost the same as attributes. */

ATTR_STMT {ATTR_SPEC}|DIMENSION

FLOW  (DO|SELECT|CASE|SELECTCASE|WHERE|IF|THEN|ELSE|WHILE|FORALL|ELSEWHERE|ELSEIF|RETURN|CONTINUE|EXIT)

COMMANDS  (FORMAT|CONTAINS|MODULE{BS_}PROCEDURE|WRITE|READ|ALLOCATE|ALLOCATED|ASSOCIATED|DEALLOCATE|SIZE|INQUIRE|OPEN|CLOSE|DATA|COMMON)

COMMANDS  (FORMAT|CONTAINS|MODULE{BS_}PROCEDURE|WRITE|READ|ALLOCATE|ALLOCATED|ASSOCIATED|PRESENT|DEALLOCATE|NULLIFY|SIZE|INQUIRE|OPEN|CLOSE|FLUSH|DATA|COMMON)

IGNORE (CALL)

PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|IMPURE|PURE|ELEMENTAL)?
@@ -716,6 +717,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I 
%x DocBlock

%x Use

%x UseOnly

%x Import

%x TypeDecl

%x Declaration

%x DeclContLine
@@ -760,6 +762,11 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I 
  					  codifyLines(yytext);

					  endFontClass();

                                        }

<Start>^{BS}"namelist"/[//]             {  // Namelist specification

              startFontClass("keywordtype");

              codifyLines(yytext);

            endFontClass();

                                        }

 /*-------- use statement -------------------------------------------*/

<Start>"use"{BS_}                       { 

  					  startFontClass("keywordtype");
@@ -791,21 +798,32 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I 
                                          yy_push_state(YY_START);

					  BEGIN(UseOnly);     

                                        }           

<UseOnly>{BS},{BS}                      { codifyLines(yytext); }

<UseOnly>{BS}&{BS}"\n"                  { codifyLines(yytext); YY_FTN_RESET}

<UseOnly,Import>{BS},{BS}               { codifyLines(yytext); }

<UseOnly,Import>{BS}&{BS}"\n"           { codifyLines(yytext); YY_FTN_RESET}

<UseOnly>{ID}                           {

                                          g_insideBody=TRUE;

                                          generateLink(*g_code, yytext);

                                          g_insideBody=FALSE;

                                          useEntry->onlyNames.append(yytext);

                                        }

<Use,UseOnly>"\n"                       {

<Use,UseOnly,Import>"\n"                {

                                          unput(*yytext);

                                          yy_pop_state();YY_FTN_RESET

                                        }

       

<Start>"import"{BS_}                    {

                                          startFontClass("keywordtype");

                                          codifyLines(yytext);

                                          endFontClass();

                                          yy_push_state(YY_START);

                                          BEGIN(Import);

                                        }

<Import>{ID}                            {

                                          g_insideBody=TRUE;

                                          generateLink(*g_code, yytext);

                                          g_insideBody=FALSE;

                                        }

 /*-------- fortran module  -----------------------------------------*/

<Start>("block"{BS}"data"|"program"|"module"|"type"|"interface")/{BS_}|({COMMA}{ACCESS_SPEC})|\n {  //

<Start>("block"{BS}"data"|"program"|"module"|"type"|"interface")/{BS_}|({COMMA}({ACCESS_SPEC}|ABSTRACT|EXTENDS))|\n {  //

					  startScope();

  					  startFontClass("keyword"); 

  					  codifyLines(yytext);
@@ -823,6 +841,11 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I 
					  generateLink(*g_code,yytext);

                                          yy_pop_state();

 					}

<ClassName>({ACCESS_SPEC}|ABSTRACT|EXTENDS)/[,:( ] { //| variable deklaration

              startFontClass("keyword");

            g_code->codify(yytext);

            endFontClass();

            }

<ClassName>\n				{ // interface may be without name

                                          yy_pop_state();

					  YY_FTN_REJECT;
@@ -877,7 +900,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I 
					  endFontClass();

                                        }

 /*-------- variable declaration ----------------------------------*/

<Start>"type"{BS}"("                    {

<Start>^{BS}{TYPE_PREFIX}/{ID}          {

                                          yy_push_state(YY_START);

					  BEGIN(TypeDecl);

   					  startFontClass("keywordtype");