RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:48:11 +00:00
Code Issues Activity Actions

LibJS: Fix logical expressions

Browse source 
The current implementation of logical AND (&&) and logical OR (||)
always returns a boolean - this is not correct.
This commit is contained in:
Linus Groh 2020-04-03 14:33:28 +01:00 • committed by Andreas Kling
parent a58640ce6b
commit 6e5f9e20eb
3 changed files with 94 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Libraries/LibJS/AST.cpp
View file

@ -279,17 +279,21 @@ Value BinaryExpression::execute(Interpreter& interpreter) const
Value LogicalExpression::execute(Interpreter& interpreter) const
{
auto lhs_result = m_lhs->execute(interpreter).to_boolean();
auto lhs_result = m_lhs->execute(interpreter);
if (interpreter.exception())
return {};
auto rhs_result = m_rhs->execute(interpreter).to_boolean();
auto rhs_result = m_rhs->execute(interpreter);
if (interpreter.exception())
return {};
switch (m_op) {
case LogicalOp::And:
return Value(lhs_result && rhs_result);
if (lhs_result.to_boolean())
return Value(rhs_result);
return Value(lhs_result);
case LogicalOp::Or:
return Value(lhs_result || rhs_result);
if (lhs_result.to_boolean())
return Value(lhs_result);
return Value(rhs_result);
}
ASSERT_NOT_REACHED();