dict: Fully evaluate keys

The only restriction is keys must be string after evaluation. This fix
various inconsistencies.

1 files changed, 1 insertions, 13 deletions

diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py
index 80ffefd..76ad374 100644
--- a/mesonbuild/mparser.py
+++ b/mesonbuild/mparser.py
@@ -676,19 +676,7 @@ class Parser:
         while not isinstance(s, EmptyNode):
             potential = self.current
             if self.accept('colon'):
-                key_value = self.statement()
-                if isinstance(s, StringNode):
-                    if s.value in a.kwargs:
-                        # + 1 to colno to point to the actual string, not the opening quote
-                        raise ParseException('Duplicate dictionary key: {}'.format(s.value), self.getline(), s.lineno, s.colno + 1)
-                    a.set_kwarg(s.value, key_value)
-                elif isinstance(s, IdNode) and isinstance(s.value, str):
-                    for key in a.kwargs:
-                        if s.value == key.value:
-                            raise ParseException('Duplicate dictionary variable key: {}'.format(s.value), self.getline(), s.lineno, s.colno)
-                    a.set_kwarg(s, key_value)
-                else:
-                    raise ParseException('Key must be a string or string variable', self.getline(), s.lineno, s.colno)
+                a.set_kwarg(s, self.statement())
                 potential = self.current
                 if not self.accept('comma'):
                     return a