aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-06-19 21:56:09 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-08-01 20:46:40 +0300
commitd90fcb4048f720a238cbb350164ec8f63d1eec60 (patch)
treeac64eb1624beed298bacf50b27cdca0cc57d454b
parent4f6be39d2668713c6c5b9d7bba06a58553f68887 (diff)
downloadmeson-d90fcb4048f720a238cbb350164ec8f63d1eec60.zip
meson-d90fcb4048f720a238cbb350164ec8f63d1eec60.tar.gz
meson-d90fcb4048f720a238cbb350164ec8f63d1eec60.tar.bz2
Created ternary operator. Closes #538.
-rw-r--r--mesonbuild/interpreter.py12
-rw-r--r--mesonbuild/mparser.py14
-rw-r--r--test cases/common/116 ternary/meson.build7
3 files changed, 33 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 5201be2..fddc3c0 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1323,6 +1323,8 @@ class Interpreter():
return self.evaluate_plusassign(cur)
elif isinstance(cur, mparser.IndexNode):
return self.evaluate_indexing(cur)
+ elif isinstance(cur, mparser.TernaryNode):
+ return self.evaluate_ternary(cur)
elif self.is_elementary_type(cur):
return cur
else:
@@ -2401,6 +2403,16 @@ class Interpreter():
if not isinstance(node.elseblock, mparser.EmptyNode):
self.evaluate_codeblock(node.elseblock)
+ def evaluate_ternary(self, node):
+ assert(isinstance(node, mparser.TernaryNode))
+ result = self.evaluate_statement(node.condition)
+ if not isinstance(result, bool):
+ raise InterpreterException('Ternary condition is not boolean.')
+ if result:
+ return self.evaluate_statement(node.trueblock)
+ else:
+ return self.evaluate_statement(node.falseblock)
+
def evaluate_foreach(self, node):
assert(isinstance(node, mparser.ForeachClauseNode))
varname = node.varname.value
diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py
index fd720fb..b3fdba8 100644
--- a/mesonbuild/mparser.py
+++ b/mesonbuild/mparser.py
@@ -67,6 +67,7 @@ class Lexer:
('lt', re.compile(r'<')),
('ge', re.compile(r'>=')),
('gt', re.compile(r'>')),
+ ('questionmark', re.compile(r'\?')),
]
def lex(self, code):
@@ -282,6 +283,14 @@ class IfNode():
self.condition = condition
self.block = block
+class TernaryNode():
+ def __init__(self, lineno, colno, condition, trueblock, falseblock):
+ self.lineno = lineno
+ self.colno = colno
+ self.condition = condition
+ self.trueblock = trueblock
+ self.falseblock = falseblock
+
class ArgumentNode():
def __init__(self, token):
self.lineno = token.lineno
@@ -383,6 +392,11 @@ class Parser:
raise ParseException('Assignment target must be an id.',
left.lineno, left.colno)
return AssignmentNode(left.lineno, left.colno, left.value, value)
+ elif self.accept('questionmark'):
+ trueblock = self.e1()
+ self.expect('colon')
+ falseblock = self.e1()
+ return TernaryNode(left.lineno, left.colno, left, trueblock, falseblock)
return left
def e2(self):
diff --git a/test cases/common/116 ternary/meson.build b/test cases/common/116 ternary/meson.build
new file mode 100644
index 0000000..3e65046
--- /dev/null
+++ b/test cases/common/116 ternary/meson.build
@@ -0,0 +1,7 @@
+project('ternary operator', 'c')
+
+one = true ? 1 : error('False branch should not be evaluated')
+two = false ? error('True branch should not be evaluated.') : 2
+
+assert(one == 1, 'Return value from ternary true is wrong.')
+assert(two == 2, 'Return value from ternary false is wrong.')