Short-circuit boolean evaluation, and return the determining value.

eevee · eevee · commit 0f5a0bf64a24 · 2013-08-28T17:09:16.000-07:00
This acts much more like Python; now we don't even evaluate the AST once
we know the result.
diff --git a/scss/expression.py b/scss/expression.py
@@ -232,8 +232,11 @@ def __init__(self, *operands):
         self.operands = operands
 
     def evaluate(self, calculator, divide=False):
-        operands = [operand.evaluate(calculator, divide=True) for operand in self.operands]
-        return Boolean(any(operands))
+        for operand in self.operands:
+            value = operand.evaluate(calculator, divide=True)
+            if value:
+                return value
+        return value
 
 
 class AllOp(Expression):
@@ -244,8 +247,11 @@ def __init__(self, *operands):
         self.operands = operands
 
     def evaluate(self, calculator, divide=False):
-        operands = [operand.evaluate(calculator, divide=True) for operand in self.operands]
-        return Boolean(all(operands))
+        for operand in self.operands:
+            value = operand.evaluate(calculator, divide=True)
+            if not value:
+                return value
+        return value
 
 
 class NotOp(Expression):
