Make coredata and environment fully type safe

mesonbuild/cmake/executor.py

@@ -52,7 +52,9 @@ def __init__(self, environment: 'Environment', version: str, for_machine: Machin
             self.cmakebin = None
             return
 
-        self.prefix_paths = self.environment.coredata.optstore.get_value(OptionKey('cmake_prefix_path', machine=self.for_machine))
+        pp = self.environment.coredata.optstore.get_value(OptionKey('cmake_prefix_path', machine=self.for_machine))
+        assert isinstance(pp, list), 'for mypy'
+        self.prefix_paths = pp
         if self.prefix_paths:
             self.extra_cmake_args += ['-DCMAKE_PREFIX_PATH={}'.format(';'.join(self.prefix_paths))]
 

mesonbuild/cmake/interpreter.py

@@ -19,6 +19,7 @@
 from .traceparser import CMakeTraceParser
 from .tracetargets import resolve_cmake_trace_targets
 from .. import mlog, mesonlib
+from .. import options
 from ..mesonlib import MachineChoice, OrderedSet, path_is_in_root, relative_to_if_possible
 from ..options import OptionKey
 from ..mesondata import DataFile
@@ -533,17 +534,12 @@ def _all_source_suffixes(self) -> 'ImmutableListProtocol[str]':
     @lru_cache(maxsize=None)
     def _all_lang_stds(self, lang: str) -> 'ImmutableListProtocol[str]':
         try:
-            res = self.env.coredata.optstore.get_value_object(OptionKey(f'{lang}_std', machine=MachineChoice.BUILD)).choices
+            opt = self.env.coredata.optstore.get_value_object(OptionKey(f'{lang}_std', machine=MachineChoice.BUILD))
+            assert isinstance(opt, (options.UserStdOption, options.UserComboOption)), 'for mypy'
+            return opt.choices or []
         except KeyError:
             return []
 
-        # TODO: Get rid of this once we have proper typing for options
-        assert isinstance(res, list)
-        for i in res:
-            assert isinstance(i, str)
-
-        return res
-
     def process_inter_target_dependencies(self) -> None:
         # Move the dependencies from all TRANSFER_DEPENDENCIES_FROM to the target
         to_process = list(self.depends)

mesonbuild/compilers/c.py

@@ -154,19 +154,18 @@ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_
     def get_options(self) -> 'MutableKeyedOptionDictType':
         opts = super().get_options()
         if self.info.is_windows() or self.info.is_cygwin():
-            self.update_options(
-                opts,
-                self.create_option(options.UserArrayOption,
-                                   self.form_compileropt_key('winlibs'),
-                                   'Standard Win libraries to link against',
-                                   gnu_winlibs),
-            )
+            key = self.form_compileropt_key('winlibs')
+            opts[key] = options.UserStringArrayOption(
+                self.make_option_name(key),
+                'Standard Win libraries to link against',
+                gnu_winlibs)
         return opts
 
     def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]:
         args = []
         key = self.form_compileropt_key('std')
         std = options.get_value(key)
+        assert isinstance(std, str), 'for mypy'
         if std != 'none':
             args.append('-std=' + std)
         return args
@@ -175,11 +174,9 @@ def get_option_link_args(self, options: 'KeyedOptionDictType') -> T.List[str]:
         if self.info.is_windows() or self.info.is_cygwin():
             # without a typedict mypy can't understand this.
             key = self.form_compileropt_key('winlibs')
-            libs = options.get_value(key).copy()
-            assert isinstance(libs, list)
-            for l in libs:
-                assert isinstance(l, str)
-            return libs
+            libs = options.get_value(key)
+            assert isinstance(libs, list), 'for mypy'
+            return libs.copy()
         return []
 
 
@@ -260,6 +257,7 @@ def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]
         args = []
         key = self.form_compileropt_key('std')
         std = options.get_value(key)
+        assert isinstance(std, str), 'for mypy'
         if std != 'none':
             args.append('-std=' + std)
         return args
@@ -307,19 +305,18 @@ def get_options(self) -> 'MutableKeyedOptionDictType':
         assert isinstance(std_opt, options.UserStdOption), 'for mypy'
         std_opt.set_versions(stds, gnu=True)
         if self.info.is_windows() or self.info.is_cygwin():
-            self.update_options(
-                opts,
-                self.create_option(options.UserArrayOption,
-                                   key.evolve('c_winlibs'),
-                                   'Standard Win libraries to link against',
-                                   gnu_winlibs),
-            )
+            key = self.form_compileropt_key('winlibs')
+            opts[key] = options.UserStringArrayOption(
+                self.make_option_name(key),
+                'Standard Win libraries to link against',
+                gnu_winlibs)
         return opts
 
     def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]:
         args = []
         key = self.form_compileropt_key('std')
         std = options.get_value(key)
