Changeset 47 for trunk

Timestamp:

15/09/05 09:49:24 (7 years ago)

Author:

steve

Message:

Support parenthesised values and expressions

Location:

trunk

Files:

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

trunk/airspeed.py

@@ -319 +319 @@
 class Value(_Element):
     def parse(self):
-        self.expression = self.next_element((SimpleReference, IntegerLiteral, StringLiteral, InterpolatedStringLiteral, ArrayLiteral))
+        self.expression = self.next_element((SimpleReference, IntegerLiteral, StringLiteral, InterpolatedStringLiteral, ArrayLiteral, Condition))
 
     def calculate(self, namespace, loader):

trunk/airspeed_test.py

@@ -320 +320 @@
         self.assertEquals('', template.merge({'value1': False, 'value2': True}))
         self.assertEquals('yes', template.merge({'value1': True, 'value2': True}))
+
+    def test_parenthesised_value(self):
+        template = airspeed.Template('#if ( ($value1 == 1) && ($value2 == 2) )yes#end')
+        self.assertEquals('', template.merge({'value1': 0, 'value2': 1}))
+        self.assertEquals('', template.merge({'value1': 1, 'value2': 1}))
+        self.assertEquals('', template.merge({'value1': 0, 'value2': 2}))
+        self.assertEquals('yes', template.merge({'value1': 1, 'value2': 2}))
+
+    def test_compound_condition(self):
+        template = airspeed.Template('#if ( ($value) )yes#end')
+        self.assertEquals('', template.merge({'value': False}))
+        self.assertEquals('yes', template.merge({'value': True}))
 
     def test_cannot_define_macro_to_override_reserved_statements(self):