compilers: make lang_map public

Author: thesamesam

mesonbuild/compilers/detect.py

@@ -1333,7 +1333,7 @@ def _get_gnu_compiler_defines(compiler: T.List[str], lang: str) -> T.Dict[str, s
     """
     Get the list of GCC pre-processor defines
     """
-    from .mixins.gnu import _LANG_MAP as gnu_LANG_MAP
+    from .mixins.gnu import gnu_lang_map
 
     def _try_obtain_compiler_defines(args: T.List[str]) -> str:
         mlog.debug(f'Running command: {join_args(args)}')
@@ -1355,7 +1355,7 @@ def _try_obtain_compiler_defines(args: T.List[str]) -> str:
 
         # We might not have a match for Fortran, so fallback to detection
         # based on the driver.
-        lang = gnu_LANG_MAP[lang]
+        lang = gnu_lang_map[lang]
 
         # The compiler may not infer the target language based on the driver name
         # so first, try with '-cpp -x lang', then fallback without given it's less
@@ -1386,7 +1386,7 @@ def _get_clang_compiler_defines(compiler: T.List[str], lang: str) -> T.Dict[str,
     """
     Get the list of Clang pre-processor defines
     """
-    from .mixins.clang import _LANG_MAP as clang_LANG_MAP
+    from .mixins.clang import clang_lang_map
 
     def _try_obtain_compiler_defines(args: T.List[str]) -> str:
         mlog.debug(f'Running command: {join_args(args)}')
@@ -1407,7 +1407,7 @@ def _try_obtain_compiler_defines(args: T.List[str]) -> str:
 
         # We might not have a match for Fortran, so fallback to detection
         # based on the driver.
-        lang = clang_LANG_MAP[lang]
+        lang = clang_lang_map[lang]
 
         # The compiler may not infer the target language based on the driver name
         # so first, try with '-cpp -x lang', then fallback without given it's less

mesonbuild/compilers/mixins/clang.py

@@ -36,7 +36,7 @@
     's': ['-Oz'],
 }
 
-_LANG_MAP = {
+clang_lang_map = {
     'c': 'c',
     'cpp': 'c++',
     'objc': 'objective-c',

mesonbuild/compilers/mixins/gnu.py

@@ -309,7 +309,7 @@
     ],
 }
 
-_LANG_MAP = {
+gnu_lang_map = {
     'c': 'c',
     'cpp': 'c++',
     'objc': 'objective-c',
@@ -318,9 +318,9 @@
 
 @functools.lru_cache(maxsize=None)
 def gnulike_default_include_dirs(compiler: T.Tuple[str, ...], lang: str) -> 'ImmutableListProtocol[str]':
-    if lang not in _LANG_MAP:
+    if lang not in gnu_lang_map:
         return []
-    lang = _LANG_MAP[lang]
+    lang = gnu_lang_map[lang]
     env = os.environ.copy()
     env["LC_ALL"] = 'C'
     cmd = list(compiler) + [f'-x{lang}', '-E', '-v', '-']
@@ -534,7 +534,7 @@ def get_preprocess_to_file_args(self) -> T.List[str]:
         # We want to allow preprocessing files with any extension, such as
         # foo.c.in. In that case we need to tell GCC/CLANG to treat them as
         # assembly file.
-        lang = _LANG_MAP.get(self.language, 'assembler-with-cpp')
+        lang = gnu_lang_map.get(self.language, 'assembler-with-cpp')
         return self.get_preprocess_only_args() + [f'-x{lang}']