From 9c1e72202de8015e16a4ba2ccf8ea50c10f474f7 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Fri, 28 Aug 2020 17:58:54 +0200 Subject: typing: refactor dict handling --- mesonbuild/ast/interpreter.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'mesonbuild/ast/interpreter.py') diff --git a/mesonbuild/ast/interpreter.py b/mesonbuild/ast/interpreter.py index fb77db0..55812d3 100644 --- a/mesonbuild/ast/interpreter.py +++ b/mesonbuild/ast/interpreter.py @@ -38,7 +38,6 @@ from ..mparser import ( NotNode, OrNode, PlusAssignmentNode, - StringNode, TernaryNode, UMinusNode, ) @@ -216,15 +215,16 @@ class AstInterpreter(interpreterbase.InterpreterBase): def unknown_function_called(self, func_name: str) -> None: pass - def reduce_arguments(self, args: ArgumentNode, resolve_key_nodes: bool = True) -> T.Tuple[T.List[TYPE_nvar], TYPE_nkwargs]: + def reduce_arguments( + self, + args: mparser.ArgumentNode, + key_resolver: T.Callable[[mparser.BaseNode], str] = interpreterbase.default_resolve_key, + duplicate_key_error: T.Optional[str] = None, + ) -> T.Tuple[T.List[TYPE_nvar], TYPE_nkwargs]: if isinstance(args, ArgumentNode): - kwargs = {} # type: T.Dict[T.Union[str, BaseNode], TYPE_nvar] + kwargs = {} # type: T.Dict[str, TYPE_nvar] for key, val in args.kwargs.items(): - if resolve_key_nodes and isinstance(key, (StringNode, IdNode)): - assert isinstance(key.value, str) - kwargs[key.value] = val - else: - kwargs[key] = val + kwargs[key_resolver(key)] = val if args.incorrect_order(): raise InvalidArguments('All keyword arguments must be after positional arguments.') return self.flatten_args(args.arguments), kwargs -- cgit v1.1 From 057c77f7d08b3372e99065fb3f3cd37f16801a82 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Tue, 8 Sep 2020 20:46:11 +0200 Subject: typing: fixup for #7708 --- mesonbuild/ast/interpreter.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesonbuild/ast/interpreter.py') diff --git a/mesonbuild/ast/interpreter.py b/mesonbuild/ast/interpreter.py index 55812d3..23c8427 100644 --- a/mesonbuild/ast/interpreter.py +++ b/mesonbuild/ast/interpreter.py @@ -192,7 +192,11 @@ class AstInterpreter(interpreterbase.InterpreterBase): self.evaluate_statement(node.falseblock) def evaluate_dictstatement(self, node: mparser.DictNode) -> TYPE_nkwargs: - (arguments, kwargs) = self.reduce_arguments(node.args, resolve_key_nodes=False) + def resolve_key(node: mparser.BaseNode) -> str: + if isinstance(node, mparser.StringNode): + return node.value + return '__AST_UNKNOWN__' + arguments, kwargs = self.reduce_arguments(node.args, key_resolver=resolve_key) assert (not arguments) self.argument_depth += 1 for key, value in kwargs.items(): -- cgit v1.1