aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter/interpreter.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-06-07 09:57:37 -0700
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-06-08 11:00:55 +0200
commit3e998527a350cb197ca61b59c0a98cb6681b5fdd (patch)
treed67d4d1959014d9c420e34083d30b805344dc4c3 /mesonbuild/interpreter/interpreter.py
parent6ab78b5979afb3347eca0da1a8000aee3a443cb9 (diff)
downloadmeson-3e998527a350cb197ca61b59c0a98cb6681b5fdd.zip
meson-3e998527a350cb197ca61b59c0a98cb6681b5fdd.tar.gz
meson-3e998527a350cb197ca61b59c0a98cb6681b5fdd.tar.bz2
interpreter: use typed_pos_args for add_*_args
This just replaces stringArgs with the typed_pos_args, and it's better error message.
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
-rw-r--r--mesonbuild/interpreter/interpreter.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index eff76be..38ab22f 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -2531,28 +2531,28 @@ This warning will become a hard error in a future Meson release.
exclude_suites)
@permittedKwargs({'language', 'native'})
- @stringArgs
- def func_add_global_arguments(self, node, args, kwargs):
+ @typed_pos_args('add_global_arguments', varargs=str)
+ def func_add_global_arguments(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwargs):
for_machine = self.machine_from_native_kwarg(kwargs)
- self.add_global_arguments(node, self.build.global_args[for_machine], args, kwargs)
+ self.add_global_arguments(node, self.build.global_args[for_machine], args[0], kwargs)
@permittedKwargs({'language', 'native'})
- @stringArgs
- def func_add_global_link_arguments(self, node, args, kwargs):
+ @typed_pos_args('add_global_link_arguments', varargs=str)
+ def func_add_global_link_arguments(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwargs):
for_machine = self.machine_from_native_kwarg(kwargs)
- self.add_global_arguments(node, self.build.global_link_args[for_machine], args, kwargs)
+ self.add_global_arguments(node, self.build.global_link_args[for_machine], args[0], kwargs)
@permittedKwargs({'language', 'native'})
- @stringArgs
- def func_add_project_arguments(self, node, args, kwargs):
+ @typed_pos_args('add_project_arguments', varargs=str)
+ def func_add_project_arguments(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwargs):
for_machine = self.machine_from_native_kwarg(kwargs)
- self.add_project_arguments(node, self.build.projects_args[for_machine], args, kwargs)
+ self.add_project_arguments(node, self.build.projects_args[for_machine], args[0], kwargs)
@permittedKwargs({'language', 'native'})
- @stringArgs
- def func_add_project_link_arguments(self, node, args, kwargs):
+ @typed_pos_args('add_project_link_arguments', varargs=str)
+ def func_add_project_link_arguments(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwargs):
for_machine = self.machine_from_native_kwarg(kwargs)
- self.add_project_arguments(node, self.build.projects_link_args[for_machine], args, kwargs)
+ self.add_project_arguments(node, self.build.projects_link_args[for_machine], args[0], kwargs)
def warn_about_builtin_args(self, args):
# -Wpedantic is deliberately not included, since some people want to use it but not use -Wextra