summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2024-04-23 17:57:02 +0200
committerKlaus Aehlig <klaus.aehlig@huawei.com>2024-04-24 12:30:09 +0200
commitb390b41f7401ccb06e57ec459bf996ebdc4bd0f8 (patch)
tree666ac410d8dc2902bf6a1fdcee47a0b6a9769e5b
parenteb085c33aba12a332c3ee8e73d26a241a6996c41 (diff)
downloadjustbuild-b390b41f7401ccb06e57ec459bf996ebdc4bd0f8.tar.gz
expressions: add logical negation
While this can already be expressed by an "if" statement, having a dedicated function for logical negation makes some expressions more readable.
-rw-r--r--doc/concepts/expressions.md4
-rw-r--r--src/buildtool/build_engine/expression/evaluator.cpp9
-rw-r--r--test/buildtool/build_engine/expression/expression.test.cpp29
3 files changed, 42 insertions, 0 deletions
diff --git a/doc/concepts/expressions.md b/doc/concepts/expressions.md
index b3dbd82f..d54bf34f 100644
--- a/doc/concepts/expressions.md
+++ b/doc/concepts/expressions.md
@@ -213,6 +213,10 @@ those) argument(s) to obtain the final result.
##### Unary functions
+ - `"not"` Return the logical negation of the argument, i.e.,
+ if the argument is logically false, return `true`, and `false`
+ otherwise.
+
- `"nub_right"` The argument has to be a list. It is an error
if that list contains (directly or indirectly) a name. The
result is the input list, except that for all duplicate
diff --git a/src/buildtool/build_engine/expression/evaluator.cpp b/src/buildtool/build_engine/expression/evaluator.cpp
index d53259ba..2256a040 100644
--- a/src/buildtool/build_engine/expression/evaluator.cpp
+++ b/src/buildtool/build_engine/expression/evaluator.cpp
@@ -176,6 +176,14 @@ auto LogicalOr(SubExprEvaluator&& eval,
return ExpressionPtr{false};
}
+// Logical Negation
+auto Not(ExpressionPtr const& expr) -> ExpressionPtr {
+ if (ValueIsTrue(expr)) {
+ return ExpressionPtr{false};
+ }
+ return ExpressionPtr{true};
+}
+
auto Keys(ExpressionPtr const& d) -> ExpressionPtr {
auto const& m = d->Map();
auto result = Expression::list_t{};
@@ -1092,6 +1100,7 @@ auto const kBuiltInFunctions =
{"==", EqualExpr},
{"and", AndExpr},
{"or", OrExpr},
+ {"not", UnaryExpr(Not)},
{"++", UnaryExpr(Flatten)},
{"+", UnaryExpr(Addition)},
{"*", UnaryExpr(Multiplication)},
diff --git a/test/buildtool/build_engine/expression/expression.test.cpp b/test/buildtool/build_engine/expression/expression.test.cpp
index 1d7bde3e..0bc5439b 100644
--- a/test/buildtool/build_engine/expression/expression.test.cpp
+++ b/test/buildtool/build_engine/expression/expression.test.cpp
@@ -647,6 +647,35 @@ TEST_CASE("Expression Evaluation", "[expression]") { // NOLINT
CHECK(failure == Expression::FromJson("false"_json));
}
+ SECTION("not expression") {
+ auto expr = Expression::FromJson(R"(
+ { "type": "not"
+ , "$1": {"type": "var", "name": "x" }
+ })"_json);
+ REQUIRE(expr);
+
+ CHECK(expr.Evaluate(env.Update("x", true), fcts) ==
+ Expression::FromJson("false"_json));
+ CHECK(expr.Evaluate(env.Update("x", false), fcts) ==
+ Expression::FromJson("true"_json));
+ CHECK(expr.Evaluate(env.Update("x", Expression::FromJson(R"([])"_json)),
+ fcts) == Expression::FromJson("true"_json));
+ CHECK(expr.Evaluate(
+ env.Update("x", Expression::FromJson(R"(["a"])"_json)),
+ fcts) == Expression::FromJson("false"_json));
+ CHECK(expr.Evaluate(env.Update("x", Expression::FromJson("null"_json)),
+ fcts) == Expression::FromJson("true"_json));
+ CHECK(expr.Evaluate(env.Update("x", Expression::FromJson("0"_json)),
+ fcts) == Expression::FromJson("true"_json));
+ CHECK(expr.Evaluate(env.Update("x", Expression::FromJson("1"_json)),
+ fcts) == Expression::FromJson("false"_json));
+ CHECK(expr.Evaluate(env.Update("x", Expression::FromJson(R"("")"_json)),
+ fcts) == Expression::FromJson("true"_json));
+ CHECK(expr.Evaluate(
+ env.Update("x", Expression::FromJson(R"("0")"_json)), fcts) ==
+ Expression::FromJson("false"_json));
+ }
+
SECTION("and expression") {
auto expr = Expression::FromJson(R"(
{ "type": "and"