summaryrefslogtreecommitdiff
path: root/vala/valabinaryexpression.vala
diff options
context:
space:
mode:
authorLuca Bruno <lucabru@src.gnome.org>2014-12-05 19:00:51 +0100
committerLuca Bruno <lucabru@src.gnome.org>2014-12-05 19:00:51 +0100
commit43162699924ee9295b47e1fecf6068e6fe4b4ad8 (patch)
treef480b70ce22f52acc4c2c8ee4d61bdd5b5213ac2 /vala/valabinaryexpression.vala
parentf403b05730a012563c75b56d7475d1e8240a7656 (diff)
downloadvala-43162699924ee9295b47e1fecf6068e6fe4b4ad8.tar.gz
Support XOR operation for booleans
Fixes bug 729907
Diffstat (limited to 'vala/valabinaryexpression.vala')
-rw-r--r--vala/valabinaryexpression.vala6
1 files changed, 3 insertions, 3 deletions
diff --git a/vala/valabinaryexpression.vala b/vala/valabinaryexpression.vala
index 8ccddba0d..0c9bf3243 100644
--- a/vala/valabinaryexpression.vala
+++ b/vala/valabinaryexpression.vala
@@ -355,8 +355,7 @@ public class Vala.BinaryExpression : Expression {
}
} else if (operator == BinaryOperator.MOD
|| operator == BinaryOperator.SHIFT_LEFT
- || operator == BinaryOperator.SHIFT_RIGHT
- || operator == BinaryOperator.BITWISE_XOR) {
+ || operator == BinaryOperator.SHIFT_RIGHT) {
left.target_type.nullable = false;
right.target_type.nullable = false;
@@ -433,7 +432,8 @@ public class Vala.BinaryExpression : Expression {
value_type = context.analyzer.bool_type;
} else if (operator == BinaryOperator.BITWISE_AND
- || operator == BinaryOperator.BITWISE_OR) {
+ || operator == BinaryOperator.BITWISE_OR
+ || operator == BinaryOperator.BITWISE_XOR) {
// integer type or flags type
left.target_type.nullable = false;
right.target_type.nullable = false;