Make operators &&, || behave like in JavaScript

fixes #8290

diff --git a/doc/15-language-reference.md b/doc/15-language-reference.md
index 71bfff0572e75b9e091f7a747db3a27b0712ee2c..ea4112cccea8d37d85d5918bff0b97ef1d1cda87 100644 (file)
--- a/doc/15-language-reference.md
+++ b/doc/15-language-reference.md
@@ -163,8 +163,8 @@ Operator | Examples (Result)                             | Description
 ^        | 17 ^ 12 (29)                                  | Bitwise XOR
 &        | 7 & 3 (3)                                     | Binary AND
 |   | 2 | 3 (3)                                | Binary OR
-&&       | true && false (false)                         | Logical AND
-|| | true || false (true)            | Logical OR
+&&       | true && false (false), 3 && 7 (7), 0 && 7 (0) | Logical AND
+|| | true || false (true), 0 || 7 (7)| Logical OR
 <        | 3 < 5 (true)                                  | Less than
 >        | 3 > 5 (false)                                 | Greater than
 <=       | 3 <= 3 (true)                                 | Less than or equal
@@ -432,9 +432,9 @@ UserGroup         | user
 
 ## <a id="boolean-values"></a> Boolean Values
 
-The `assign where` and `ignore where` statements, the `!`, `&&` and `||`
-operators as well as the `bool()` function convert their arguments to a
-boolean value based on the following rules:
+The `assign where`, `ignore where`, `if` and `while`  statements, the `!` operator as
+well as the `bool()` function convert their arguments to a boolean value based on the
+following rules:
 
 Description          | Example Value     | Boolean Value
 ---------------------|-------------------|--------------

diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp
index 2fbcfea5ecfb31fa44e8a4ac75da2708c11b3b6a..e48ff02149dafad23525a29d9e7eaeba324ac0f7 100644 (file)
--- a/lib/config/expression.cpp
+++ b/lib/config/expression.cpp
@@ -249,12 +249,22 @@ Value NotInExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const
 
 Value LogicalAndExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const
 {
-       return m_Operand1->Evaluate(frame).ToBool() && m_Operand2->Evaluate(frame).ToBool();
+       Value left = m_Operand1->Evaluate(frame);
+
+       if (!left.ToBool())
+               return left;
+       else
+               return m_Operand2->Evaluate(frame);
 }
 
 Value LogicalOrExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const
 {
-       return m_Operand1->Evaluate(frame).ToBool() || m_Operand2->Evaluate(frame).ToBool();
+       Value left = m_Operand1->Evaluate(frame);
+
+       if (left.ToBool())
+               return left;
+       else
+               return m_Operand2->Evaluate(frame);
 }
 
 Value FunctionCallExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const