Merge branch 'generic-macro-expansions' into ifort-fpp-fixes

Author: emanspeaks

fortls/__init__.py

@@ -507,7 +507,6 @@ def locate_config(root: str) -> str | None:
         debug=True,
         pp_defs=pp_defs,
         include_dirs=include_dirs,
-        pp_parse_intel=pp_parse_intel,
     )
     print("\n=========\nObject Tree\n=========\n")
     for obj in file_ast.get_scopes():

fortls/langserver.py

@@ -1324,7 +1324,7 @@ def serve_onChange(self, request: dict):
             # tmp_file.ast.resolve_links(self.obj_tree, self.link_version)
         elif file_obj.preproc:
             file_obj.preprocess(
-                pp_defs=self.pp_defs, pp_parse_intel=self.pp_parse_intel
+                pp_defs=self.pp_defs,
             )
             self.pp_defs = {**self.pp_defs, **file_obj.pp_defs}
 
@@ -1400,7 +1400,6 @@ def update_workspace_file(
             ast_new = file_obj.parse(
                 pp_defs=self.pp_defs,
                 include_dirs=self.include_dirs,
-                pp_parse_intel=self.pp_parse_intel,
             )
             # Add the included read in pp_defs from to the ones specified in the
             # configuration file
@@ -1470,7 +1469,6 @@ def file_init(
             file_ast = file_obj.parse(
                 pp_defs=pp_defs,
                 include_dirs=include_dirs,
-                pp_parse_intel=pp_parse_intel,
             )
         except:
             log.error("Error while parsing file %s", filepath, exc_info=True)

fortls/parsers/internal/parser.py

@@ -1180,7 +1180,6 @@ def preprocess(
         pp_defs: dict = None,
         include_dirs: set = None,
         debug: bool = False,
-        pp_parse_intel: bool = False,
     ) -> tuple[list, list]:
         if pp_defs is None:
             pp_defs = {}
@@ -1276,7 +1275,6 @@ def parse(
                 pp_defs=pp_defs,
                 include_dirs=include_dirs,
                 debug=debug,
-                pp_parse_intel=pp_parse_intel,
             )
             for pp_reg in pp_skips:
                 file_ast.start_ppif(pp_reg[0])
@@ -2053,35 +2051,6 @@ def replace_ops(expr: str):
 
             return expr
 
-        def replace_intel_ops(expr: str):
-            expr = expr.replace("/=", " != ")
-            expr = expr.replace(".AND.", " && ")
-            expr = expr.replace(".LT.", " < ")
-            expr = expr.replace(".GT.", " > ")
-            expr = expr.replace(".EQ.", " == ")
-            expr = expr.replace(".LE.", " <= ")
-            expr = expr.replace(".GE.", " >= ")
-            expr = expr.replace(".NE.", " != ")
-            expr = expr.replace(".EQV.", " == ")
-            expr = expr.replace(".NEQV.", " != ")
-            expr = expr.replace(".NOT.", "!")
-            expr = expr.replace(".OR.", " || ")
-            expr = expr.replace(".XOR.", " != ")  # admittedly a hack...
-            expr = expr.replace(".and.", " && ")
-            expr = expr.replace(".lt.", " < ")
-            expr = expr.replace(".gt.", " > ")
-            expr = expr.replace(".eq.", " == ")
-            expr = expr.replace(".le.", " <= ")
-            expr = expr.replace(".ge.", " >= ")
-            expr = expr.replace(".ne.", " != ")
-            expr = expr.replace(".eqv.", " == ")
-            expr = expr.replace(".neqv.", " != ")
-            expr = expr.replace(".not.", "!")
-            expr = expr.replace(".or.", " || ")
-            expr = expr.replace(".xor.", " != ")  # admittedly a hack...
-
-            return expr
-
         def replace_defined(line: str):
             i0 = 0
             out_line = ""
@@ -2114,9 +2083,6 @@ def replace_vars(line: str):
             defs = {}
 
         out_line = text
-        if pp_parse_intel:
-            out_line = replace_intel_ops(out_line)
-
         out_line = replace_defined(out_line)
         out_line = replace_vars(out_line)
         try:
@@ -2153,13 +2119,13 @@ def replace_vars(line: str):
             continue
         # Handle conditional statements
         match = FRegex.PP_REGEX.match(line)
-        if match and check_pp_prefix(match.group(1), pp_parse_intel):
+        if match and check_pp_prefix(match.group(1)):
             output_file.append(line)
             def_name = None
             if_start = False
             # Opening conditional statements
             if match.group(2).lower() == "if ":
-                is_path = eval_pp_if(line[match.end(2) :], defs_tmp, pp_parse_intel)
+                is_path = eval_pp_if(line[match.end(2) :], defs_tmp)
                 if_start = True
             elif match.group(2).lower() == "ifdef":
                 if_start = True
@@ -2195,7 +2161,7 @@ def replace_vars(line: str):
                     exc_continue = True
                     if pp_stack[-1][0] < 0:
                         pp_stack[-1][0] = i + 1
-                elif eval_pp_if(line[match.end(2) :], defs_tmp, pp_parse_intel):
+                elif eval_pp_if(line[match.end(2) :], defs_tmp):
                     pp_stack[-1][1] = i + 1
                     pp_skips.append(pp_stack.pop())
                     pp_stack_group[-1][1] = True

fortls/regex_patterns.py

@@ -124,20 +124,17 @@ class FortranRegularExpressions:
     FREE_FORMAT_TEST: Pattern = compile(r"[ ]{1,4}[a-z]", I)
     # Preprocessor matching rules
     DEFINED: Pattern = compile(r"defined[ ]*\(?[ ]*([a-z_]\w*)[ ]*\)?", I)
-    INTEL_FPP_PRE_STR = r"[c!*]DEC\$|[c!*]DIR\$|!MS\$"
-    INTEL_FPP_PRE: Pattern = compile(f"{INTEL_FPP_PRE_STR}", I)
     PP_REGEX: Pattern = compile(
-        rf"[ ]*(#|{INTEL_FPP_PRE_STR})[ ]*(if |ifdef|ifndef|else|elif|endif)",
+        r"[ ]*(#)[ ]*(if |ifdef|ifndef|else|elif|endif)",
         I,
     )
     PP_DEF: Pattern = compile(
-        rf"[ ]*(#|{INTEL_FPP_PRE_STR})[ ]*(define|undef|undefined)"
-        r"[ ]+(\w+)(\([ ]*([ \w,]*?)[ ]*\))?",
+        r"[ ]*(#)[ ]*(define|undef|undefined)" r"[ ]+(\w+)(\([ ]*([ \w,]*?)[ ]*\))?",
         I,
     )
     PP_DEF_TEST: Pattern = compile(r"(![ ]*)?defined[ ]*\([ ]*(\w*)[ ]*\)$", I)
     PP_INCLUDE: Pattern = compile(r"[ ]*#[ ]*include[ ]+([\"\w\.]*)", I)
-    PP_ANY: Pattern = compile(rf"(^[ ]*(?:#|{INTEL_FPP_PRE_STR})[ ]*\w*:?\w+)")
+    PP_ANY: Pattern = compile(r"(^[ ]*(?:#)[ ]*\w*:?\w+)")
     # Context matching rules
     CALL: Pattern = compile(r"[ ]*CALL[ ]+[\w%]*$", I)
     INT_STMNT: Pattern = compile(r"^[ ]*[a-z]*$", I)

test/test_interface.py

@@ -85,14 +85,14 @@ def test_command_line_code_actions_options():
     assert args.enable_code_actions
 
 
-def unittest_server_init():
+def unittest_server_init(conn=None):
     from fortls.langserver import LangServer
 
     root = (Path(__file__).parent / "test_source").resolve()
     parser = cli("fortls")
     args = parser.parse_args("-c f90_config.json".split())
 
-    server = LangServer(None, vars(args))
+    server = LangServer(conn, vars(args))
     server.root_path = root
     server._load_config_file()
 
@@ -171,16 +171,11 @@ def test_version_update_pypi():
     from packaging import version
 
     from fortls.jsonrpc import JSONRPC2Connection, ReadWriter
-    from fortls.langserver import LangServer
-
-    parser = cli("fortls")
-    args = parser.parse_args("-c f90_config.json".split())
-    args = vars(args)
-    args["disable_autoupdate"] = False
 
     stdin, stdout = sys.stdin.buffer, sys.stdout.buffer
-    s = LangServer(conn=JSONRPC2Connection(ReadWriter(stdin, stdout)), settings=args)
-    s.root_path = (Path(__file__).parent / "test_source").resolve()
+    s, root = unittest_server_init(JSONRPC2Connection(ReadWriter(stdin, stdout)))
+    s.disable_autoupdate = False
+
     did_update = s._update_version_pypi(test=True)
     isconda = os.path.exists(os.path.join(sys.prefix, "conda-meta"))
     assert not did_update if isconda else did_update

test/test_preproc.py

@@ -44,9 +44,8 @@ def check_return(result_array, checks):
     string += hover_req(file_path, 30, 23)
     file_path = root_dir / "preproc_spacing_arg_defs.F90"
     string += hover_req(file_path, 11, 20)
-    string += hover_req(file_path, 24, 17)
-    string += hover_req(file_path, 26, 13)
-    string += hover_req(file_path, 26, 42)
+    string += hover_req(file_path, 20, 17)
+    string += hover_req(file_path, 22, 13)
     config = str(root_dir / ".pp_conf.json")
     errcode, results = run_request(string, ["--config", config])
     assert errcode == 0
@@ -76,7 +75,6 @@ def check_return(result_array, checks):
         "```fortran90\n#define MAYBEWRAP(PROCEDURE) PROCEDURE\n```",
         "```fortran90\nSUBROUTINE test_type_set_test()\n```",
         "```fortran90\n#define MACROARGS(x, y) x + y\n```",
-        "```fortran90\nINTEGER(KIND=4), PARAMETER :: C_LONG = 4\n```",
     )
     assert len(ref_results) == len(results) - 1
     check_return(results[1:], ref_results)

test/test_server.py

@@ -198,10 +198,10 @@ def check_return(result_array):
             ["test_str2", 13, 5],
             ["test_sub", 6, 8],
             ["test_type", 5, 5],
-            ["test_type_set_test", 6, 29],
+            ["test_type_set_test", 6, 25],
             ["test_vis_mod", 2, 0],
             ["the_test", 13, 15],
-            ["wrap_test_type_set_test", 6, 37],
+            ["wrap_test_type_set_test", 6, 33],
         )
         assert len(result_array) == len(objs)
         for i, obj in enumerate(objs):

test/test_source/pp/.pp_conf.json

@@ -8,5 +8,4 @@
   "incl_suffixes": [".h"],
   "include_dirs": ["include"],
   "pp_defs": { "HAVE_CONTIGUOUS": "" },
-  "pp_parse_intel": true
 }

test/test_source/pp/preproc_spacing_arg_defs.F90

@@ -16,11 +16,7 @@ program preprocessor_spacing_arg_defs
   type(test_type) :: the_test
   integer :: argtest
 
-  !DEC$ IF DEFINED(SPACING_TEST).AND.DEFINED(MACROARGS)
-    INTEGER (KIND=4), PARAMETER :: C_LONG = 4
-  !DEC$ ELSE
-    INTEGER (KIND=4), PARAMETER :: C_LONG = 8
-  !DEC$ ENDIF
+  INTEGER (KIND=4), PARAMETER :: C_LONG = 4
 
   call the_test%set_test()