Fortran color code of END

The color for the single END in Fortran code was of the color of the flow type entities though for all the flow entities the entity name is mandatory. For the entity statements of some keywords e.g. SUBROUTINE and FUNCTION the entity name is not mandatory with the END statement. The color of the single END statement has been changed from the flow type to the normal keyword type.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/fortrancode.l b/src/fortrancode.l
index 101137a..b9648d5 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -757,12 +757,11 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
                                           codifyLines(yytext);
                                           endFontClass();
                                         }
-<Start>"end"({BS}{FLOW})?/[ \t\n]       { // list is a bit long as not all have possible end
+<Start>"end"({BS}{FLOW})/[ \t\n]       { // list is a bit long as not all have possible end
   					  startFontClass("keywordflow");
   					  codifyLines(yytext);
 					  endFontClass();
 					}
-
 <Start>"implicit"{BS}"none"             { 
   					  startFontClass("keywordtype"); 
   					  codifyLines(yytext);
@@ -893,7 +892,7 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
                                           yy_pop_state();
                                           YY_FTN_RESET
                                         }
-<Start>^{BS}"end"{BS}("block"{BS}"data"|{SUBPROG}|"module"|"program"|"type"|"interface"){BS}     {  // Fortran subroutine or function ends
+<Start>^{BS}"end"{BS}("block"{BS}"data"|{SUBPROG}|"module"|"program"|"type"|"interface")?{BS}     {  // Fortran subroutine or function ends
                                           //cout << "===> end function " << yytext << endl;
                                           endScope();
    					  startFontClass("keyword");