Changeset 46

Timestamp:

14/09/05 12:21:59 (7 years ago)

Author:

steve

Message:

Support && operator

Location:

trunk

Files:

• airspeed.py (modified) (2 diffs)
• airspeed_test.py (modified) (1 diff)

trunk/airspeed.py

@@ -28 +28 @@
     operator.__ne__ = lambda a, b: a != b
     operator.__or__ = lambda a, b: a or b
+    operator.__and__ = lambda a, b: a and b
 try:
     basestring
@@ -438 +439 @@
 
 class BinaryOperator(_Element):
-    BINARY_OP = re.compile(r'\s*(>=|<=|<|==|!=|>|\|\|)\s*(.*)$', re.S)
+    BINARY_OP = re.compile(r'\s*(>=|<=|<|==|!=|>|\|\||&&)\s*(.*)$', re.S)
     OPERATORS = {'>' : operator.__gt__, '>=': operator.__ge__,
                  '<' : operator.__lt__, '<=': operator.__le__,
                  '==': operator.__eq__, '!=': operator.__ne__,
-                 '||': operator.__or__}
+                 '||': operator.__or__, '&&': operator.__and__}
     def parse(self):
         op_string, = self.identity_match(self.BINARY_OP)

trunk/airspeed_test.py

@@ -311 +311 @@
         template = airspeed.Template('#if ( $value1 || $value2 )yes#end')
         self.assertEquals('', template.merge({'value1': False, 'value2': False}))
-        #self.assertEquals('yes', template.merge({'value1': True, 'value2': False}))
-        #self.assertEquals('yes', template.merge({'value1': False, 'value2': True}))
+        self.assertEquals('yes', template.merge({'value1': True, 'value2': False}))
+        self.assertEquals('yes', template.merge({'value1': False, 'value2': True}))
+
+    def test_and_operator(self):
+        template = airspeed.Template('#if ( $value1 && $value2 )yes#end')
+        self.assertEquals('', template.merge({'value1': False, 'value2': False}))
+        self.assertEquals('', template.merge({'value1': True, 'value2': False}))
+        self.assertEquals('', template.merge({'value1': False, 'value2': True}))
+        self.assertEquals('yes', template.merge({'value1': True, 'value2': True}))
 
     def test_cannot_define_macro_to_override_reserved_statements(self):