Changeset 45

Timestamp:

14/09/05 12:19:13 (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

@@ -27 +27 @@
     operator.__eq__ = lambda a, b: a == b
     operator.__ne__ = lambda a, b: a != b
+    operator.__or__ = lambda a, b: a or b
 try:
     basestring
@@ -437 +438 @@
 
 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.__eq__, '!=': operator.__ne__,
+                 '||': operator.__or__}
     def parse(self):
         op_string, = self.identity_match(self.BINARY_OP)

trunk/airspeed_test.py

@@ -307 +307 @@
         self.assertEquals('yes', template.merge({'value': 1}))
         self.assertEquals('', template.merge({'value': 2}))
+
+    def test_or_operator(self):
+        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}))
 
     def test_cannot_define_macro_to_override_reserved_statements(self):