diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-10-10 00:47:17 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-10 00:47:17 +0300 |
commit | 34ea71239db48951573180a41326d85890a6bb2e (patch) | |
tree | 93e0d973bda562e7b1fb7652e70bfdbed21e6bfd /mesonbuild/interpreterbase.py | |
parent | b8fbbf596473ea3a2a2d7a6cf8ec7ee68527184c (diff) | |
parent | 9855b2d3c58800f485355229102212eaebf6645a (diff) | |
download | meson-34ea71239db48951573180a41326d85890a6bb2e.zip meson-34ea71239db48951573180a41326d85890a6bb2e.tar.gz meson-34ea71239db48951573180a41326d85890a6bb2e.tar.bz2 |
Merge pull request #6011 from xclaesse/not-disabler
Fix `if not disabler()` case
Diffstat (limited to 'mesonbuild/interpreterbase.py')
-rw-r--r-- | mesonbuild/interpreterbase.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py index 70751c1..3e09310 100644 --- a/mesonbuild/interpreterbase.py +++ b/mesonbuild/interpreterbase.py @@ -500,6 +500,8 @@ class InterpreterBase: def evaluate_notstatement(self, cur): v = self.evaluate_statement(cur.value) + if is_disabler(v): + return v if not isinstance(v, bool): raise InterpreterException('Argument to "not" is not a boolean.') return not v @@ -680,8 +682,6 @@ The result of this is undefined and will become a hard error in a future Meson r if len(node.varnames) != 1: raise InvalidArguments('Foreach on array does not unpack') varname = node.varnames[0].value - if is_disabler(items): - return items for item in items: self.set_variable(varname, item) try: @@ -693,8 +693,6 @@ The result of this is undefined and will become a hard error in a future Meson r elif isinstance(items, dict): if len(node.varnames) != 2: raise InvalidArguments('Foreach on dict unpacks key and value') - if is_disabler(items): - return items for key, value in items.items(): self.set_variable(node.varnames[0].value, key) self.set_variable(node.varnames[1].value, value) |