Fortran: allow keyword names to be used for various kinds

Fortran allows keyword names to be used as identifiers of module, type,
interface and other kinds. For instance, in the code below 'Program'
is a keyword but can be used as a name of module, the same for 'Data' and
also interface named 'Program':

module Program

  type Data
    integer :: contents
  end type Data

  integer :: i

  interface Program
    function myFunc(arg)
      !...
    end function myFunc
  end interface Program

contains

  function MyFunc(arg)
  ! ...
  end function MyFunc

end module Program

Author: techee

Units/parser-fortran.r/fortran-submodule.d/expected.tags

@@ -2,5 +2,6 @@ example_smod	input.f90	/^submodule (example_mod) example_smod$/;"	submodule	inhe
 g	input.f90	/^    module function g(/;"	function	submodule:example_smod
 example_ssmod	input.f90	/^submodule (example_mod:example_smod) example_ssmod$/;"	submodule	inherits:example_mod:example_smod
 g2	input.f90	/^    module function g2(/;"	function	submodule:example_ssmod
-x	input.f90	/^        integer :: x,/;"	variable
-y	input.f90	/^        integer :: x,y$/;"	variable
+function	input.f90	/^    module function /;"	module
+x	input.f90	/^        integer :: x,/;"	variable	module:function
+y	input.f90	/^        integer :: x,y$/;"	variable	module:function

parsers/fortran.c

@@ -1768,7 +1768,7 @@ static void parseStructureStmt (tokenInfo *const token)
 		strcmp (vStringValue (token->string), "/") == 0)
 	{  /* read structure name */
 		readToken (token);
-		if (isType (token, TOKEN_IDENTIFIER))
+		if (isType (token, TOKEN_IDENTIFIER) || isType (token, TOKEN_KEYWORD))
 		{
 			name = newTokenFrom (token);
 			name->type = TOKEN_IDENTIFIER;
@@ -1937,8 +1937,9 @@ static void parseDerivedTypeDef (tokenInfo *const token)
 		qualifierToken = parseQualifierSpecList (token);
 	if (isType (token, TOKEN_DOUBLE_COLON))
 		readToken (token);
-	if (isType (token, TOKEN_IDENTIFIER))
+	if (isType (token, TOKEN_IDENTIFIER) || isType (token, TOKEN_KEYWORD))
 	{
+		token->type = TOKEN_IDENTIFIER;
 		if (qualifierToken)
 		{
 			if (qualifierToken->parentType)
@@ -2006,7 +2007,7 @@ static void parseInterfaceBlock (tokenInfo *const token)
 		if (isType (token, TOKEN_OPERATOR))
 			name = newTokenFrom (token);
 	}
-	else if (isType (token, TOKEN_IDENTIFIER))
+	else if (isType (token, TOKEN_IDENTIFIER) || isType (token, TOKEN_KEYWORD))
 	{
 		name = newTokenFrom (token);
 		name->type = TOKEN_IDENTIFIER;
@@ -2066,7 +2067,7 @@ static void parseEnumBlock (tokenInfo *const token)
 	parseKindSelector (token);
 	if (isType (token, TOKEN_DOUBLE_COLON))
 		readToken (token);
-	if (isType (token, TOKEN_IDENTIFIER))
+	if (isType (token, TOKEN_IDENTIFIER) || isType (token, TOKEN_KEYWORD))
 	{
 		name = newTokenFrom (token);
 		name->type = TOKEN_IDENTIFIER;
@@ -2406,8 +2407,9 @@ static void parseModule (tokenInfo *const token, bool isSubmodule)
 	}
 
 	readToken (token);
-	if (isType (token, TOKEN_IDENTIFIER))
+	if (isType (token, TOKEN_IDENTIFIER) || isType (token, TOKEN_KEYWORD))
 	{
+		token->type = TOKEN_IDENTIFIER;
 		if (isSubmodule)
 		{
 			attachParentType (token, parentIdentifier);
@@ -2521,9 +2523,10 @@ static void parseSubprogramFull (tokenInfo *const token, const tagType tag)
 			isKeyword (token, KEYWORD_function) ||
 			isKeyword (token, KEYWORD_subroutine));
 	readToken (token);
-	if (isType (token, TOKEN_IDENTIFIER))
+	if (isType (token, TOKEN_IDENTIFIER) || isType (token, TOKEN_KEYWORD))
 	{
 		tokenInfo* name = newTokenFrom (token);
+		token->type = TOKEN_IDENTIFIER;
 		if (tag == TAG_SUBROUTINE ||
 			tag == TAG_PROTOTYPE)
 			name->signature = parseSignature (token);