Move and organise the code

Author: gnikit

fortls/constants.py

@@ -2,6 +2,48 @@
 
 PY3K = sys.version_info >= (3, 0)
 
+# Keyword identifiers
+KEYWORD_LIST = [
+    "pointer",
+    "allocatable",
+    "optional",
+    "public",
+    "private",
+    "nopass",
+    "target",
+    "save",
+    "parameter",
+    "contiguous",
+    "deferred",
+    "dimension",
+    "intent",
+    "pass",
+    "pure",
+    "impure",
+    "elemental",
+    "recursive",
+    "abstract",
+]
+KEYWORD_ID_DICT = {keyword: ind for (ind, keyword) in enumerate(KEYWORD_LIST)}
+
+# Type identifiers
+BASE_TYPE_ID = -1
+MODULE_TYPE_ID = 1
+SUBROUTINE_TYPE_ID = 2
+FUNCTION_TYPE_ID = 3
+CLASS_TYPE_ID = 4
+INTERFACE_TYPE_ID = 5
+VAR_TYPE_ID = 6
+METH_TYPE_ID = 7
+SUBMODULE_TYPE_ID = 8
+BLOCK_TYPE_ID = 9
+SELECT_TYPE_ID = 10
+DO_TYPE_ID = 11
+WHERE_TYPE_ID = 12
+IF_TYPE_ID = 13
+ASSOC_TYPE_ID = 14
+ENUM_TYPE_ID = 15
+
 # A string used to mark literals e.g. 10, 3.14, "words", etc.
 # The description name chosen is non-ambiguous and cannot naturally
 # occur in Fortran (with/out C preproc) code

fortls/langserver.py

@@ -12,23 +12,25 @@
 from pathlib import Path
 
 # Local modules
