Skip to content

Fix and operator to return operands, not bools #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theadamdanielsson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix and operator to return operands, not bools #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/minja/minja.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,8 +1356,8 @@ class BinaryOpExpr : public Expression {
}

if (op == Op::And) {
if (!l.to_bool()) return Value(false);
return right->evaluate(context).to_bool();
if (!l.to_bool()) return l;
return right->evaluate(context);
} else if (op == Op::Or) {
if (l.to_bool()) return l;
return right->evaluate(context);
Expand Down
3 changes: 3 additions & 0 deletions tests/test-syntax.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,9 @@ TEST(SyntaxTest, SimpleCases) {
EXPECT_EQ(
"2; ; 10",
render(R"({{ {1: 2}.get(1) }}; {{ {}.get(1) or '' }}; {{ {}.get(1, 10) }})", {}, {}));
EXPECT_EQ(
"def; ; A; B",
render(R"({{ 'abc' and 'def' }}; {{ '' and 'x' }}; {{ (true and 'A') or 'B' }}; {{ (false and 'A') or 'B' }})", {}, {}));
EXPECT_EQ(
R"(1,1.2,"a",true,true,false,false,null,[],[1],[1, 2],{},{"a": 1},{"1": "b"},)",
render(R"(
Expand Down