Support selected Intel-specific preprocessor macro expansions

docs/options.rst

@@ -72,6 +72,7 @@ All the ``fortls`` settings with their default arguments can be found below
       "pp_suffixes": [],
       "include_dirs": [],
       "pp_defs": {},
+      "pp_parse_intel": false,
 
       "symbol_skip_mem": false,
 
@@ -198,6 +199,13 @@ Additional **preprocessor definitions** from what are specified in files found i
 
 .. note:: Definitions in ``pp_defs`` will override definitions from ``include_dirs``
 
+pp_parse_intel
+**************
+
+Parses Intel compiler directive defines and conditionals of the form
+``!DEC$``, ``!DIR$``, ``CDIR$``, ``CDEC$``, ``*DIR$``, ``*DEC$``, or ``!MS$``.
+Only defines, undefines, and if defined statements are evaluated.
+
 
 Limitations
 ***********

fortls/__init__.py

@@ -472,6 +472,7 @@ def locate_config(root: str) -> str | None:
     pp_suffixes = None
     pp_defs = {}
     include_dirs = set()
+    pp_parse_intel = False
     if args.debug_rootpath:
         # Check for config files
         config_path = locate_config(args.debug_rootpath)
@@ -482,6 +483,7 @@ def locate_config(root: str) -> str | None:
                     config_dict = json.load(fhandle)
                     pp_suffixes = config_dict.get("pp_suffixes", None)
                     pp_defs = config_dict.get("pp_defs", {})
+                    pp_parse_intel = config_dict.get("pp_parse_intel", False)
                     include_dirs = set()
                     for path in config_dict.get("include_dirs", set()):
                         include_dirs.update(
@@ -501,7 +503,12 @@ def locate_config(root: str) -> str | None:
         error_exit(f"Reading file failed: {err_str}")
     print(f"  Detected format: {'fixed' if file_obj.fixed else 'free'}")
     print("\n=========\nParser Output\n=========\n")
-    file_ast = file_obj.parse(debug=True, pp_defs=pp_defs, include_dirs=include_dirs)
+    file_ast = file_obj.parse(
+        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():
         print("{}: {}".format(obj.get_type(), obj.FQSN))

fortls/fortls.schema.json

@@ -171,6 +171,12 @@
       "default": {},
       "type": "object"
     },
+    "pp_parse_intel": {
+      "title": "Pp Parse Intel",
+      "description": "Parses Intel compiler directive defines and conditionals.",
+      "default": false,
+      "type": "boolean"
+    },
     "symbol_skip_mem": {
       "title": "Symbol Skip Mem",
       "description": "Do not include type members in document symbol results",

fortls/interface.py

@@ -256,6 +256,11 @@ def cli(name: str = "fortls") -> argparse.ArgumentParser:
             "Preprocessor definitions are normally included via INCLUDE_DIRS"
         ),
     )
+    group.add_argument(
+        "--pp_parse_intel",
+        action="store_true",
+        help="Parses Intel compiler directive defines and conditionals.",
+    )
 
     # Symbols options ----------------------------------------------------------
     group = parser.add_argument_group("Symbols options")

fortls/langserver.py

@@ -751,11 +751,18 @@
             return None
         # Search in Preprocessor defined variables
         if def_name in def_file.pp_defs:
+            def_value = def_file.pp_defs.get(def_name)
+            def_arg_str = ""
+            if isinstance(def_value, tuple):
+                def_arg_str, def_value = def_value
+                def_arg_str = ", ".join([x.strip() for x in def_arg_str.split(",")])
+                def_arg_str = f"({def_arg_str})"
+
             var = Variable(
                 def_file.ast,
                 def_line + 1,
                 def_name,
-                f"#define {def_name} {def_file.pp_defs.get(def_name)}",
+                f"#define {def_name}{def_arg_str} {def_value}",
                 [],
             )
             return var
@@ -1316,7 +1323,9 @@
             # Update inheritance (currently file only)
             # tmp_file.ast.resolve_links(self.obj_tree, self.link_version)
         elif file_obj.preproc:
-            file_obj.preprocess(pp_defs=self.pp_defs)
+            file_obj.preprocess(
+                pp_defs=self.pp_defs, pp_parse_intel=self.pp_parse_intel
+            )
             self.pp_defs = {**self.pp_defs, **file_obj.pp_defs}
 
     def serve_onOpen(self, request: dict):
@@ -1389,7 +1398,9 @@
                 if not file_changed:
                     return False, None
             ast_new = file_obj.parse(
-                pp_defs=self.pp_defs, include_dirs=self.include_dirs
+                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
@@ -1422,6 +1433,7 @@
         pp_suffixes: list[str],
         include_dirs: set[str],
         sort: bool,
+        pp_parse_intel: bool,
     ):
         """Initialise a Fortran file
 
@@ -1437,6 +1449,8 @@
             Preprocessor only include directories, not used by normal parser
         sort : bool
             Whether or not keywords should be sorted
+        pp_parse_intel : bool
+            Parse Intel FPP directives
 
         Returns
         -------
@@ -1453,7 +1467,11 @@
             # This is a bypass.
             # For more see on SO: shorturl.at/hwAG1
             set_keyword_ordering(sort)
-            file_ast = file_obj.parse(pp_defs=pp_defs, include_dirs=include_dirs)
+            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)
             return "Error during parsing"
@@ -1476,6 +1494,7 @@
                     self.pp_suffixes,
                     self.include_dirs,
                     self.sort_keywords,
+                    self.pp_parse_intel,
                 ),
             )
         pool.close()
@@ -1632,6 +1651,7 @@
     def _load_config_file_preproc(self, config_dict: dict) -> None:
         self.pp_suffixes = config_dict.get("pp_suffixes", None)
         self.pp_defs = config_dict.get("pp_defs", {})
+        self.pp_parse_intel = config_dict.get("pp_parse_intel", False)
         if isinstance(self.pp_defs, list):
             self.pp_defs = {key: "" for key in self.pp_defs}