-from fortls.constants import FORTRAN_LITERAL
-from fortls.helper_functions import expand_name
-from fortls.intrinsics import (
-    get_intrinsic_keywords,
-    load_intrinsics,
-    set_lowercase_intrinsics,
-)
-from fortls.jsonrpc import path_from_uri, path_to_uri
-from fortls.objects import (
+from fortls.constants import (
     CLASS_TYPE_ID,
+    FORTRAN_LITERAL,
     FUNCTION_TYPE_ID,
     INTERFACE_TYPE_ID,
     METH_TYPE_ID,
     MODULE_TYPE_ID,
     SELECT_TYPE_ID,
     SUBROUTINE_TYPE_ID,
     VAR_TYPE_ID,
+)
+from fortls.helper_functions import expand_name
+from fortls.intrinsics import (
+    get_intrinsic_keywords,
+    load_intrinsics,
+    set_lowercase_intrinsics,
+)
+from fortls.jsonrpc import path_from_uri, path_to_uri
+from fortls.objects import (
     climb_type_tree,
     find_in_scope,
     find_in_workspace,
@@ -42,6 +44,7 @@
 from fortls.parse_fortran import fortran_file, get_line_context, process_file
 from fortls.regex_patterns import (
     DQ_STRING_REGEX,
+    INT_STMNT_REGEX,
     LOGICAL_REGEX,
     NUMBER_REGEX,
     SQ_STRING_REGEX,
@@ -50,8 +53,6 @@
 log = logging.getLogger(__name__)
 # Global regexes
 FORTRAN_EXT_REGEX = re.compile(r"\.F(77|90|95|03|08|OR|PP)?$", re.I)
-# TODO: I think this can be replaced by fortls.regex_patterns
-INT_STMNT_REGEX = re.compile(r"^[ ]*[a-z]*$", re.I)
 # TODO: I think this can be replaced by fortls.regex_patterns type & class
 TYPE_DEF_REGEX = re.compile(r"[ ]*(TYPE|CLASS)[ ]*\([a-z0-9_ ]*$", re.I)
 # TODO: I think this can be replaced by fortls.regex_patterns

fortls/objects.py

@@ -3,56 +3,33 @@
 import re
 from collections import namedtuple
 
+from fortls.constants import (
+    ASSOC_TYPE_ID,
+    BASE_TYPE_ID,
+    BLOCK_TYPE_ID,
+    CLASS_TYPE_ID,
+    DO_TYPE_ID,
+    ENUM_TYPE_ID,
+    FUNCTION_TYPE_ID,
+    IF_TYPE_ID,
+    INTERFACE_TYPE_ID,
+    KEYWORD_ID_DICT,
+    KEYWORD_LIST,
+    METH_TYPE_ID,
+    MODULE_TYPE_ID,
+    SELECT_TYPE_ID,
+    SUBMODULE_TYPE_ID,
+    SUBROUTINE_TYPE_ID,
+    VAR_TYPE_ID,
+    WHERE_TYPE_ID,
+)
 from fortls.jsonrpc import path_to_uri
+from fortls.regex_patterns import CLASS_VAR_REGEX, DEF_KIND_REGEX, OBJBREAK_REGEX
 
 # Global variables
 sort_keywords = True
-# Regexes
-CLASS_VAR_REGEX = re.compile(r"(TYPE|CLASS)[ ]*\(", re.I)
-DEF_KIND_REGEX = re.compile(r"([a-z]*)[ ]*\((?:KIND|LEN)?[ =]*([a-z_][a-z0-9_]*)", re.I)
-OBJBREAK_REGEX = re.compile(r"[\/\-(.,+*<>=$: ]", re.I)
 # Helper types
 USE_info = namedtuple("USE_info", ["only_list", "rename_map"])
-# Keyword identifiers
-KEYWORD_LIST = [
-    "pointer",
-    "allocatable",
-    "optional",
-    "public",
-    "private",
-    "nopass",
-    "target",
-    "save",
-    "parameter",
-    "contiguous",
-    "deferred",
-    "dimension",
-    "intent",
-    "pass",
-    "pure",
-    "impure",
-    "elemental",
-    "recursive",
-    "abstract",
-]
-KEYWORD_ID_DICT = {keyword: ind for (ind, keyword) in enumerate(KEYWORD_LIST)}
-# Type identifiers
-BASE_TYPE_ID = -1
-MODULE_TYPE_ID = 1
-SUBROUTINE_TYPE_ID = 2
-FUNCTION_TYPE_ID = 3
-CLASS_TYPE_ID = 4
-INTERFACE_TYPE_ID = 5
-VAR_TYPE_ID = 6
-METH_TYPE_ID = 7
-SUBMODULE_TYPE_ID = 8
-BLOCK_TYPE_ID = 9
-SELECT_TYPE_ID = 10
-DO_TYPE_ID = 11
-WHERE_TYPE_ID = 12
-IF_TYPE_ID = 13
-ASSOC_TYPE_ID = 14
-ENUM_TYPE_ID = 15
 
 
 def set_keyword_ordering(sorted):

fortls/parse_fortran.py

@@ -7,7 +7,13 @@
 import sys
 from collections import namedtuple
 
-from fortls.constants import PY3K
+from fortls.constants import (
+    DO_TYPE_ID,
+    INTERFACE_TYPE_ID,
+    PY3K,
+    SELECT_TYPE_ID,
+    SUBMODULE_TYPE_ID,
+)
 from fortls.helper_functions import (
     detect_fixed_format,
     find_paren_match,
@@ -17,10 +23,6 @@
     strip_strings,
 )
 from fortls.objects import (
-    DO_TYPE_ID,
-    INTERFACE_TYPE_ID,
-    SELECT_TYPE_ID,
-    SUBMODULE_TYPE_ID,
     fortran_associate,
     fortran_ast,
     fortran_block,

fortls/regex_patterns.py

@@ -120,3 +120,7 @@
     r"[ ]*(END)( |MODULE|PROGRAM|SUBROUTINE|FUNCTION|PROCEDURE|TYPE|DO|IF|SELECT)?",
     re.I,
 )
+# Object regex patterns
+CLASS_VAR_REGEX = re.compile(r"(TYPE|CLASS)[ ]*\(", re.I)
+DEF_KIND_REGEX = re.compile(r"([a-z]*)[ ]*\((?:KIND|LEN)?[ =]*([a-z_]\w*)", re.I)
+OBJBREAK_REGEX = re.compile(r"[\/\-(.,+*<>=$: ]", re.I)