WIP binary fix

diff --git a/vala/valabinaryexpression.vala b/vala/valabinaryexpression.vala
index 2dda5017f9fdd33a55e40c1c33fe1e90859d8ee7..af15596f3a9997199833c35c837c8e7dcfcb3e87 100644 (file)
--- a/vala/valabinaryexpression.vala
+++ b/vala/valabinaryexpression.vala
@@ -441,16 +441,18 @@ public class Vala.BinaryExpression : Expression {
        }
 
        public override void get_defined_variables (Collection<Variable> collection) {
-               //FIXME Handled special in FlowAnalyzer
-               if (operator != BinaryOperator.AND && operator != BinaryOperator.OR) {
+               if (operator == BinaryOperator.OR) {
+                       left.get_defined_variables (collection);
+               } else {
                        left.get_defined_variables (collection);
                        right.get_defined_variables (collection);
                }
        }
 
        public override void get_used_variables (Collection<Variable> collection) {
-               //FIXME Handled special in FlowAnalyzer
-               if (operator != BinaryOperator.AND && operator != BinaryOperator.OR) {
+               if (operator == BinaryOperator.OR) {
+                       left.get_used_variables (collection);
+               } else {
                        left.get_used_variables (collection);
                        right.get_used_variables (collection);
                }