diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-06-01 20:48:35 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-06-15 12:48:53 -0700 |
| commit | d2c1ab40a0c94209d8e13886f3c7d697d30f2507 (patch) | |
| tree | b1d1d6600aaea3942e001036ad8504cc34f09ad1 /mesonbuild/interpreter/interpreter.py | |
| parent | 2ac9b323918e8c61c4707fbd79d45cf1c6eecfd0 (diff) | |
| download | meson-d2c1ab40a0c94209d8e13886f3c7d697d30f2507.zip meson-d2c1ab40a0c94209d8e13886f3c7d697d30f2507.tar.gz meson-d2c1ab40a0c94209d8e13886f3c7d697d30f2507.tar.bz2 | |
interpreter|build: Pass just the executable down to Generator
This requires that the interpreter has done the validation, which it now
does at all callsites. This simplifies the Generator initializer.
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index cb513f7..3c69edf 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1954,8 +1954,10 @@ This will become a hard error in the future.''' % kwargs['input'], location=self @permittedKwargs({'arguments', 'output', 'depends', 'depfile', 'capture', 'preserve_path_from'}) - def func_generator(self, node: mparser.FunctionNode, args, kwargs) -> GeneratorHolder: - gen = build.Generator(args, kwargs) + @typed_pos_args('generator', (ExecutableHolder, ExternalProgramHolder)) + def func_generator(self, node: mparser.FunctionNode, args: T.Tuple[T.Union[ExecutableHolder, ExternalProgramHolder]], + kwargs) -> GeneratorHolder: + gen = build.Generator(args[0].held_object, kwargs) holder = GeneratorHolder(self, gen, self) self.generators.append(holder) return holder |