From 03b86cdbed3cec9f60d3a683bcbde16c0a96ec1b Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Sat, 11 Apr 2020 17:12:49 +0200 Subject: opts: Allow `-` and `not` in meson_options.txt (fixes #6948) --- mesonbuild/optinterpreter.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'mesonbuild/optinterpreter.py') diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index 2695a269c..c13cc5da3 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -166,6 +166,16 @@ class OptionInterpreter: return arg.value elif isinstance(arg, mparser.ArrayNode): return [self.reduce_single(curarg) for curarg in arg.args.arguments] + elif isinstance(arg, mparser.UMinusNode): + res = self.reduce_single(arg.value) + if not isinstance(res, (int, float)): + raise OptionException('Token after "-" is not a number') + return -res + elif isinstance(arg, mparser.NotNode): + res = self.reduce_single(arg.value) + if not isinstance(res, bool): + raise OptionException('Token after "not" is not a a boolean') + return not res else: raise OptionException('Arguments may only be string, int, bool, or array of those.') -- cgit v1.3