+        assert isinstance(std, str), 'for mypy'
         if std != 'none':
             args.append('-std=' + std)
         return args
@@ -328,11 +325,9 @@ def get_option_link_args(self, options: 'KeyedOptionDictType') -> T.List[str]:
         if self.info.is_windows() or self.info.is_cygwin():
             # without a typeddict mypy can't figure this out
             key = self.form_compileropt_key('winlibs')
-            libs: T.List[str] = options.get_value(key).copy()
-            assert isinstance(libs, list)
-            for l in libs:
-                assert isinstance(l, str)
-            return libs
+            libs = options.get_value(key)
+            assert isinstance(libs, list), 'fpr mypy'
+            return libs.copy()
         return []
 
     def get_pch_use_args(self, pch_dir: str, header: str) -> T.List[str]:
@@ -434,6 +429,7 @@ def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]
         args = []
         key = self.form_compileropt_key('std')
         std = options.get_value(key)
+        assert isinstance(std, str), 'for mypy'
         if std != 'none':
             args.append('-std=' + std)
         return args
@@ -449,24 +445,20 @@ class VisualStudioLikeCCompilerMixin(CompilerMixinBase):
     """Shared methods that apply to MSVC-like C compilers."""
 
     def get_options(self) -> MutableKeyedOptionDictType:
-        return self.update_options(
-            super().get_options(),
-            self.create_option(
-                options.UserArrayOption,
-                self.form_compileropt_key('winlibs'),
-                'Windows libs to link against.',
-                msvc_winlibs,
-            ),
-        )
+        opts = super().get_options()
+        key = self.form_compileropt_key('winlibs')
+        opts[key] = options.UserStringArrayOption(
+            self.make_option_name(key),
+            'Standard Win libraries to link against',
+            msvc_winlibs)
+        return opts
 
     def get_option_link_args(self, options: 'KeyedOptionDictType') -> T.List[str]:
         # need a TypeDict to make this work
         key = self.form_compileropt_key('winlibs')
-        libs = options.get_value(key).copy()
-        assert isinstance(libs, list)
-        for l in libs:
-            assert isinstance(l, str)
-        return libs
+        libs = options.get_value(key)
+        assert isinstance(libs, list), 'for mypy'
+        return libs.copy()
 
 
 class VisualStudioCCompiler(MSVCCompiler, VisualStudioLikeCCompilerMixin, CCompiler):
@@ -554,6 +546,7 @@ def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]
         args = []
         key = self.form_compileropt_key('std')
         std = options.get_value(key)
+        assert isinstance(std, str), 'for mypy'
         if std == 'c89':
             mlog.log("ICL doesn't explicitly implement c89, setting the standard to 'none', which is close.", once=True)
         elif std != 'none':
@@ -588,6 +581,7 @@ def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]
         args = []
         key = self.form_compileropt_key('std')
         std = options.get_value(key)
+        assert isinstance(std, str), 'for mypy'
         if std != 'none':
             args.append('--' + std)
         return args
@@ -669,6 +663,7 @@ def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]
         args = []
         key = self.form_compileropt_key('std')
         std = options.get_value(key)
+        assert isinstance(std, str), 'for mypy'
         if std != 'none':
             args.append('-ansi')
             args.append('-std=' + std)
@@ -753,6 +748,7 @@ def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]
         args = []
         key = self.form_compileropt_key('std')
         std = options.get_value(key)
+        assert isinstance(std, str), 'for mypy'
         if std != 'none':
             args.append('--' + std)
         return args
@@ -780,15 +776,14 @@ def get_instruction_set_args(self, instruction_set: str) -> T.Optional[T.List[st
 
     def get_options(self) -> 'MutableKeyedOptionDictType':
         opts = CCompiler.get_options(self)
-        c_stds = ['c99']
-        key = self.form_compileropt_key('std')
-        opts[key].choices = ['none'] + c_stds
+        self._update_language_stds(opts, ['c99'])
         return opts
 
     def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]:
         args = []
         key = self.form_compileropt_key('std')
         std = options.get_value(key)
+        assert isinstance(std, str), 'for mypy'
         if std != 'none':
             args.append('-lang')
             args.append(std)
@@ -810,15 +805,14 @@ def get_instruction_set_args(self, instruction_set: str) -> T.Optional[T.List[st
 
     def get_options(self) -> 'MutableKeyedOptionDictType':
         opts = CCompiler.get_options(self)
-        c_stds = ['c99']
-        key = self.form_compileropt_key('std')
-        opts[key].choices = ['none'] + c_stds
+        self._update_language_stds(opts, ['c99'])
         return opts
 
     def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]:
         args = []
         key = self.form_compileropt_key('std')
         std = options.get_value(key)
+        assert isinstance(std, str), 'for mypy'
         if std != 'none':
             args.append('-lang ' + std)
         return args